@dereekb/dbx-form 13.10.4 → 13.10.6

package/fesm2022/dereekb-dbx-form-calendar.mjs

@@ -241,6 +241,18 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
     currentSelectionValueStart$ = this.currentSelectionValue$.pipe(map((x) => x?.dateScheduleRange.start), distinctUntilChanged(isSameDate), shareReplay(1));
     currentSelectionValueDateCellTimingDateFactory$ = this.currentSelectionValue$.pipe(map((x) => (x ? dateCellTimingDateFactory({ startsAt: x.dateScheduleRange.start, timezone: x.dateScheduleRange.timezone }) : undefined)), shareReplay(1));
     currentSelectionValueDateCellDurationSpanExpansion$ = this.currentSelectionValue$.pipe(map((x) => (x ? expandDateCellScheduleRange({ dateCellScheduleRange: x.dateScheduleRange }) : [])), shareReplay(1));
+    /**
+     * State-anchored coordinate contract: the emitted indexes are anchored at
+     * `state.start` (== `filter.start` when a filter is set, otherwise `today` from
+     * `initialCalendarScheduleSelectionState()`). Consumers can use them directly
+     * with `state.indexFactory(date)`.
+     *
+     * This holds because `currentSelectionValue.dateScheduleRange.start` always
+     * equals `state.start` for filter-relative outputs, so the expansion's `i`
+     * values share the same anchor. If a future change re-introduces a non-
+     * `state.start` output anchor, translate output indexes back via
+     * `state.indexFactory(dateScheduleRange.start)` here.
+     */
     selectionValueSelectedIndexes$ = this.currentSelectionValueDateCellDurationSpanExpansion$.pipe(map((x) => new Set(x.map((y) => y.i))), distinctUntilHasDifferentValues(), shareReplay(1));
     selectionValueSelectedDates$ = this.currentSelectionValueDateCellTimingDateFactory$.pipe(switchMap((dateFactory) => {
         return dateFactory ? this.selectionValueSelectedIndexes$.pipe(map((x) => mapValuesToSet(x, (y) => formatToISO8601DayStringForSystem(dateFactory(y))))) : of(new Set());
@@ -577,11 +589,14 @@ function updateStateWithDateCellScheduleRangeValue(state, inputChange) {
         return state;
     }
     if (change != null) {
-        // The incoming ex indexes are relative to change.start, but toggledIndexes must be
-        // relative to state.start. Adjust by the offset between them.
-        const inputStartIndex = state.indexFactory(change.start);
-        const adjustedEx = inputStartIndex !== 0 && change.ex ? change.ex.map((i) => i + inputStartIndex) : (change.ex ?? []);
-        const nextState = { ...state, inputStart: change.start, inputEnd: change.end, toggledIndexes: new Set(adjustedEx) };
+        // After the legacy-restored output anchor, change.ex is already state-anchored
+        // (change.start equals state.start for filter-relative outputs), so no offset
+        // is applied. inputStart is clamped to state.minMaxDateRange.start when set so
+        // the round-trip preserves the clamp and pre-clamp days don't re-render via the
+        // "toggled outside range" branch.
+        const minMaxStart = state.minMaxDateRange?.start;
+        const clampedInputStart = minMaxStart && minMaxStart.getTime() > change.start.getTime() ? minMaxStart : change.start;
+        const nextState = { ...state, inputStart: clampedInputStart, inputEnd: change.end, toggledIndexes: new Set(change.ex ?? []) };
         return updateStateWithChangedScheduleDays(finalizeNewCalendarScheduleSelectionState(nextState), expandDateCellScheduleDayCodes(change.w || '89'));
     }
     return noSelectionCalendarScheduleSelectionState(state); // clear selection, retain disabled days
@@ -923,26 +938,8 @@ function computeScheduleSelectionValue(state) {
         const rangeStartIndex = systemIndexFactory(rangeStart);
         const startIndex = systemIndexFactory(startInSystemTimezone);
         const filterStartIndexOffset = rangeStartIndex - startIndex;
-        // When minMaxDateRange constrains the start to after filter.start,
-        // use rangeStart as the output start instead of filter.start.
-        // This prevents outputting a start date that violates the minMaxDateRange
-        // and avoids the round-trip corruption when the value is synced back to the store.
-        if (filterStartIndexOffset > 0 && state.minMaxDateRange?.start) {
-            // rangeStart already respects minMaxDateRange. Convert it to the filter's timezone for the output.
-            if (filter.timezone) {
-                const filterNormal = dateTimezoneUtcNormal(filter.timezone);
-                start = filterNormal.startOfDayInTargetTimezone(rangeStart);
-            }
-            else {
-                start = rangeStart;
-            }
-            // No filter offset exclusions needed since start is at the selection start.
-            // indexOffset stays as dateCellRange.i (relative to state.start → rangeStart).
-        }
-        else {
-            filterOffsetExcludedRange = range(0, filterStartIndexOffset);
-            indexOffset = indexOffset - filterStartIndexOffset;
-        }
+        filterOffsetExcludedRange = range(0, filterStartIndexOffset);
+        indexOffset = indexOffset - filterStartIndexOffset;
     }
     const excluded = computeSelectionResultRelativeToFilter
         ? allExcluded.filter((x) => {