@wavemaker/app-ng-runtime 11.7.1-next.24827 → 11.7.1-next.24830

app-ng-runtime/components/input/epoch/base-date-time.component.d.ts

@@ -119,7 +119,7 @@ export declare abstract class BaseDateTimeComponent extends BaseFormCustomCompon
     /**
      * This method is used to highlight the current date
      */
-    protected hightlightToday(): void;
+    protected hightlightToday(newDate: any): void;
     /**
      * This method is used to find the new date is from another year or not
      * @param newDate - newly selected date value

app-ng-runtime/components/input/epoch/bundles/index.umd.js

@@ -848,13 +848,18 @@
         /**
          * This method is used to highlight the current date
          */
-        hightlightToday() {
-            const toDay = new Date().getDate().toString();
-            _.filter($(`span:contains(${toDay})`).not('.is-other-month'), (obj) => {
-                if ($(obj).text() === toDay) {
-                    $(obj).addClass('current-date text-info');
-                }
-            });
+        hightlightToday(newDate) {
+            const activeMonth = $(`.bs-datepicker-head .current`).first().text();
+            const activeYear = $(".bs-datepicker-head .current").eq(1).text();
+            const monthName = new Date().toLocaleString('default', { month: 'long' });
+            if (activeMonth == monthName && activeYear == new Date().getFullYear() && newDate.getDate() === new Date().getDate() && newDate.getMonth() === new Date().getMonth() && newDate.getFullYear() === new Date().getFullYear()) {
+                const toDay = new Date().getDate().toString();
+                _.filter($(`span:contains(${toDay})`).not('.is-other-month'), (obj) => {
+                    if ($(obj).text() === toDay) {
+                        $(obj).addClass('current-date text-info');
+                    }
+                });
+            }
         }
         /**
          * This method is used to find the new date is from another year or not
@@ -915,7 +920,10 @@
             setTimeout(() => {
                 const newDay = newDate.getDate().toString();
                 _.filter($(`span:contains(${newDay})`).not('.is-other-month'), (obj) => {
-                    if ($(obj).text() === newDay) {
+                    const activeMonth = $(`.bs-datepicker-head .current`).first().text();
+                    const activeYear = $(".bs-datepicker-head .current").eq(1).text();
+                    const monthName = new Date().toLocaleString('default', { month: 'long' });
+                    if ($(obj).text() === newDay && activeMonth == monthName && activeYear == new Date().getFullYear()) {
                         if ($(obj).hasClass('selected')) {
                             $(obj).parent().attr('aria-selected', 'true');
                         }
@@ -926,8 +934,8 @@
                         this.activeDate = newDate;
                     }
                 });
-                if (newDate.getMonth() === new Date().getMonth() && newDate.getFullYear() === new Date().getFullYear()) {
-                    this.hightlightToday();
+                if (newDate.getDate() === new Date().getDate() && newDate.getMonth() === new Date().getMonth() && newDate.getFullYear() === new Date().getFullYear()) {
+                    this.hightlightToday(newDate);
                 }
             });
         }
@@ -1788,7 +1796,7 @@
             this.isOpen = true;
             this.bsDataValue ? this.activeDate = this.bsDataValue : this.activeDate = new Date();
             if (!this.bsDataValue) {
-                this.hightlightToday();
+                this.hightlightToday(this.activeDate);
             }
             // We are using the two input tags(To maintain the modal and proxy modal) for the date control.
             // So actual bootstrap input target width we made it to 0, so bootstrap calculating the calendar container top position improperly.
@@ -2197,7 +2205,7 @@
             this.focusTrap.activate();
             this.bsDateValue ? this.activeDate = this.bsDateValue : this.activeDate = new Date();
             if (!this.bsDateValue) {
-                this.hightlightToday();
+                this.hightlightToday(this.activeDate);
             }
             this.addDatepickerKeyboardEvents(this, true);
             i1$1.adjustContainerPosition($('bs-datepicker-container'), this.nativeElement, this.bsDatePickerDirective._datepicker);