fix #803 Calling clear or setValue(null) on DateBox throws a NPE

DominoKit · Aug 3, 2023 · d21c24a · d21c24a
1 parent 5f11beb
commit d21c24a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 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
@@ -291,9 +291,11 @@ public Date getDate() {
   public Calendar setDate(Date date) {
     Date oldDate = this.date;
     this.date = date;
-    onDateViewUpdate(this.date);
-    onDateSelectionChanged(this.date);
-    triggerChangeListeners(oldDate, this.date);
+    if (nonNull(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/forms/DateBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java
@@ -516,11 +516,13 @@ public Date getValue() {
   /** {@inheritDoc} */
   @Override
   public void onDateSelectionChanged(Date date) {
-    if (silentSelection == false) {
-      clearInvalid();
-      withValue(date);
+    if (!isDisabled() && !isReadOnly()) {
+      if (silentSelection == false) {
+        clearInvalid();
+        withValue(date);
+      }
+      this.popover.close();
     }
-    this.popover.close();
   }
 
   /**

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/TimeBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/TimeBox.java
@@ -423,7 +423,9 @@ protected void doSetValue(Date value) {
     withTimeSelectionToggleListeners(
         false,
         field -> {
-          this.timePicker.setDate(this.value);
+          if (nonNull(this.value)) {
+            this.timePicker.setDate(this.value);
+          }
         });
   }
 
@@ -453,11 +455,13 @@ public Date getValue() {
   /** {@inheritDoc} */
   @Override
   public void onTimeSelectionChanged(Date date) {
-    if (silentSelection == false) {
-      clearInvalid();
-      withValue(date);
+    if (!isDisabled() && !isReadOnly()) {
+      if (silentSelection == false) {
+        clearInvalid();
+        withValue(date);
+      }
+      this.popover.close();
     }
-    this.popover.close();
   }
 
   /**