nexheal-lib 0.0.59 → 0.0.61

package/fesm2022/nexheal-lib.mjs

@@ -562,11 +562,28 @@ class CalendarControl {
             this.writeValueRange(value);
             return;
         }
-        // Week mode: value is a "start - end" range string
+        // Week mode: value is a "start - end" range string, a single date, or ISO string
         if (this.selectionMode === "week") {
             const raw = String(value);
-            const firstPart = raw.split(" - ")[0].trim();
-            const parsed = this.parseDate(firstPart) || this.parseDate(raw);
+            const parts = raw.split(" - ");
+            // If we got a proper "start - end" range string, use both dates directly
+            // instead of recalculating via getWeekRange (which always does Sun–Sat)
+            if (parts.length === 2) {
+                const s = this.parseDate(parts[0].trim());
+                const e = this.parseDate(parts[1].trim());
+                if (s && e) {
+                    this.selectedWeekStart = s;
+                    this.selectedWeekEnd = e;
+                    this.selectedDate = s;
+                    this.displayMonth = s.getMonth();
+                    this.displayYear = s.getFullYear();
+                    this.inputControl.setValue(this.formatWeek(s, e), { emitEvent: false });
+                    return;
+                }
+            }
+            // Single date: trust it as the week start (the parent already computed
+            // the correct start day), and add 6 days for the end.
+            const parsed = this.parseDate(parts[0]?.trim()) || this.parseDate(raw);
             if (!parsed) {
                 this.selectedWeekStart = null;
                 this.selectedWeekEnd = null;
@@ -574,7 +591,10 @@ class CalendarControl {
                 this.inputControl.setValue("", { emitEvent: false });
                 return;
             }
-            const { start, end } = this.getWeekRange(parsed);
+            const start = new Date(parsed.getFullYear(), parsed.getMonth(), parsed.getDate());
+            const end = new Date(start);
+            end.setDate(start.getDate() + 6);
+            end.setHours(23, 59, 59, 999);
             this.selectedWeekStart = start;
             this.selectedWeekEnd = end;
             this.selectedDate = start;
@@ -739,14 +759,35 @@ class CalendarControl {
                 this.blurEvent.emit();
                 return;
             }
-            // typed a different value -> recompute the week from the first date, else revert
-            const parsed = this.parseDate(rawWeek.split(" - ")[0].trim());
-            if (!parsed) {
-                this.inputControl.setValue(current, { emitEvent: false });
-                this.blurEvent.emit();
-                return;
+            // typed a different value -> try to use both dates from range, else recompute
+            const blurParts = rawWeek.split(" - ");
+            let start;
+            let end;
+            if (blurParts.length === 2) {
+                const s = this.parseDate(blurParts[0].trim());
+                const e = this.parseDate(blurParts[1].trim());
+                if (s && e) {
+                    start = s;
+                    end = e;
+                }
+                else if (s) {
+                    ({ start, end } = this.getWeekRange(s));
+                }
+                else {
+                    this.inputControl.setValue(current, { emitEvent: false });
+                    this.blurEvent.emit();
+                    return;
+                }
+            }
+            else {
+                const parsed = this.parseDate(rawWeek);
+                if (!parsed) {
+                    this.inputControl.setValue(current, { emitEvent: false });
+                    this.blurEvent.emit();
+                    return;
+                }
+                ({ start, end } = this.getWeekRange(parsed));
             }
-            const { start, end } = this.getWeekRange(parsed);
             this.selectedWeekStart = start;
             this.selectedWeekEnd = end;
             this.selectedDate = start;
@@ -1143,6 +1184,17 @@ class CalendarControl {
     }
     /** writeValue delegate for range mode. */
     writeValueRange(value) {
+        // Handle { start: Date, end: Date } objects directly (e.g. from parent patchValue)
+        if (typeof value === 'object' && value !== null && value.start instanceof Date && value.end instanceof Date) {
+            this.rangeStart = value.start;
+            this.rangeEnd = value.end;
+            this.selectedDate = value.start;
+            this.rangePicking = 'start';
+            this.displayMonth = value.start.getMonth();
+            this.displayYear = value.start.getFullYear();
+            this.inputControl.setValue(this.formatRange(value.start, value.end), { emitEvent: false });
+            return;
+        }
         const raw = String(value);
         const parts = raw.split(" - ");
         if (parts.length === 2) {
@@ -2606,6 +2658,8 @@ class MultiselectControl {
         });
         // Initialize filteredOptions to match all options
         this.filteredOptions = [...this.options];
+        // Sync the input display in case selectedItems was set before init
+        this._updateSelectedItemList();
     }
     ngAfterViewChecked() {
         if (this.isDropdownOpen && !this.dropdownInitialized) {
@@ -2649,7 +2703,10 @@ class MultiselectControl {
         if (value.length > 0 &&
             typeof value[0] === "object" &&
             value[0][this.optionValueProperty] != null) {
-            // Convert to an array of IDs, then treat exactly like CASE A
+            // Immediately use the value objects for display (they have displayname)
+            this.selectedItems = [...value];
+            this._updateSelectedItemList();
+            // Also set up pending mapping to sync with option references when available
             const idArray = value.map((obj) => obj[this.optionValueProperty]);
             this._isPrimitivePatch = true;
             this._pendingPrimitiveValues = idArray;