fix #954 DateBox should close the popup when cleared and call change …

…listeners when value is null
DominoKit · Sep 22, 2024 · b9ad31e · b9ad31e
1 parent 8926d8a
commit b9ad31e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/Calendar.java b/domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/Calendar.java
@@ -303,11 +303,9 @@ public Date getDate() {
   public Calendar setDate(Date date) {
     Date oldDate = this.date;
     this.date = date;
-    if (nonNull(date)) {
-      onDateViewUpdate(this.date);
-      onDateSelectionChanged(this.date);
-      triggerChangeListeners(oldDate, this.date);
-    }
+    onDateViewUpdate(this.date);
+    onDateSelectionChanged(this.date);
+    triggerChangeListeners(oldDate, this.date);
     return this;
   }
 

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/CalendarSelectors.java b/domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/CalendarSelectors.java
@@ -191,9 +191,7 @@ public void onDateTimeFormatInfoChanged(DateTimeFormatInfo dateTimeFormatInfo) {
    */
   @Override
   public void onDateSelectionChanged(Date date) {
-    if (nonNull(date)) {
-      setDate(date);
-    }
+    setDate(date);
   }
 
   /**

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java
@@ -523,6 +523,7 @@ protected void doSetValue(Date value) {
       updateStringValue();
     } else {
       getInputElement().element().value = "";
+      close();
     }
     withDateSelectionToggleListeners(
         false,
@@ -538,6 +539,12 @@ private void updateStringValue() {
         getFormatted(this.value, this.calendar.getDateTimeFormatInfo());
   }
 
+  @Override
+  public DateBox clear(boolean silent) {
+    close();
+    return super.clear(silent);
+  }
+
   /**
    * {@inheritDoc} Returns the string value of the underlying input element.
    *