Skip to content

Commit e16e949

Browse files
committed
fix #1092 Calendar MonthPicker YearPicker interactions not correct
1 parent da198d8 commit e16e949

File tree

5 files changed

+13
-2
lines changed

5 files changed

+13
-2
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,11 @@ public Date getDate() {
293293
return this.date;
294294
}
295295

296+
@Override
297+
public Date getActiveSelection() {
298+
return selectors.getDate() != null ? selectors.getDate() : getDate();
299+
}
300+
296301
/**
297302
* Change the selected date.
298303
*

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,8 @@ public HTMLDivElement element() {
232232
public void onUpdateCalendarView(Date date) {
233233
setDate(date);
234234
}
235+
236+
public Date getDate() {
237+
return this.date;
238+
}
235239
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,6 @@ public interface IsCalendar {
8282
* @return The calendar initialization configuration.
8383
*/
8484
CalendarInitConfig getConfig();
85+
86+
Date getActiveSelection();
8587
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ MonthsPicker updateView() {
9292
.textContent(months[counter])
9393
.addClickListener(
9494
evt -> {
95-
Date calendarDate = calendar.getDate();
95+
Date calendarDate = calendar.getActiveSelection();
9696
Date date = new Date(calendarDate.getTime());
9797
date.setDate(1);
9898
date.setMonth(month);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public YearPicker(IsCalendar calendar, int referenceYear) {
7272
.textContent(String.valueOf(counter + 1900))
7373
.addClickListener(
7474
evt -> {
75-
Date date = new Date(calendar.getDate().getTime());
75+
Date date = new Date(calendar.getActiveSelection().getTime());
7676
date.setYear(year);
7777
dispatchEvent(CalendarCustomEvents.dateNavigationChanged(date.getTime()));
7878
}));

0 commit comments

Comments
 (0)