@dereekb/dbx-form 9.25.5 → 9.25.6

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, 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 { DateCellScheduleDayCode, expandDateCellScheduleDayCodesToDayOfWeekSet, dateCellTimingStartsAtForStartOfDay, dateCellTimingRelativeIndexFactory, dateCellDayOfWeekFactory, dateTimezoneUtcNormal, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateCellTimingDateFactory, expandDateCellScheduleRange, formatToISO8601DayString, changeDateCellScheduleDateRangeToTimezone, isSameDateCellScheduleDateRange, dateCellTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateCellScheduleDateFilterConfig, SYSTEM_DATE_TIMEZONE_UTC_NORMAL_INSTANCE, 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';
@@ -116,11 +116,28 @@ function initialCalendarScheduleSelectionState() {
         cellContentFactory: defaultCalendarScheduleSelectionCellContentFactory
     };
 }
-function calendarScheduleMinDate(x) {
-    return findMaxDate([x.filter?.start, x.minMaxDateRange?.start]);
-}
-function calendarScheduleMaxDate(x) {
-    return findMinDate([x.filter?.end, x.minMaxDateRange?.end]);
+/**
+ * This is used in cases where the dates in the min/max date range need to be shifted to the filter's timezone.
+ *
+ * This is because the index factory is always in system timezone, but when selecting all/none with a filter we need to use the filter's timezone.
+ *
+ * @param x
+ * @returns
+ */
+function calendarScheduleMinAndMaxDateRangeRelativeToFilter(x) {
+    let input = x;
+    if (x.filter?.timezone && x.minMaxDateRange != null) {
+        const filterNormal = dateTimezoneUtcNormal(x.filter.timezone);
+        const transformFn = filterNormal.transformFunction('systemDateToTargetDate');
+        input = {
+            filter: x.filter,
+            minMaxDateRange: {
+                start: x.minMaxDateRange.start ? transformFn(x.minMaxDateRange.start) : undefined,
+                end: x.minMaxDateRange.end ? transformFn(x.minMaxDateRange.end) : undefined
+            }
+        };
+    }
+    return calendarScheduleMinAndMaxDateRange(input);
 }
 function calendarScheduleMinAndMaxDateRange(x) {
     return {
@@ -128,6 +145,12 @@ function calendarScheduleMinAndMaxDateRange(x) {
         end: calendarScheduleMaxDate(x) || undefined
     };
 }
+function calendarScheduleMinDate(x) {
+    return findMaxDate([x.filter?.start, x.minMaxDateRange?.start]);
+}
+function calendarScheduleMaxDate(x) {
+    return findMinDate([x.filter?.end, x.minMaxDateRange?.end]);
+}
 function calendarScheduleStartBeingUsedFromFilter(x) {
     return x.computeSelectionResultRelativeToFilter && x.filter?.start != null; // may be using either
 }
@@ -547,7 +570,7 @@ function finalizeUpdateStateWithChangedScheduleDays(previousState, nextState) {
 }
 function updateStateWithChangedDates(state, change) {
     const { allowedDaysOfWeek, indexFactory, indexDayOfWeek, inputStart: currentInputStart, inputEnd: currentInputEnd, minMaxDateRange, filter } = state;
-    const { start: minDate, end: maxDate } = calendarScheduleMinAndMaxDateRange(state);
+    const { start: minDate, end: maxDate } = calendarScheduleMinAndMaxDateRangeRelativeToFilter(state);
     let inputStart = currentInputStart;
     let inputEnd = currentInputEnd;
     /**
@@ -632,8 +655,8 @@ function noSelectionCalendarScheduleSelectionState(state) {
     return finalizeNewCalendarScheduleSelectionState({ ...state, toggledIndexes: new Set(), inputStart: null, inputEnd: null });
 }
 function updateStateWithChangedRange(state, change) {
-    const { inputStart: currentInputStart, inputEnd: currentInputEnd, indexFactory, minMaxDateRange } = state;
-    const { start: minDate, end: maxDate } = minMaxDateRange ?? {};
+    const { inputStart: currentInputStart, inputEnd: currentInputEnd, indexFactory } = state;
+    const { start: minDate, end: maxDate } = calendarScheduleMinAndMaxDateRange(state);
     const inputStart = startOfDay(change.inputStart);
     const inputEnd = startOfDay(change.inputEnd); // midnight of the last day
     const isValidRange = minDate != null || maxDate != null ? isDateInDateRangeFunction({ start: minDate ?? undefined, end: maxDate ?? undefined }) : () => true;