@dereekb/dbx-form 9.24.46 → 9.25.0

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

@@ -7,7 +7,7 @@ import { Injectable, SkipSelf, Directive, Injector, Optional, Component, Inject,
 import { FieldType } from '@ngx-formly/material';
 import { switchMap, first, tap, map, distinctUntilChanged, shareReplay, of, combineLatestWith, BehaviorSubject, filter, combineLatest, startWith, throttleTime } from 'rxjs';
 import { filterMaybe, distinctUntilHasDifferentValues, SubscriptionObject, asObservableFromGetter, asObservable } from '@dereekb/rxjs';
-import { DateScheduleDayCode, expandDateScheduleDayCodesToDayOfWeekSet, dateBlockTimingRelativeIndexFactory, dateBlockDayOfWeekFactory, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateBlockTimingDateFactory, expandDateScheduleRange, formatToISO8601DayString, isSameDateScheduleRange, dateBlockTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateScheduleDateFilterConfig, dateScheduleDateFilter, dateTimezoneUtcNormal, expandDateScheduleDayCodes, fullWeekDayScheduleDayCodes, dateScheduleDayCodesAreSetsEquivalent, simplifyDateScheduleDayCodes, isDateInDateRangeFunction, isDateWithinDateBlockRangeFunction, copyHoursAndMinutesFromDate, dateScheduleEncodedWeek, dateBlockTimingStartDateFactory, enabledDaysFromDateScheduleDayCodes, dateScheduleDayCodesFromEnabledDays, formatToMonthDayString, dateRange, DateRangeType } from '@dereekb/date';
+import { DateCellScheduleDayCode, expandDateCellScheduleDayCodesToDayOfWeekSet, dateCellTimingStartsAtForStartOfDay, dateCellTimingRelativeIndexFactory, dateCellDayOfWeekFactory, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateCellTimingDateFactory, expandDateCellScheduleRange, formatToISO8601DayString, isSameDateCellScheduleDateRange, dateCellTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateCellScheduleDateFilterConfig, dateCellScheduleDateFilter, dateTimezoneUtcNormal, fullDateCellScheduleRange, expandDateCellScheduleDayCodes, fullWeekDateCellScheduleDayCodes, dateCellScheduleDayCodesAreSetsEquivalent, simplifyDateCellScheduleDayCodes, isDateInDateRangeFunction, isDateWithinDateCellRangeFunction, copyHoursAndMinutesFromDate, dateCellScheduleEncodedWeek, dateCellTimingStartDateFactory, enabledDaysFromDateCellScheduleDayCodes, dateCellScheduleDayCodesFromEnabledDays, formatToMonthDayString, dateRange, DateRangeType } from '@dereekb/date';
 import { isInAllowedDaysOfWeekSet, mapValuesToSet, unique, mergeArrays, iterableToArray, range, toggleInSet, removeFromSet, addToSet, isIndexNumberInIndexRangeFunction, minAndMaxNumber, getDaysOfWeekNames, reduceBooleansWithAnd, mergeObjects, KeyValueTypleValueFilter } from '@dereekb/util';
 import { ComponentStore } from '@ngrx/component-store';
 import { startOfDay, endOfDay, isBefore, endOfWeek } from 'date-fns';
@@ -37,7 +37,7 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle';
 import { FlexLayoutModule } from '@angular/flex-layout';
 
 function dateScheduleRangeField(config = {}) {
-    const { key = 'schedule', appearance, hideCustomize, allowTextInput, filter, timezone, initialSelectionState, computeSelectionResultRelativeToFilter, exclusions, defaultScheduleDays, minMaxDateRange, cellContentFactory, dialogContentConfig, closeDialogConfig, customDetailsConfig } = config;
+    const { key = 'schedule', appearance, hideCustomize, allowTextInput, filter, timezone, initialSelectionState, computeSelectionResultRelativeToFilter, exclusions, defaultScheduleDays, minMaxDateRange, cellContentFactory, dialogContentConfig, customDetailsConfig } = config;
     const fieldConfig = {
         ...formlyField({
             key,
@@ -53,7 +53,6 @@ function dateScheduleRangeField(config = {}) {
                 filter,
                 exclusions,
                 dialogContentConfig,
-                closeDialogConfig,
                 computeSelectionResultRelativeToFilter,
                 initialSelectionState,
                 cellContentFactory,
@@ -95,13 +94,15 @@ const defaultCalendarScheduleSelectionCellContentFactory = (day) => {
 };
 
 function initialCalendarScheduleSelectionState() {
-    const defaultScheduleDays = new Set([DateScheduleDayCode.WEEKDAY, DateScheduleDayCode.WEEKEND]);
-    const allowedDaysOfWeek = expandDateScheduleDayCodesToDayOfWeekSet(defaultScheduleDays);
-    const start = startOfDay(new Date());
-    const indexFactory = dateBlockTimingRelativeIndexFactory({ start });
-    const indexDayOfWeek = dateBlockDayOfWeekFactory(start);
+    const defaultScheduleDays = new Set([DateCellScheduleDayCode.WEEKDAY, DateCellScheduleDayCode.WEEKEND]);
+    const allowedDaysOfWeek = expandDateCellScheduleDayCodesToDayOfWeekSet(defaultScheduleDays);
+    const defaultStartsAt = dateCellTimingStartsAtForStartOfDay(); // get midnight of the current timezone
+    const { startsAt, timezone: systemTimezone } = defaultStartsAt;
+    const indexFactory = dateCellTimingRelativeIndexFactory(defaultStartsAt);
+    const indexDayOfWeek = dateCellDayOfWeekFactory(startsAt);
     return {
-        start,
+        start: startsAt,
+        systemTimezone,
         indexFactory,
         toggledIndexes: new Set(),
         defaultScheduleDays,
@@ -170,19 +171,19 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
         this.allowedDaysOfWeek$ = this.state$.pipe(map((x) => x.allowedDaysOfWeek), distinctUntilHasDifferentValues(), shareReplay(1));
         this.isInAllowedDaysOfWeekFunction$ = this.allowedDaysOfWeek$.pipe(map((x) => isInAllowedDaysOfWeekSet(x)), shareReplay(1));
         this.scheduleDays$ = this.state$.pipe(map((x) => x.effectiveScheduleDays), distinctUntilHasDifferentValues(), shareReplay(1));
-        this.currentTimezone$ = this.state$.pipe(map((x) => x.timezone), distinctUntilChanged(), shareReplay(1));
-        this.effectiveTimezone$ = this.state$.pipe(map((x) => (!calendarScheduleStartBeingUsedFromFilter(x) && x.timezone ? x.timezone : undefined)), distinctUntilChanged(), shareReplay(1));
-        this.effectiveTimezoneNormal$ = this.state$.pipe(map((x) => (!calendarScheduleStartBeingUsedFromFilter(x) && x.timezoneNormal ? x.timezoneNormal : undefined)), distinctUntilChanged(), shareReplay(1));
+        this.outputTimezone$ = this.state$.pipe(map((x) => x.outputTimezone), distinctUntilChanged(), shareReplay(1));
+        this.effectiveOutputTimezone$ = this.state$.pipe(map((x) => (!calendarScheduleStartBeingUsedFromFilter(x) && x.outputTimezone ? x.outputTimezone : undefined)), distinctUntilChanged(), shareReplay(1));
+        this.effectiveOutputTimezoneNormal$ = this.state$.pipe(map((x) => (!calendarScheduleStartBeingUsedFromFilter(x) && x.outputTimezoneNormal ? x.outputTimezoneNormal : undefined)), distinctUntilChanged(), shareReplay(1));
         this.currentSelectionValue$ = this.state$.pipe(map((x) => x.currentSelectionValue), shareReplay(1));
         this.currentSelectionValueStart$ = this.currentSelectionValue$.pipe(map((x) => x?.dateScheduleRange.start), distinctUntilChanged(isSameDate), shareReplay(1));
-        this.currentSelectionValueDateBlockTimingDateFactory$ = this.currentSelectionValueStart$.pipe(map((start) => (start ? dateBlockTimingDateFactory({ start }) : undefined)), shareReplay(1));
-        this.currentSelectionValueDateBlockDurationSpan$ = this.currentSelectionValue$.pipe(map((x) => (x ? expandDateScheduleRange({ ...x, duration: 1 }) : [])), shareReplay(1));
-        this.selectionValueSelectedIndexes$ = this.currentSelectionValueDateBlockDurationSpan$.pipe(map((x) => new Set(x.map((y) => y.i))), distinctUntilHasDifferentValues(), shareReplay(1));
-        this.selectionValueSelectedDates$ = this.currentSelectionValueDateBlockTimingDateFactory$.pipe(switchMap((dateFactory) => {
+        this.currentSelectionValueDateCellTimingDateFactory$ = this.currentSelectionValue$.pipe(map((x) => (x ? dateCellTimingDateFactory({ startsAt: x.dateScheduleRange.start, timezone: x.dateScheduleRange.timezone }) : undefined)), shareReplay(1));
+        this.currentSelectionValueDateCellDurationSpanExpansion$ = this.currentSelectionValue$.pipe(map((x) => (x ? expandDateCellScheduleRange({ dateCellScheduleRange: x.dateScheduleRange }) : [])), shareReplay(1));
+        this.selectionValueSelectedIndexes$ = this.currentSelectionValueDateCellDurationSpanExpansion$.pipe(map((x) => new Set(x.map((y) => y.i))), distinctUntilHasDifferentValues(), shareReplay(1));
+        this.selectionValueSelectedDates$ = this.currentSelectionValueDateCellTimingDateFactory$.pipe(switchMap((dateFactory) => {
             return dateFactory ? this.selectionValueSelectedIndexes$.pipe(map((x) => mapValuesToSet(x, (y) => formatToISO8601DayString(dateFactory(y))))) : of(new Set());
         }), shareReplay(1));
         this.selectionValue$ = this.currentSelectionValue$.pipe(filterMaybe(), shareReplay(1));
-        this.currentSelectionValueWithTimezone$ = this.currentSelectionValue$.pipe(combineLatestWith(this.effectiveTimezoneNormal$), map(([x, timezoneNormal]) => {
+        this.currentSelectionValueWithTimezone$ = this.currentSelectionValue$.pipe(combineLatestWith(this.effectiveOutputTimezoneNormal$), map(([x, timezoneNormal]) => {
             if (x && timezoneNormal) {
                 x = {
                     dateScheduleRange: {
@@ -195,7 +196,7 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
             return x;
         }), distinctUntilChanged(), shareReplay(1));
         this.selectionValueWithTimezone$ = this.currentSelectionValueWithTimezone$.pipe(filterMaybe(), shareReplay(1));
-        this.selectionValueWithTimezoneDateBlockDurationSpan$ = this.selectionValueWithTimezone$.pipe(map((x) => expandDateScheduleRange({ ...x, duration: 1 })), shareReplay(1));
+        this.selectionValueWithTimezoneDateCellDurationSpanExpansion$ = this.selectionValueWithTimezone$.pipe(map((x) => expandDateCellScheduleRange({ dateCellScheduleRange: x.dateScheduleRange })), shareReplay(1));
         this.nextToggleSelection$ = this.hasConfiguredMinMaxRange$.pipe(switchMap((hasConfiguredMinMaxRange) => {
             let obs;
             if (hasConfiguredMinMaxRange) {
@@ -206,8 +207,8 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
             }
             return obs;
         }), shareReplay(1));
-        this.currentDateScheduleRangeValue$ = this.currentSelectionValueWithTimezone$.pipe(map((x) => x?.dateScheduleRange), distinctUntilChanged(isSameDateScheduleRange), shareReplay(1));
-        this.dateScheduleRangeValue$ = this.currentDateScheduleRangeValue$.pipe(filterMaybe(), shareReplay(1));
+        this.currentDateCellScheduleRangeValue$ = this.currentSelectionValueWithTimezone$.pipe(map((x) => x?.dateScheduleRange), distinctUntilChanged(isSameDateCellScheduleDateRange), shareReplay(1));
+        this.dateCellScheduleRangeValue$ = this.currentDateCellScheduleRangeValue$.pipe(filterMaybe(), shareReplay(1));
         this.cellContentFactory$ = this.state$.pipe(map((x) => x.cellContentFactory), distinctUntilChanged(), shareReplay(1));
         this.isCustomized$ = this.state$.pipe(map((x) => x.toggledIndexes.size > 0), distinctUntilChanged(), shareReplay(1));
         this.isViewReadonly$ = this.state$.pipe(map((x) => x.isViewReadonly), distinctUntilChanged(), shareReplay(1));
@@ -218,7 +219,7 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
         this.setExclusions = this.updater(updateStateWithExclusions);
         this.setComputeSelectionResultRelativeToFilter = this.updater(updateStateWithComputeSelectionResultRelativeToFilter);
         this.clearFilter = this.updater((state) => updateStateWithFilter(state, undefined));
-        this.setTimezone = this.updater(updateStateWithTimezoneValue);
+        this.setOutputTimezone = this.updater(updateStateWithTimezoneValue);
         this.setInputRange = this.updater(updateStateWithChangedRange);
         // NOTE: Selected dates are NOT selected indexes. They are the internal selected dates that are excluded from the selection.
         this.toggleSelectedDates = this.updater((state, toggle) => updateStateWithChangedDates(state, { toggle }));
@@ -231,8 +232,8 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
         this.setInitialSelectionState = this.updater(updateStateWithInitialSelectionState);
         this.setDefaultScheduleDays = this.updater(updateStateWithChangedDefaultScheduleDays);
         this.setScheduleDays = this.updater(updateStateWithChangedScheduleDays);
-        this.setAllowAllScheduleDays = this.updater((state) => updateStateWithChangedScheduleDays(state, [DateScheduleDayCode.WEEKDAY, DateScheduleDayCode.WEEKEND]));
-        this.setDateScheduleRangeValue = this.updater((state, value) => updateStateWithDateScheduleRangeValue(state, value));
+        this.setAllowAllScheduleDays = this.updater((state) => updateStateWithChangedScheduleDays(state, [DateCellScheduleDayCode.WEEKDAY, DateCellScheduleDayCode.WEEKEND]));
+        this.setDateScheduleRangeValue = this.updater((state, value) => updateStateWithDateCellScheduleRangeValue(state, value));
         this.setCellContentFactory = this.updater((state, cellContentFactory) => ({ ...state, cellContentFactory }));
         /**
          * Used by the parent view to propogate a readonly state.
@@ -240,6 +241,31 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
          * Should typically not be used by the user directly with the intention of the parent synchronizing to this state.
          */
         this.setViewReadonlyState = this.updater((state, isViewReadonly) => ({ ...state, isViewReadonly }));
+        // MARK: Compat
+        /**
+         * @deprecated use setOutputTimezone instead.
+         */
+        this.setTimezone = this.setOutputTimezone;
+        /**
+         * @deprecated use ouputTimezone$
+         */
+        this.currentTimezone$ = this.outputTimezone$;
+        /**
+         * @deprecated use effectiveOuputTimezone$
+         */
+        this.effectiveTimezone$ = this.effectiveOutputTimezone$;
+        /**
+         * @deprecated use effectiveOuputTimezoneNormal$
+         */
+        this.effectiveTimezoneNormal$ = this.effectiveOutputTimezoneNormal$;
+        /**
+         * @deprecated use currentSelectionValueDateCellDurationSpanExpansion$
+         */
+        this.currentSelectionValueDateBlockDurationSpan$ = this.currentSelectionValueDateCellDurationSpanExpansion$;
+        /**
+         * @deprecated use selectionValueWithTimezoneDateCellDurationSpanExpansion$
+         */
+        this.selectionValueWithTimezoneDateBlockDurationSpan$ = this.selectionValueWithTimezoneDateCellDurationSpanExpansion$;
     }
 }
 DbxCalendarScheduleSelectionStore.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxCalendarScheduleSelectionStore, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -265,7 +291,7 @@ function updateStateWithExclusions(state, inputExclusions) {
     let computedExclusions;
     if (inputExclusions) {
         const { indexFactory } = state;
-        const indexArrayFactory = dateBlockTimingRelativeIndexArrayFactory(indexFactory);
+        const indexArrayFactory = dateCellTimingRelativeIndexArrayFactory(indexFactory);
         computedExclusions = indexArrayFactory(inputExclusions);
     }
     state = { ...state, inputExclusions, computedExclusions };
@@ -285,14 +311,14 @@ function updateStateWithMinMaxDateRange(state, minMaxDateRange) {
     return updateStateWithFilter(state, state.filter);
 }
 function updateStateWithFilter(state, inputFilter) {
-    const { computedExclusions: exclusions, minMaxDateRange } = state;
+    const { computedExclusions: exclusions, minMaxDateRange, systemTimezone } = state;
     let isEnabledFilterDay = () => true;
     let filter = null;
     // create the filter using inputFilter, exclusions, and minMaxDateRange
     if (inputFilter || exclusions?.length || minMaxDateRange) {
         let enabledFilter;
         if (inputFilter) {
-            filter = copyDateScheduleDateFilterConfig(inputFilter); // copy filter
+            filter = copyDateCellScheduleDateFilterConfig(inputFilter); // copy filter
             if (exclusions?.length) {
                 enabledFilter = {
                     ...filter,
@@ -319,15 +345,15 @@ function updateStateWithFilter(state, inputFilter) {
          */
         enabledFilter.start = inputFilter?.start ?? state.start;
         // create the filter
-        isEnabledFilterDay = dateScheduleDateFilter(enabledFilter);
+        isEnabledFilterDay = dateCellScheduleDateFilter(enabledFilter);
     }
     state = { ...state, filter, isEnabledFilterDay };
     // For the same reason as above, use the filter's start date as the relative start if applicable.
     if (filter && filter.start) {
         const start = filter.start;
         state.start = start;
-        state.indexFactory = dateBlockTimingRelativeIndexFactory({ start });
-        state.indexDayOfWeek = dateBlockDayOfWeekFactory(start);
+        state.indexFactory = dateCellTimingRelativeIndexFactory({ startsAt: start, timezone: filter.timezone ?? systemTimezone });
+        state.indexDayOfWeek = dateCellDayOfWeekFactory(start);
     }
     // attempt to re-apply the initial selection state once filter is applied
     if (state.initialSelectionState) {
@@ -345,42 +371,48 @@ function updateStateWithTimezoneValue(state, timezone) {
     const timezoneNormal = timezone ? dateTimezoneUtcNormal({ timezone }) : undefined;
     if (timezoneNormal && currentSelectionValue) {
         // update the selection value to reflect the timezone changes.
-        const { dateScheduleRange: currentDateScheduleRange } = currentSelectionValue;
-        const start = timezoneNormal.targetDateToSystemDate(currentDateScheduleRange.start);
-        const end = timezoneNormal.targetDateToSystemDate(currentDateScheduleRange.end);
+        const { dateScheduleRange: currentDateCellScheduleRange } = currentSelectionValue;
+        const start = timezoneNormal.targetDateToSystemDate(currentDateCellScheduleRange.start);
+        const end = timezoneNormal.targetDateToSystemDate(currentDateCellScheduleRange.end);
         const newRange = {
             ...currentSelectionValue.dateScheduleRange,
             start,
             end
         };
-        return updateStateWithDateScheduleRangeValue({ ...state, timezone, timezoneNormal }, newRange);
+        return updateStateWithDateCellScheduleRangeValue({ ...state, outputTimezone: timezone, outputTimezoneNormal: timezoneNormal }, newRange);
     }
     else {
-        return { ...state, timezone, timezoneNormal }; // no change in value
+        return { ...state, outputTimezone: timezone, outputTimezoneNormal: timezoneNormal }; // no change in value
     }
 }
-function updateStateWithDateScheduleRangeValue(state, change) {
-    const { timezoneNormal, currentSelectionValue } = state;
-    const currentDateScheduleRange = currentSelectionValue?.dateScheduleRange; // current range is always in system time
+function updateStateWithDateCellScheduleRangeValue(state, inputChange) {
+    const { outputTimezoneNormal: timezoneNormal, currentSelectionValue } = state;
+    const currentDateCellScheduleRange = currentSelectionValue?.dateScheduleRange; // current range is always in system time
+    let change;
     if (!calendarScheduleStartBeingUsedFromFilter(state) && timezoneNormal) {
         // When using timezones, always return from the start of the day. Inputs are converted to the system time and used as the start of the day.
         // Outputs remain accurate.
-        if (change) {
+        if (inputChange) {
+            // calculate the schedule range
+            const fullChange = fullDateCellScheduleRange({ dateCellScheduleRange: inputChange });
+            // convert the start/end to system time
             change = {
-                ...change,
-                start: startOfDay(timezoneNormal.systemDateToTargetDate(change.start)),
-                end: startOfDay(timezoneNormal.systemDateToTargetDate(change.end))
+                start: startOfDay(timezoneNormal.systemDateToTargetDate(fullChange.start)),
+                end: startOfDay(timezoneNormal.systemDateToTargetDate(fullChange.end)),
+                w: fullChange.w,
+                ex: fullChange.ex,
+                timezone: fullChange.timezone
             };
         }
     }
-    const isSameValue = isSameDateScheduleRange(currentDateScheduleRange, change);
+    const isSameValue = isSameDateCellScheduleDateRange(currentDateCellScheduleRange, change);
     if (isSameValue) {
         return state;
     }
     else {
         if (change != null) {
             const nextState = { ...state, inputStart: change.start, inputEnd: change.end, toggledIndexes: new Set(change.ex) };
-            return updateStateWithChangedScheduleDays(finalizeNewCalendarScheduleSelectionState(nextState), expandDateScheduleDayCodes(change.w || '89'));
+            return updateStateWithChangedScheduleDays(finalizeNewCalendarScheduleSelectionState(nextState), expandDateCellScheduleDayCodes(change.w || '89'));
         }
         else {
             return noSelectionCalendarScheduleSelectionState(state); // clear selection, retain disabled days
@@ -389,8 +421,8 @@ function updateStateWithDateScheduleRangeValue(state, change) {
 }
 function updateStateWithChangedDefaultScheduleDays(state, change) {
     const { defaultScheduleDays: currentDefaultScheduleDays } = state;
-    const defaultScheduleDays = new Set(change ?? fullWeekDayScheduleDayCodes());
-    if (dateScheduleDayCodesAreSetsEquivalent(defaultScheduleDays, currentDefaultScheduleDays)) {
+    const defaultScheduleDays = new Set(change ?? fullWeekDateCellScheduleDayCodes());
+    if (dateCellScheduleDayCodesAreSetsEquivalent(defaultScheduleDays, currentDefaultScheduleDays)) {
         return state; // no change
     }
     else {
@@ -402,7 +434,7 @@ function updateStateWithChangedScheduleDays(state, change) {
     const scheduleDays = new Set(change ?? []);
     let newScheduleDays;
     if (currentScheduleDays != null && change != null) {
-        if (dateScheduleDayCodesAreSetsEquivalent(scheduleDays, currentScheduleDays)) {
+        if (dateCellScheduleDayCodesAreSetsEquivalent(scheduleDays, currentScheduleDays)) {
             newScheduleDays = undefined; //no change
         }
         else {
@@ -422,12 +454,12 @@ function updateStateWithChangedScheduleDays(state, change) {
 function finalizeUpdateStateWithChangedScheduleDays(previousState, nextState) {
     const previousScheduleDays = previousState.effectiveScheduleDays;
     const nextScheduleDays = nextState.scheduleDays ?? nextState.defaultScheduleDays;
-    if (dateScheduleDayCodesAreSetsEquivalent(nextScheduleDays, previousScheduleDays)) {
+    if (dateCellScheduleDayCodesAreSetsEquivalent(nextScheduleDays, previousScheduleDays)) {
         return nextState; // the default or input schedule changed but the schedule is still the same, so no need for an update.
     }
     else {
-        const effectiveScheduleDays = new Set(simplifyDateScheduleDayCodes(nextScheduleDays));
-        const allowedDaysOfWeek = expandDateScheduleDayCodesToDayOfWeekSet(nextScheduleDays);
+        const effectiveScheduleDays = new Set(simplifyDateCellScheduleDayCodes(nextScheduleDays));
+        const allowedDaysOfWeek = expandDateCellScheduleDayCodesToDayOfWeekSet(nextScheduleDays);
         return finalizeNewCalendarScheduleSelectionState({
             ...nextState,
             // update the effective schedule days and allowed days of week
@@ -547,10 +579,10 @@ function finalizeNewCalendarScheduleSelectionState(nextState) {
     return nextState;
 }
 function isEnabledDayInCalendarScheduleSelectionState(state) {
-    const { allowedDaysOfWeek, indexFactory, inputStart, inputEnd, indexDayOfWeek } = state;
+    const { allowedDaysOfWeek, indexFactory, inputStart, inputEnd, indexDayOfWeek, systemTimezone } = state;
     let isInStartAndEndRange;
     if (inputStart && inputEnd) {
-        isInStartAndEndRange = isDateWithinDateBlockRangeFunction({ start: state.start, range: { start: inputStart, end: inputEnd } });
+        isInStartAndEndRange = isDateWithinDateCellRangeFunction({ startsAt: { startsAt: state.start, timezone: systemTimezone }, range: { start: inputStart, end: inputEnd } });
     }
     else {
         isInStartAndEndRange = () => false;
@@ -566,14 +598,14 @@ function isEnabledDayInCalendarScheduleSelectionState(state) {
     };
 }
 function computeScheduleSelectionValue(state) {
-    const { indexFactory, allowedDaysOfWeek, effectiveScheduleDays, indexDayOfWeek, computeSelectionResultRelativeToFilter, filter } = state;
+    const { indexFactory, allowedDaysOfWeek, effectiveScheduleDays, indexDayOfWeek, computeSelectionResultRelativeToFilter, filter, systemTimezone } = state;
     const rangeAndExclusion = computeScheduleSelectionRangeAndExclusion(state);
     if (rangeAndExclusion == null) {
         return null;
     }
-    const { start: rangeStart, end: rangeEnd, excluded: allExcluded, dateBlockRange } = rangeAndExclusion;
+    const { start: rangeStart, end: rangeEnd, excluded: allExcluded, dateCellRange } = rangeAndExclusion;
     let filterOffsetExcludedRange = [];
-    let indexOffset = dateBlockRange.i;
+    let indexOffset = dateCellRange.i;
     let start = rangeStart;
     let end = rangeEnd;
     // If computeSelectionResultRelativeToFilter is true, then we need to offset the values to be relative to that start.
@@ -594,13 +626,14 @@ function computeScheduleSelectionValue(state) {
         : allExcluded;
     const offsetExcluded = excluded.map((x) => x - indexOffset); // set to the proper offset
     const ex = [...filterOffsetExcludedRange, ...offsetExcluded];
-    const w = dateScheduleEncodedWeek(effectiveScheduleDays);
+    const w = dateCellScheduleEncodedWeek(effectiveScheduleDays);
     const d = []; // "included" blocks are never used/calculated.
     // Always ensure the end is after or equal to the start.
     if (isBefore(end, start)) {
         end = start; // end is start
     }
     const dateScheduleRange = {
+        timezone: systemTimezone,
         start,
         end,
         w,
@@ -613,20 +646,20 @@ function computeScheduleSelectionValue(state) {
     };
 }
 function computeScheduleSelectionRangeAndExclusion(state) {
-    const { start: currentStart, isEnabledDay, isEnabledFilterDay } = state;
-    const dateFactory = dateBlockTimingStartDateFactory({ start: currentStart }, { assertTimingMatchesTimezone: false, useSystemTimezone: true });
-    const dateBlockRange = computeCalendarScheduleSelectionDateBlockRange(state);
-    if (dateBlockRange == null) {
+    const { start: currentStart, isEnabledDay, isEnabledFilterDay, systemTimezone } = state;
+    const dateFactory = dateCellTimingStartDateFactory({ startsAt: currentStart, timezone: systemTimezone });
+    const dateCellRange = computeCalendarScheduleSelectionDateCellRange(state);
+    if (dateCellRange == null) {
         return null; // returns null if no items are selected.
     }
-    const start = dateFactory(dateBlockRange.i);
-    const end = dateFactory(dateBlockRange.to);
-    const excluded = range(dateBlockRange.i, dateBlockRange.to + 1).filter((x) => {
+    const start = dateFactory(dateCellRange.i);
+    const end = dateFactory(dateCellRange.to);
+    const excluded = range(dateCellRange.i, dateCellRange.to + 1).filter((x) => {
         const isExcludedIndex = !isEnabledDay(x) || !isEnabledFilterDay(x);
         return isExcludedIndex;
     });
     const result = {
-        dateBlockRange,
+        dateCellRange,
         start,
         end,
         excluded
@@ -634,12 +667,12 @@ function computeScheduleSelectionRangeAndExclusion(state) {
     return result;
 }
 function computeCalendarScheduleSelectionRange(state) {
-    const dateFactory = dateBlockTimingDateFactory(state);
-    const dateBlockRange = computeCalendarScheduleSelectionDateBlockRange(state);
-    const dateRange = dateBlockRange != null ? { start: dateFactory(dateBlockRange.i), end: dateFactory(dateBlockRange.to) } : undefined;
+    const dateFactory = dateCellTimingDateFactory({ startsAt: state.start, timezone: state.systemTimezone });
+    const dateCellRange = computeCalendarScheduleSelectionDateCellRange(state);
+    const dateRange = dateCellRange != null ? { start: dateFactory(dateCellRange.i), end: dateFactory(dateCellRange.to) } : undefined;
     return dateRange;
 }
-function computeCalendarScheduleSelectionDateBlockRange(state) {
+function computeCalendarScheduleSelectionDateCellRange(state) {
     const { allowedDaysOfWeek, indexFactory, inputStart, inputEnd, indexDayOfWeek, isEnabledDay, isEnabledFilterDay } = state;
     const enabledExclusionIndexes = Array.from(state.toggledIndexes).filter((i) => allowedDaysOfWeek.has(indexDayOfWeek(i)));
     const minAndMaxSelectedValues = minAndMaxNumber(enabledExclusionIndexes);
@@ -940,16 +973,16 @@ class DbxScheduleSelectionCalendarDateDaysComponent {
     constructor(dbxCalendarStore, dbxCalendarScheduleSelectionStore) {
         this.dbxCalendarStore = dbxCalendarStore;
         this.dbxCalendarScheduleSelectionStore = dbxCalendarScheduleSelectionStore;
-        this.template$ = this.dbxCalendarScheduleSelectionStore.scheduleDays$.pipe(map(enabledDaysFromDateScheduleDayCodes), shareReplay(1));
+        this.template$ = this.dbxCalendarScheduleSelectionStore.scheduleDays$.pipe(map(enabledDaysFromDateCellScheduleDayCodes), shareReplay(1));
         this.isFormModified = (value) => {
-            const newSetValue = new Set(dateScheduleDayCodesFromEnabledDays(value));
+            const newSetValue = new Set(dateCellScheduleDayCodesFromEnabledDays(value));
             return this.dbxCalendarScheduleSelectionStore.scheduleDays$.pipe(map((currentSet) => {
-                const result = !dateScheduleDayCodesAreSetsEquivalent(newSetValue, currentSet);
+                const result = !dateCellScheduleDayCodesAreSetsEquivalent(newSetValue, currentSet);
                 return result;
             }));
         };
         this.updateScheduleDays = (value) => {
-            this.dbxCalendarScheduleSelectionStore.setScheduleDays(new Set(dateScheduleDayCodesFromEnabledDays(value)));
+            this.dbxCalendarScheduleSelectionStore.setScheduleDays(new Set(dateCellScheduleDayCodesFromEnabledDays(value)));
             return of(true);
         };
     }
@@ -1413,7 +1446,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                 type: Input
             }] } });
 
-class DbxFormCalendarDateScheduleRangeFieldComponent extends FieldType {
+class DbxFormCalendarDateCellScheduleRangeFieldComponent extends FieldType {
     constructor(compact, dbxCalendarScheduleSelectionStore, ngZone) {
         super();
         this.compact = compact;
@@ -1476,9 +1509,6 @@ class DbxFormCalendarDateScheduleRangeFieldComponent extends FieldType {
     get computeSelectionResultRelativeToFilter() {
         return this.props.computeSelectionResultRelativeToFilter;
     }
-    get closeDialogConfig() {
-        return this.props.closeDialogConfig;
-    }
     get dialogContentConfig() {
         return this.props.dialogContentConfig;
     }
@@ -1490,10 +1520,10 @@ class DbxFormCalendarDateScheduleRangeFieldComponent extends FieldType {
     }
     ngOnInit() {
         this._formControlObs.next(this.formControl);
-        this._syncSub.subscription = this.value$.pipe(distinctUntilChanged(isSameDateScheduleRange)).subscribe((x) => {
+        this._syncSub.subscription = this.value$.pipe(distinctUntilChanged(isSameDateCellScheduleDateRange)).subscribe((x) => {
             this.dbxCalendarScheduleSelectionStore.setDateScheduleRangeValue(x);
         });
-        this._valueSub.subscription = this.dbxCalendarScheduleSelectionStore.currentDateScheduleRangeValue$.subscribe((x) => {
+        this._valueSub.subscription = this.dbxCalendarScheduleSelectionStore.currentDateCellScheduleRangeValue$.subscribe((x) => {
             this.formControl.setValue(x);
         });
         const { timezone, minMaxDateRange, filter, exclusions, defaultScheduleDays } = this;
@@ -1533,22 +1563,22 @@ class DbxFormCalendarDateScheduleRangeFieldComponent extends FieldType {
         this._formControlObs.complete();
     }
 }
-DbxFormCalendarDateScheduleRangeFieldComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormCalendarDateScheduleRangeFieldComponent, deps: [{ token: i1$1.CompactContextStore, optional: true }, { token: DbxCalendarScheduleSelectionStore }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Component });
-DbxFormCalendarDateScheduleRangeFieldComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: DbxFormCalendarDateScheduleRangeFieldComponent, selector: "ng-component", providers: [provideCalendarScheduleSelectionStoreIfParentIsUnavailable()], usesInheritance: true, ngImport: i0, template: `
+DbxFormCalendarDateCellScheduleRangeFieldComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormCalendarDateCellScheduleRangeFieldComponent, deps: [{ token: i1$1.CompactContextStore, optional: true }, { token: DbxCalendarScheduleSelectionStore }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Component });
+DbxFormCalendarDateCellScheduleRangeFieldComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: DbxFormCalendarDateCellScheduleRangeFieldComponent, selector: "ng-component", providers: [provideCalendarScheduleSelectionStoreIfParentIsUnavailable()], usesInheritance: true, ngImport: i0, template: `
     <div class="dbx-schedule-selection-field">
       <dbx-schedule-selection-calendar-date-range [openPickerOnTextClick]="openPickerOnTextClick" [showCustomize]="showCustomize" [required]="required" [disabled]="isReadonlyOrDisabled" [label]="label" [hint]="description">
-        <dbx-schedule-selection-calendar-date-dialog-button customizeButton [disabled]="disableCustomize$ | async" [contentConfig]="dialogContentConfig" [closeConfig]="closeDialogConfig"></dbx-schedule-selection-calendar-date-dialog-button>
+        <dbx-schedule-selection-calendar-date-dialog-button customizeButton [disabled]="disableCustomize$ | async" [contentConfig]="dialogContentConfig"></dbx-schedule-selection-calendar-date-dialog-button>
         <dbx-injection [config]="customDetailsConfig"></dbx-injection>
       </dbx-schedule-selection-calendar-date-range>
     </div>
   `, isInline: true, dependencies: [{ kind: "component", type: i3$1.DbxInjectionComponent, selector: "dbx-injection, [dbxInjection], [dbx-injection]", inputs: ["config", "template"] }, { kind: "component", type: DbxScheduleSelectionCalendarDateRangeComponent, selector: "dbx-schedule-selection-calendar-date-range", inputs: ["openPickerOnTextClick", "label", "hint", "disabled", "showCustomize", "required"] }, { kind: "component", type: DbxScheduleSelectionCalendarDateDialogButtonComponent, selector: "dbx-schedule-selection-calendar-date-dialog-button", inputs: ["buttonText", "disabled", "contentConfig", "closeConfig"] }, { kind: "pipe", type: i4.AsyncPipe, name: "async" }] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormCalendarDateScheduleRangeFieldComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormCalendarDateCellScheduleRangeFieldComponent, decorators: [{
             type: Component,
             args: [{
                     template: `
     <div class="dbx-schedule-selection-field">
       <dbx-schedule-selection-calendar-date-range [openPickerOnTextClick]="openPickerOnTextClick" [showCustomize]="showCustomize" [required]="required" [disabled]="isReadonlyOrDisabled" [label]="label" [hint]="description">
-        <dbx-schedule-selection-calendar-date-dialog-button customizeButton [disabled]="disableCustomize$ | async" [contentConfig]="dialogContentConfig" [closeConfig]="closeDialogConfig"></dbx-schedule-selection-calendar-date-dialog-button>
+        <dbx-schedule-selection-calendar-date-dialog-button customizeButton [disabled]="disableCustomize$ | async" [contentConfig]="dialogContentConfig"></dbx-schedule-selection-calendar-date-dialog-button>
         <dbx-injection [config]="customDetailsConfig"></dbx-injection>
       </dbx-schedule-selection-calendar-date-range>
     </div>
@@ -1687,10 +1717,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                 }]
         }] });
 
-class DbxFormDateScheduleRangeFieldModule {
+class DbxFormDateCellScheduleRangeFieldModule {
 }
-DbxFormDateScheduleRangeFieldModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateScheduleRangeFieldModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-DbxFormDateScheduleRangeFieldModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateScheduleRangeFieldModule, declarations: [DbxFormCalendarDateScheduleRangeFieldComponent], imports: [DbxInjectionComponentModule,
+DbxFormDateCellScheduleRangeFieldModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateCellScheduleRangeFieldModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+DbxFormDateCellScheduleRangeFieldModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateCellScheduleRangeFieldModule, declarations: [DbxFormCalendarDateCellScheduleRangeFieldComponent], imports: [DbxInjectionComponentModule,
         CommonModule,
         MatIconModule,
         DbxFormCalendarModule,
@@ -1699,7 +1729,7 @@ DbxFormDateScheduleRangeFieldModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersio
         FormsModule,
         ReactiveFormsModule,
         MatInputModule, i1$3.FormlyModule] });
-DbxFormDateScheduleRangeFieldModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateScheduleRangeFieldModule, imports: [DbxInjectionComponentModule,
+DbxFormDateCellScheduleRangeFieldModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateCellScheduleRangeFieldModule, imports: [DbxInjectionComponentModule,
         CommonModule,
         MatIconModule,
         DbxFormCalendarModule,
@@ -1709,9 +1739,9 @@ DbxFormDateScheduleRangeFieldModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersio
         ReactiveFormsModule,
         MatInputModule,
         FormlyModule.forChild({
-            types: [{ name: 'date-schedule-range', component: DbxFormCalendarDateScheduleRangeFieldComponent }]
+            types: [{ name: 'date-schedule-range', component: DbxFormCalendarDateCellScheduleRangeFieldComponent }]
         })] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateScheduleRangeFieldModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxFormDateCellScheduleRangeFieldModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -1725,10 +1755,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                         ReactiveFormsModule,
                         MatInputModule,
                         FormlyModule.forChild({
-                            types: [{ name: 'date-schedule-range', component: DbxFormCalendarDateScheduleRangeFieldComponent }]
+                            types: [{ name: 'date-schedule-range', component: DbxFormCalendarDateCellScheduleRangeFieldComponent }]
                         })
                     ],
-                    declarations: [DbxFormCalendarDateScheduleRangeFieldComponent]
+                    declarations: [DbxFormCalendarDateCellScheduleRangeFieldComponent]
                 }]
         }] });
 
@@ -1738,5 +1768,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { CalendarScheduleSelectionDayState, DEFAULT_DBX_SCHEDULE_SELECTION_CALENDAR_DATE_POPUP_CLOSE_CONFIG_TOKEN, DEFAULT_DBX_SCHEDULE_SELECTION_CALENDAR_DATE_POPUP_CONTENT_CONFIG_TOKEN, DEFAULT_SCHEDULE_SELECTION_CALENDAR_DATE_POPOVER_KEY, DbxCalendarScheduleSelectionStore, DbxCalendarScheduleSelectionStoreInjectionBlockDirective, DbxCalendarScheduleSelectionStoreProviderBlock, DbxFormCalendarDateScheduleRangeFieldComponent, DbxFormCalendarModule, DbxFormDateScheduleRangeFieldModule, DbxScheduleSelectionCalendarCellComponent, DbxScheduleSelectionCalendarComponent, DbxScheduleSelectionCalendarDateDaysComponent, DbxScheduleSelectionCalendarDateDaysFormComponent, DbxScheduleSelectionCalendarDateDialogButtonComponent, DbxScheduleSelectionCalendarDateDialogComponent, DbxScheduleSelectionCalendarDatePopoverButtonComponent, DbxScheduleSelectionCalendarDatePopoverComponent, DbxScheduleSelectionCalendarDatePopoverContentComponent, DbxScheduleSelectionCalendarDateRangeComponent, DbxScheduleSelectionCalendarSelectionToggleButtonComponent, calendarScheduleMaxDate, calendarScheduleMinAndMaxDateRange, calendarScheduleMinDate, calendarScheduleStartBeingUsedFromFilter, computeCalendarScheduleSelectionDateBlockRange, computeCalendarScheduleSelectionRange, computeScheduleSelectionRangeAndExclusion, computeScheduleSelectionValue, dateScheduleRangeField, dbxScheduleSelectionCalendarBeforeMonthViewRenderFactory, dbxScheduleSelectionCalendarDateDaysFormDayFields, dbxScheduleSelectionCalendarDateDaysFormFields, defaultCalendarScheduleSelectionCellContentFactory, finalizeNewCalendarScheduleSelectionState, finalizeUpdateStateWithChangedScheduleDays, initialCalendarScheduleSelectionState, isEnabledDayInCalendarScheduleSelectionState, noSelectionCalendarScheduleSelectionState, provideCalendarScheduleSelectionStoreIfParentIsUnavailable, updateStateWithChangedDates, updateStateWithChangedDefaultScheduleDays, updateStateWithChangedRange, updateStateWithChangedScheduleDays, updateStateWithComputeSelectionResultRelativeToFilter, updateStateWithDateScheduleRangeValue, updateStateWithExclusions, updateStateWithFilter, updateStateWithInitialSelectionState, updateStateWithMinMaxDateRange, updateStateWithTimezoneValue };
+export { CalendarScheduleSelectionDayState, DEFAULT_DBX_SCHEDULE_SELECTION_CALENDAR_DATE_POPUP_CLOSE_CONFIG_TOKEN, DEFAULT_DBX_SCHEDULE_SELECTION_CALENDAR_DATE_POPUP_CONTENT_CONFIG_TOKEN, DEFAULT_SCHEDULE_SELECTION_CALENDAR_DATE_POPOVER_KEY, DbxCalendarScheduleSelectionStore, DbxCalendarScheduleSelectionStoreInjectionBlockDirective, DbxCalendarScheduleSelectionStoreProviderBlock, DbxFormCalendarDateCellScheduleRangeFieldComponent, DbxFormCalendarModule, DbxFormDateCellScheduleRangeFieldModule, DbxScheduleSelectionCalendarCellComponent, DbxScheduleSelectionCalendarComponent, DbxScheduleSelectionCalendarDateDaysComponent, DbxScheduleSelectionCalendarDateDaysFormComponent, DbxScheduleSelectionCalendarDateDialogButtonComponent, DbxScheduleSelectionCalendarDateDialogComponent, DbxScheduleSelectionCalendarDatePopoverButtonComponent, DbxScheduleSelectionCalendarDatePopoverComponent, DbxScheduleSelectionCalendarDatePopoverContentComponent, DbxScheduleSelectionCalendarDateRangeComponent, DbxScheduleSelectionCalendarSelectionToggleButtonComponent, calendarScheduleMaxDate, calendarScheduleMinAndMaxDateRange, calendarScheduleMinDate, calendarScheduleStartBeingUsedFromFilter, computeCalendarScheduleSelectionDateCellRange, computeCalendarScheduleSelectionRange, computeScheduleSelectionRangeAndExclusion, computeScheduleSelectionValue, dateScheduleRangeField, dbxScheduleSelectionCalendarBeforeMonthViewRenderFactory, dbxScheduleSelectionCalendarDateDaysFormDayFields, dbxScheduleSelectionCalendarDateDaysFormFields, defaultCalendarScheduleSelectionCellContentFactory, finalizeNewCalendarScheduleSelectionState, finalizeUpdateStateWithChangedScheduleDays, initialCalendarScheduleSelectionState, isEnabledDayInCalendarScheduleSelectionState, noSelectionCalendarScheduleSelectionState, provideCalendarScheduleSelectionStoreIfParentIsUnavailable, updateStateWithChangedDates, updateStateWithChangedDefaultScheduleDays, updateStateWithChangedRange, updateStateWithChangedScheduleDays, updateStateWithComputeSelectionResultRelativeToFilter, updateStateWithDateCellScheduleRangeValue, updateStateWithExclusions, updateStateWithFilter, updateStateWithInitialSelectionState, updateStateWithMinMaxDateRange, updateStateWithTimezoneValue };
 //# sourceMappingURL=dereekb-dbx-form-calendar.mjs.map