@dereekb/dbx-form 9.25.3 → 9.25.5

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, EMPTY, startWith, throttleTime } from 'rxjs';
 import { filterMaybe, distinctUntilHasDifferentValues, SubscriptionObject, asObservableFromGetter, asObservable } from '@dereekb/rxjs';
-import { DateCellScheduleDayCode, expandDateCellScheduleDayCodesToDayOfWeekSet, dateCellTimingStartsAtForStartOfDay, dateCellTimingRelativeIndexFactory, dateCellDayOfWeekFactory, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateCellTimingDateFactory, expandDateCellScheduleRange, formatToISO8601DayString, changeDateCellScheduleDateRangeToTimezone, isSameDateCellScheduleDateRange, dateCellTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateCellScheduleDateFilterConfig, dateTimezoneUtcNormal, dateCellScheduleDateFilter, fullDateCellScheduleRange, dateCellTimingTimezoneNormalInstance, expandDateCellScheduleDayCodes, fullWeekDateCellScheduleDayCodes, dateCellScheduleDayCodesAreSetsEquivalent, simplifyDateCellScheduleDayCodes, isDateInDateRangeFunction, isDateWithinDateCellRangeFunction, dateCellScheduleEncodedWeek, dateCellTimingStartDateFactory, enabledDaysFromDateCellScheduleDayCodes, dateCellScheduleDayCodesFromEnabledDays, formatToMonthDayString, dateRange, DateRangeType } from '@dereekb/date';
+import { DateCellScheduleDayCode, expandDateCellScheduleDayCodesToDayOfWeekSet, dateCellTimingStartsAtForStartOfDay, dateCellTimingRelativeIndexFactory, dateCellDayOfWeekFactory, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateCellTimingDateFactory, expandDateCellScheduleRange, formatToISO8601DayString, changeDateCellScheduleDateRangeToTimezone, isSameDateCellScheduleDateRange, dateCellTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateCellScheduleDateFilterConfig, SYSTEM_DATE_TIMEZONE_UTC_NORMAL_INSTANCE, dateTimezoneUtcNormal, dateCellScheduleDateFilter, fullDateCellScheduleRange, dateCellTimingTimezoneNormalInstance, expandDateCellScheduleDayCodes, fullWeekDateCellScheduleDayCodes, dateCellScheduleDayCodesAreSetsEquivalent, simplifyDateCellScheduleDayCodes, isDateInDateRangeFunction, isDateWithinDateCellRangeFunction, 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';
@@ -332,21 +332,34 @@ function updateStateWithFilter(state, inputFilter) {
         let filterStart = null; // the start date that will be used/set on the filter.
         if (inputFilter) {
             filter = copyDateCellScheduleDateFilterConfig(inputFilter); // copy filter
+            let nextFilterTimezone; // only set if inputFilter.start or inputFilter.startsAt
             // configure filter start
             if (inputFilter.start) {
                 filterStart = inputFilter.start;
+                // if no timezone is specified, then use the system timezone and align filterStart to the start of the day.
+                if (!inputFilter.timezone) {
+                    filterStart = SYSTEM_DATE_TIMEZONE_UTC_NORMAL_INSTANCE.startOfDayInTargetTimezone(inputFilter.startsAt);
+                    nextFilterTimezone = systemTimezone;
+                }
+                else {
+                    nextFilterTimezone = inputFilter.timezone;
+                }
             }
             else if (inputFilter.startsAt) {
                 if (inputFilter.timezone) {
+                    // if no timezone is provided, use startsAt as-is
                     const timezoneNormal = dateTimezoneUtcNormal(inputFilter.timezone);
                     filterStart = timezoneNormal.startOfDayInTargetTimezone(inputFilter.startsAt);
+                    nextFilterTimezone = inputFilter.timezone;
                 }
                 else {
-                    filterStart = inputFilter.startsAt;
-                    filter.timezone = systemTimezone;
+                    // set to the start of today in the system timezone.
+                    filterStart = SYSTEM_DATE_TIMEZONE_UTC_NORMAL_INSTANCE.startOfDayInTargetTimezone(inputFilter.startsAt);
+                    nextFilterTimezone = systemTimezone;
                 }
             }
             filter.start = filterStart ?? undefined;
+            filter.timezone = nextFilterTimezone;
             // configure exclusions
             if (exclusions?.length) {
                 enabledFilter = {
@@ -372,17 +385,46 @@ function updateStateWithFilter(state, inputFilter) {
          * If the input filter has a start date, use that as the relative start to ensure indexes are compared the same,
          * otherwise use the state's start. This is important for the index calculations.
          */
-        enabledFilter.start = filter?.start ?? state.start;
+        let finalEnabledStart;
+        let finalEnabledTimezone;
+        //  filter?.start ?? state.start;
+        if (!enabledFilter.start) {
+            // use the current state's start, but make sure it is in the proper timezone.
+            if (enabledFilter.timezone) {
+                const timezoneNormal = dateTimezoneUtcNormal(enabledFilter.timezone);
+                finalEnabledStart = timezoneNormal.startOfDayInTargetTimezone(state.start); // get the start of the day for the current start
+                finalEnabledTimezone = enabledFilter.timezone;
+            }
+            else {
+                finalEnabledStart = state.start;
+                finalEnabledTimezone = systemTimezone;
+            }
+        }
+        else if (!enabledFilter.timezone) {
+            finalEnabledTimezone = systemTimezone;
+            const timezoneNormal = dateTimezoneUtcNormal(finalEnabledTimezone);
+            finalEnabledStart = timezoneNormal.startOfDayInTargetTimezone(enabledFilter.start); // get the start of the day for the target timezone
+        }
+        else {
+            finalEnabledStart = enabledFilter.start;
+            finalEnabledTimezone = enabledFilter.timezone;
+        }
+        enabledFilter.start = finalEnabledStart;
+        enabledFilter.timezone = finalEnabledTimezone;
         // create the filter
         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 = dateCellTimingRelativeIndexFactory({ startsAt: start, timezone: filter.timezone ?? systemTimezone });
-        state.indexDayOfWeek = dateCellDayOfWeekFactory(start);
+        let startForSystemTimezone = filter.start;
+        if (filter.timezone) {
+            const timezoneNormal = dateTimezoneUtcNormal(filter.timezone);
+            startForSystemTimezone = timezoneNormal.systemDateToTargetDate(filter.start); // get the start of the day for the system timezone
+        }
+        state.start = startForSystemTimezone;
+        state.indexFactory = dateCellTimingRelativeIndexFactory({ startsAt: startForSystemTimezone, timezone: systemTimezone });
+        state.indexDayOfWeek = dateCellDayOfWeekFactory(startForSystemTimezone);
     }
     // attempt to re-apply the initial selection state once filter is applied
     if (state.initialSelectionState) {
@@ -633,7 +675,7 @@ function isEnabledDayInCalendarScheduleSelectionState(state) {
     };
 }
 function computeScheduleSelectionValue(state) {
-    const { indexFactory, allowedDaysOfWeek, effectiveScheduleDays, indexDayOfWeek, computeSelectionResultRelativeToFilter, filter, systemTimezone } = state;
+    const { indexFactory: systemIndexFactory, allowedDaysOfWeek, effectiveScheduleDays, indexDayOfWeek, computeSelectionResultRelativeToFilter, filter, systemTimezone } = state;
     let timezone = systemTimezone;
     const rangeAndExclusion = computeScheduleSelectionRangeAndExclusion(state);
     if (rangeAndExclusion == null) {
@@ -647,12 +689,16 @@ function computeScheduleSelectionValue(state) {
     // If computeSelectionResultRelativeToFilter is true, then we need to offset the values to be relative to that start.
     if (computeSelectionResultRelativeToFilter && filter?.start) {
         start = filter.start; // always start at the filter's start date
+        let startInSystemTimezone = start;
         if (filter.timezone) {
             timezone = filter.timezone;
             const filterNormal = dateTimezoneUtcNormal(timezone);
             end = filterNormal.startOfDayInTargetTimezone(end);
+            startInSystemTimezone = filterNormal.systemDateToTargetDate(start); // convert the start to the system timezone normal for deriving the index
         }
-        const filterStartIndexOffset = indexFactory(rangeStart) - indexFactory(start);
+        const rangeStartIndex = systemIndexFactory(rangeStart);
+        const startIndex = systemIndexFactory(startInSystemTimezone);
+        const filterStartIndexOffset = rangeStartIndex - startIndex;
         filterOffsetExcludedRange = range(0, filterStartIndexOffset);
         indexOffset = indexOffset - filterStartIndexOffset;
     }