@arsedizioni/ars-utils 19.3.8 → 19.3.10

package/fesm2022/arsedizioni-ars-utils-clipper.ui.mjs

@@ -1593,14 +1593,23 @@ class ClipperSearchCalendarComponent {
     filterByDate(date) {
         if (date === 'month') {
             if (this.calendarDate) {
-                this.changed.emit(new DateInterval(endOfDay(startOfMonth(this.calendarDate)), endOfMonth(this.calendarDate)));
+                const today = new Date();
+                const start = endOfDay(startOfMonth(this.calendarDate));
+                const end = endOfMonth(this.calendarDate);
+                this.changed.emit(new DateInterval(start, end));
+                if (start <= today && end >= today) {
+                    const calendar = this.calendar();
+                    calendar.selected = today;
+                    calendar.updateTodaysDate();
+                }
             }
         }
         else if (date) {
             this.changed.emit(new DateInterval(endOfDay(date), endOfDay(date)));
             this.calendarDate = date;
             const calendar = this.calendar();
-            calendar.activeDate = date;
+            calendar.selected = date;
+            calendar.updateTodaysDate();
         }
         else {
             this.changed.emit(null);
@@ -1611,10 +1620,16 @@ class ClipperSearchCalendarComponent {
      * @param monthInfo: the month info
      */
     filterByMonth(monthInfo) {
-        let newDate = new Date(monthInfo.year, monthInfo.month - 1, 1);
-        this.changed.emit(new DateInterval(endOfDay(startOfMonth(newDate)), endOfMonth(newDate)));
+        const newDate = new Date(monthInfo.year, monthInfo.month - 1, 1);
+        const today = new Date();
+        const start = endOfDay(startOfMonth(newDate));
+        const end = endOfMonth(newDate);
+        this.changed.emit(new DateInterval(start, end));
         this.calendarSpecialDays = monthInfo.days;
         const calendar = this.calendar();
+        if (start <= today && end >= today) {
+            calendar.selected = today;
+        }
         calendar.activeDate = newDate;
         calendar.updateTodaysDate();
         this.calendarDate = newDate;