Merge branch 'release/1.0.7' into 1.x.x

DominoKit · Aug 29, 2024 · 0e72829 · 0e72829
2 parents 1c964a8 + b022fbf
commit 0e72829
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 14 deletions.
diff --git a/domino-ui-shared/pom.xml b/domino-ui-shared/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/domino-ui-tools/mdi-icons-processor/pom.xml b/domino-ui-tools/mdi-icons-processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-tools</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-tools/pom.xml b/domino-ui-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-tools/theme-processor/pom.xml b/domino-ui-tools/theme-processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-tools</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-webjar/pom.xml b/domino-ui-webjar/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/domino-ui/pom.xml b/domino-ui/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-ui-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>domino-ui</artifactId>

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/ValueBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/ValueBox.java
@@ -28,6 +28,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import jsinterop.base.Js;
+import org.dominokit.domino.ui.grid.flex.FlexAlign;
 import org.dominokit.domino.ui.grid.flex.FlexItem;
 import org.dominokit.domino.ui.grid.flex.FlexLayout;
 import org.dominokit.domino.ui.style.Color;
@@ -211,14 +212,15 @@ public T setFieldStyle(FieldStyle fieldStyle) {
 
   private void layout() {
 
-    fieldInnerContainer = FlexLayout.create();
+    fieldInnerContainer = FlexLayout.create().css("field-inner-cntr");
     fieldInnerContainer.appendChild(
         inputContainer.css("field-input-cntr").setFlexGrow(1).appendChild(inputElement));
 
     fieldGroup.appendChild(
         fieldContainer.appendChild(
             fieldInnerContainer.apply(
                 self -> {
+                  self.setAlignItems(FlexAlign.STRETCH);
                   mandatoryAddOn = createMandatoryAddOn();
                   if (nonNull(mandatoryAddOn)) {
                     self.appendChild(DominoElement.of(mandatoryAddOn).css("field-mandatory-addon"));

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java b/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java
@@ -112,9 +112,15 @@ public int getCorrectHour(int hour) {
   @Override
   public Date getTime() {
     JsDate jsDate = new JsDate();
-    jsDate.setHours(DayPeriod.PM.equals(dayPeriod) ? hour + 12 : hour);
+    if (DayPeriod.PM.equals(dayPeriod) && hour < 12) {
+      jsDate.setHours(hour + 12);
+    } else if (DayPeriod.AM.equals(dayPeriod) && hour == 12) {
+      jsDate.setHours(0);
+    } else {
+      jsDate.setHours(hour);
+    }
     jsDate.setMinutes(minute);
     jsDate.setSeconds(second);
-    return new Date((long) jsDate.getTime());
+    return new Date(new Double(jsDate.getTime()).longValue());
   }
 }
diff --git a/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/forms/domino-ui-forms.css b/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/forms/domino-ui-forms.css
@@ -151,10 +151,15 @@
     color: #F44336;
 }
 
+.field-inner-cntr {
+    height: 100%;
+}
+
 .field-group .field-input-cntr {
     position: relative;
     background-color: inherit;
     width: 100%;
+    height:100%;
 }
 
 .field-cntr .flex-layout,
@@ -176,7 +181,7 @@
 .field-group.lined.d-select .field-cntr .flex-layout {
     position: relative;
     bottom: 4px;
-    align-items: center;
+    align-items: stretch;
 }
 
 .table-cm-filter .field-group.lined.dui-datebox .field-cntr .flex-layout,
@@ -244,7 +249,7 @@
 }
 
 .field-group .select-button {
-    height: 35px;
+    height: 100%;
     line-height: 35px;
 }
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.dominokit</groupId>
     <artifactId>domino-ui-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <packaging>pom</packaging>
 
     <name>domino-ui-parent</name>
@@ -67,8 +67,8 @@
     </modules>
 
     <properties>
-        <snapshot.version>1.0.6-SNAPSHOT</snapshot.version>
-        <next.release.version>1.0.6</next.release.version>
+        <snapshot.version>1.0.7-SNAPSHOT</snapshot.version>
+        <next.release.version>1.0.7</next.release.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>