nexheal-lib 0.0.16 → 0.0.18

package/fesm2022/nexheal-lib.mjs

@@ -723,7 +723,7 @@ class CalendarControl {
             if (m) {
                 // 24h
                 const h = +m[1], min = +m[2];
-                if (h < 24 && min < 60) {
+                if (h < 24 && min < 60 && this.isTimeValid(h, min)) {
                     this.selectedHour = h;
                     this.selectedMinute = min;
                 }
@@ -740,8 +740,13 @@ class CalendarControl {
                         h += 12;
                     if (ap === "AM" && h === 12)
                         h = 0;
-                    this.selectedHour = h;
-                    this.selectedMinute = min;
+                    if (this.isTimeValid(h, min)) {
+                        this.selectedHour = h;
+                        this.selectedMinute = min;
+                    }
+                    else {
+                        return this.clearDate(new Event("manual"));
+                    }
                 }
                 else {
                     return this.clearDate(new Event("manual"));
@@ -1016,44 +1021,110 @@ class CalendarControl {
     setMeridian(value) {
         if (this.meridian === value)
             return;
+        let nextHour = this.selectedHour;
         if (value === "AM" && this.selectedHour >= 12) {
-            this.selectedHour -= 12;
+            nextHour -= 12;
         }
         else if (value === "PM" && this.selectedHour < 12) {
-            this.selectedHour += 12;
+            nextHour += 12;
+        }
+        if (this.isTimeValid(nextHour, this.selectedMinute)) {
+            this.selectedHour = nextHour;
+            this.patchDateWithTime();
         }
-        this.patchDateWithTime();
     }
     buildDateWithTime(day) {
         return new Date(this.displayYear, this.displayMonth, day, this.selectedHour, this.selectedMinute);
     }
+    isTimeValid(hour, minute) {
+        const testDate = new Date(this.selectedDate || new Date());
+        testDate.setHours(hour, minute, 0, 0);
+        if (this._minDate) {
+            const min = new Date(this._minDate);
+            if (this.timeOnly || this.showTime) {
+                min.setFullYear(testDate.getFullYear(), testDate.getMonth(), testDate.getDate());
+            }
+            if (testDate < min)
+                return false;
+        }
+        if (this._maxDate) {
+            const max = new Date(this._maxDate);
+            if (this.timeOnly || this.showTime) {
+                max.setFullYear(testDate.getFullYear(), testDate.getMonth(), testDate.getDate());
+            }
+            if (testDate > max)
+                return false;
+        }
+        return true;
+    }
     incrementHour() {
-        this.selectedHour = (this.selectedHour + 1) % 24;
-        if (this.showTime || this.timeOnly)
-            this.patchDateWithTime();
+        let nextHour = (this.selectedHour + 1) % 24;
+        let found = false;
+        for (let i = 0; i < 24; i++) {
+            if (this.isTimeValid(nextHour, this.selectedMinute)) {
+                found = true;
+                break;
+            }
+            nextHour = (nextHour + 1) % 24;
+        }
+        if (found) {
+            this.selectedHour = nextHour;
+            if (this.showTime || this.timeOnly)
+                this.patchDateWithTime();
+        }
     }
     decrementHour() {
-        this.selectedHour = (this.selectedHour + 23) % 24;
-        if (this.showTime || this.timeOnly)
-            this.patchDateWithTime();
+        let nextHour = (this.selectedHour + 23) % 24;
+        let found = false;
+        for (let i = 0; i < 24; i++) {
+            if (this.isTimeValid(nextHour, this.selectedMinute)) {
+                found = true;
+                break;
+            }
+            nextHour = (nextHour + 23) % 24;
+        }
+        if (found) {
+            this.selectedHour = nextHour;
+            if (this.showTime || this.timeOnly)
+                this.patchDateWithTime();
+        }
     }
     incrementMinute() {
-        this.selectedMinute++;
-        if (this.selectedMinute >= 60) {
-            this.selectedMinute = 0;
-            this.selectedHour = (this.selectedHour + 1) % 24;
+        let nextMin = this.selectedMinute + 1;
+        let nextHour = this.selectedHour;
+        if (nextMin >= 60) {
+            nextMin = 0;
+            nextHour = (nextHour + 1) % 24;
+        }
+        if (!this.isTimeValid(nextHour, nextMin)) {
+            if (this._minDate) {
+                const min = new Date(this._minDate);
+                nextHour = min.getHours();
+                nextMin = min.getMinutes();
+            }
         }
+        this.selectedHour = nextHour;
+        this.selectedMinute = nextMin;
         if (this.showTime || this.timeOnly) {
             this.patchDateWithTime();
         }
     }
     decrementMinute() {
-        this.selectedMinute--;
-        if (this.selectedMinute < 0) {
-            this.selectedMinute = 59;
-            // go back an hour, wrapping 0 → 23
-            this.selectedHour = (this.selectedHour + 23) % 24;
+        let nextMin = this.selectedMinute - 1;
+        let nextHour = this.selectedHour;
+        if (nextMin < 0) {
+            nextMin = 59;
+            nextHour = (nextHour + 23) % 24;
+        }
+        if (!this.isTimeValid(nextHour, nextMin)) {
+            if (this._maxDate) {
+                const max = new Date(this._maxDate);
+                nextHour = max.getHours();
+                nextMin = max.getMinutes();
+            }
         }
+        this.selectedHour = nextHour;
+        this.selectedMinute = nextMin;
         if (this.showTime || this.timeOnly) {
             this.patchDateWithTime();
         }
@@ -1122,6 +1193,20 @@ class CalendarControl {
                 this.displayMonth = now.getMonth();
                 this.displayYear = now.getFullYear();
             }
+            if (!this.inputControl.value && (this.timeOnly || this.showTime)) {
+                if (this._minDate) {
+                    const min = new Date(this._minDate);
+                    this.selectedHour = min.getHours();
+                    this.selectedMinute = min.getMinutes();
+                }
+                else if (!this.isTimeValid(this.selectedHour, this.selectedMinute)) {
+                    if (this._maxDate) {
+                        const max = new Date(this._maxDate);
+                        this.selectedHour = max.getHours();
+                        this.selectedMinute = max.getMinutes();
+                    }
+                }
+            }
             // destroy any old popper
             if (this.popperInstance) {
                 this.popperInstance.destroy();
@@ -1164,7 +1249,14 @@ class CalendarControl {
         this.selectionCleared.emit();
         event.stopPropagation();
         this.selectedDate = null;
-        if (this._defaultDate) {
+        if (this._minDate) {
+            const parsed = new Date(this._minDate);
+            if (!isNaN(parsed.getTime())) {
+                this.selectedHour = parsed.getHours();
+                this.selectedMinute = parsed.getMinutes();
+            }
+        }
+        else if (this._defaultDate) {
             const parsed = new Date(this._defaultDate);
             if (!isNaN(parsed.getTime())) {
                 this.selectedHour = parsed.getHours();