Skip to content

Commit b9ad31e

Browse files
committed
fix #954 DateBox should close the popup when cleared and call change listeners when value is null
1 parent 8926d8a commit b9ad31e

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/Calendar.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,9 @@ public Date getDate() {
303303
public Calendar setDate(Date date) {
304304
Date oldDate = this.date;
305305
this.date = date;
306-
if (nonNull(date)) {
307-
onDateViewUpdate(this.date);
308-
onDateSelectionChanged(this.date);
309-
triggerChangeListeners(oldDate, this.date);
310-
}
306+
onDateViewUpdate(this.date);
307+
onDateSelectionChanged(this.date);
308+
triggerChangeListeners(oldDate, this.date);
311309
return this;
312310
}
313311

domino-ui/src/main/java/org/dominokit/domino/ui/datepicker/CalendarSelectors.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,7 @@ public void onDateTimeFormatInfoChanged(DateTimeFormatInfo dateTimeFormatInfo) {
191191
*/
192192
@Override
193193
public void onDateSelectionChanged(Date date) {
194-
if (nonNull(date)) {
195-
setDate(date);
196-
}
194+
setDate(date);
197195
}
198196

199197
/**

domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java

+7
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ protected void doSetValue(Date value) {
523523
updateStringValue();
524524
} else {
525525
getInputElement().element().value = "";
526+
close();
526527
}
527528
withDateSelectionToggleListeners(
528529
false,
@@ -538,6 +539,12 @@ private void updateStringValue() {
538539
getFormatted(this.value, this.calendar.getDateTimeFormatInfo());
539540
}
540541

542+
@Override
543+
public DateBox clear(boolean silent) {
544+
close();
545+
return super.clear(silent);
546+
}
547+
541548
/**
542549
* {@inheritDoc} Returns the string value of the underlying input element.
543550
*

0 commit comments

Comments
 (0)