From 793419ee6a423ef64ce60a8b5b1e0a336dc63e13 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Sun, 10 Dec 2023 17:33:51 +0300 Subject: [PATCH 1/4] Update for next development version --- domino-ui-shared/pom.xml | 2 +- domino-ui-tools/mdi-icons-processor/pom.xml | 2 +- domino-ui-tools/pom.xml | 2 +- domino-ui-tools/theme-processor/pom.xml | 2 +- domino-ui-webjar/pom.xml | 2 +- domino-ui/pom.xml | 2 +- pom.xml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/domino-ui-shared/pom.xml b/domino-ui-shared/pom.xml index d891121f6..896668fdf 100644 --- a/domino-ui-shared/pom.xml +++ b/domino-ui-shared/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.6 + 1.0.7-SNAPSHOT jar 4.0.0 diff --git a/domino-ui-tools/mdi-icons-processor/pom.xml b/domino-ui-tools/mdi-icons-processor/pom.xml index 288fa0cb7..d63f02629 100644 --- a/domino-ui-tools/mdi-icons-processor/pom.xml +++ b/domino-ui-tools/mdi-icons-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.6 + 1.0.7-SNAPSHOT 4.0.0 diff --git a/domino-ui-tools/pom.xml b/domino-ui-tools/pom.xml index cf55548e6..55d99edeb 100644 --- a/domino-ui-tools/pom.xml +++ b/domino-ui-tools/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.6 + 1.0.7-SNAPSHOT 4.0.0 diff --git a/domino-ui-tools/theme-processor/pom.xml b/domino-ui-tools/theme-processor/pom.xml index 5b607a5c8..0057a68f3 100644 --- a/domino-ui-tools/theme-processor/pom.xml +++ b/domino-ui-tools/theme-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.6 + 1.0.7-SNAPSHOT 4.0.0 diff --git a/domino-ui-webjar/pom.xml b/domino-ui-webjar/pom.xml index f391a5a7b..67a6d884d 100644 --- a/domino-ui-webjar/pom.xml +++ b/domino-ui-webjar/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.6 + 1.0.7-SNAPSHOT jar 4.0.0 diff --git a/domino-ui/pom.xml b/domino-ui/pom.xml index e7b424925..16f80cb8a 100644 --- a/domino-ui/pom.xml +++ b/domino-ui/pom.xml @@ -6,7 +6,7 @@ org.dominokit domino-ui-parent - 1.0.6 + 1.0.7-SNAPSHOT domino-ui diff --git a/pom.xml b/pom.xml index 8724edaa5..11b04d45f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.dominokit domino-ui-parent - 1.0.6 + 1.0.7-SNAPSHOT pom domino-ui-parent @@ -67,8 +67,8 @@ - 1.0.6-SNAPSHOT - 1.0.6 + 1.0.7-SNAPSHOT + 1.0.7 1.8 1.8 From 6f96c7b0292d7a359616318ee81ca4178f0fb643 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Mon, 12 Feb 2024 17:31:08 +0300 Subject: [PATCH 2/4] fix wrong date value with 12 hours clock on 12:XXPM time --- .../org/dominokit/domino/ui/timepicker/Clock12.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 index f7c179d25..7fe0c1eb8 100644 --- 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()); } } From 79e3cac3975a81a08860b8de96e3e25f75ec9d5e Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Fri, 26 Jul 2024 18:09:26 +0300 Subject: [PATCH 3/4] fix #945 Select inner divs overlap outer divs height --- .../java/org/dominokit/domino/ui/forms/ValueBox.java | 4 +++- .../domino/ui/public/css/forms/domino-ui-forms.css | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) 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 index cd82c6622..575ce933c 100644 --- 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,7 +212,7 @@ 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)); @@ -219,6 +220,7 @@ private void layout() { 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/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 index 7f3f3ba02..4e958f2f1 100644 --- 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; } From b022fbfd57f929312929c01c2faaf6dea39c978d Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Thu, 29 Aug 2024 14:32:34 +0300 Subject: [PATCH 4/4] Update versions for release --- domino-ui-shared/pom.xml | 2 +- domino-ui-tools/mdi-icons-processor/pom.xml | 2 +- domino-ui-tools/pom.xml | 2 +- domino-ui-tools/theme-processor/pom.xml | 2 +- domino-ui-webjar/pom.xml | 2 +- domino-ui/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/domino-ui-shared/pom.xml b/domino-ui-shared/pom.xml index 896668fdf..5736ea818 100644 --- a/domino-ui-shared/pom.xml +++ b/domino-ui-shared/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.7-SNAPSHOT + 1.0.7 jar 4.0.0 diff --git a/domino-ui-tools/mdi-icons-processor/pom.xml b/domino-ui-tools/mdi-icons-processor/pom.xml index d63f02629..eba9ceec0 100644 --- a/domino-ui-tools/mdi-icons-processor/pom.xml +++ b/domino-ui-tools/mdi-icons-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.7-SNAPSHOT + 1.0.7 4.0.0 diff --git a/domino-ui-tools/pom.xml b/domino-ui-tools/pom.xml index 55d99edeb..eba78df14 100644 --- a/domino-ui-tools/pom.xml +++ b/domino-ui-tools/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.7-SNAPSHOT + 1.0.7 4.0.0 diff --git a/domino-ui-tools/theme-processor/pom.xml b/domino-ui-tools/theme-processor/pom.xml index 0057a68f3..733b996c1 100644 --- a/domino-ui-tools/theme-processor/pom.xml +++ b/domino-ui-tools/theme-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.7-SNAPSHOT + 1.0.7 4.0.0 diff --git a/domino-ui-webjar/pom.xml b/domino-ui-webjar/pom.xml index 67a6d884d..f884c8eb5 100644 --- a/domino-ui-webjar/pom.xml +++ b/domino-ui-webjar/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.7-SNAPSHOT + 1.0.7 jar 4.0.0 diff --git a/domino-ui/pom.xml b/domino-ui/pom.xml index 16f80cb8a..9586e87b6 100644 --- a/domino-ui/pom.xml +++ b/domino-ui/pom.xml @@ -6,7 +6,7 @@ org.dominokit domino-ui-parent - 1.0.7-SNAPSHOT + 1.0.7 domino-ui diff --git a/pom.xml b/pom.xml index 11b04d45f..7a2b149c3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.dominokit domino-ui-parent - 1.0.7-SNAPSHOT + 1.0.7 pom domino-ui-parent