@wavemaker/app-ng-runtime 11.11.6-rc.6189 → 11.11.7-rc.217

package/components/input/epoch/fesm2022/index.mjs

@@ -860,6 +860,8 @@ class BaseDateTimeComponent extends BaseFormCustomComponent {
      * This method is used to highlight the current date
      */
     hightlightToday(newDate) {
+        if (this.datavalue)
+            return;
         const activeMonth = $(`.bs-datepicker-head .current`).first().text();
         const activeYear = $(".bs-datepicker-head .current").eq(1).text();
         const month = new Date(newDate).toLocaleString('default', { month: 'long' });
@@ -918,9 +920,6 @@ class BaseDateTimeComponent extends BaseFormCustomComponent {
      * @param fromKeyboardEvents
      */
     setActiveDateFocus(newDate, isMouseEvent, fromKeyboardEvents) {
-        if (this.mindate && !this.datavalue && fromKeyboardEvents) {
-            this.activeDate = newDate = new Date(this.mindate);
-        }
         this.setNextData(newDate);
         this.clicked = false;
         const activeMonth = this.activeDate.getMonth();
@@ -1021,7 +1020,11 @@ class BaseDateTimeComponent extends BaseFormCustomComponent {
         }
         else if (datePickerBody.find('table.days').length > 0) {
             this.loadDays();
-            const newDate = new Date(this.activeDate.getFullYear(), this.activeDate.getMonth() + count, 1);
+            const [monthText, yearText] = $('.bs-datepicker-head .current').map((_, el) => $(el).text().trim()).get();
+            const monthIndex = new Date(`${monthText} 1, ${yearText}`).getMonth();
+            const year = parseInt$1(yearText, 10);
+            const inMonth = (d) => d.getFullYear() === year && d.getMonth() === monthIndex;
+            let newDate = this.mindate && inMonth(new Date(this.mindate)) ? new Date(this.mindate) : this.maxdate && inMonth(new Date(this.maxdate)) ? new Date(this.maxdate) : new Date(year, monthIndex, 1);
             this.setActiveDateFocus(newDate, true);
         }
     }
@@ -1483,6 +1486,10 @@ class BaseDateTimeComponent extends BaseFormCustomComponent {
                 this.setFocusForDate(-1);
             }
             var prevMon = this.getMonth(this.activeDate, -1);
+            const current = new Date();
+            if (prevMon.date.getMonth() === current.getMonth() && prevMon.date.getFullYear() === current.getFullYear()) {
+                this.hightlightToday(new Date());
+            }
             setTimeout(() => {
                 $(".bs-datepicker-head .previous span").attr("aria-hidden", 'true');
                 $(".bs-datepicker-head .next span").attr("aria-hidden", 'true');
@@ -1504,6 +1511,10 @@ class BaseDateTimeComponent extends BaseFormCustomComponent {
                 this.setFocusForDate(1);
             }
             var nextMon = this.getMonth(this.activeDate, 1);
+            const current = new Date();
+            if (nextMon.date.getMonth() === current.getMonth() && nextMon.date.getFullYear() === current.getFullYear()) {
+                this.hightlightToday(current);
+            }
             setTimeout(() => {
                 $(".bs-datepicker-head .previous span").attr("aria-hidden", 'true');
                 $(".bs-datepicker-head .next span").attr("aria-hidden", 'true');