@dereekb/dbx-form 9.24.37 → 9.24.39

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

@@ -5,10 +5,10 @@ import { AbstractPopoverDirective, AbstractDialogDirective, sanitizeDbxDialogCon
 import * as i0 from '@angular/core';
 import { Injectable, SkipSelf, Directive, Injector, Optional, Component, Inject, Input, ViewChild, ElementRef, ChangeDetectionStrategy, EventEmitter, Output, InjectionToken, NgModule } from '@angular/core';
 import { FieldType } from '@ngx-formly/material';
-import { switchMap, first, tap, map, distinctUntilChanged, shareReplay, of, combineLatestWith, BehaviorSubject, filter, startWith, throttleTime, combineLatest } from 'rxjs';
+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, dateTimingRelativeIndexFactory, dateBlockDayOfWeekFactory, findMaxDate, findMinDate, isSameDateRange, isSameDateDay, isSameDate, dateBlockTimingDateFactory, expandDateScheduleRange, formatToISO8601DayString, isSameDateScheduleRange, dateTimingRelativeIndexArrayFactory, isInfiniteDateRange, copyDateScheduleDateFilterConfig, dateScheduleDateFilter, dateTimezoneUtcNormal, expandDateScheduleDayCodes, fullWeekDayScheduleDayCodes, dateScheduleDayCodesAreSetsEquivalent, simplifyDateScheduleDayCodes, isDateInDateRangeFunction, isDateWithinDateBlockRangeFunction, copyHoursAndMinutesFromDate, dateScheduleEncodedWeek, dateBlockTimingStartDateFactory, enabledDaysFromDateScheduleDayCodes, dateScheduleDayCodesFromEnabledDays, formatToMonthDayString, dateRange, DateRangeType } from '@dereekb/date';
-import { mapValuesToSet, unique, mergeArrays, iterableToArray, range, toggleInSet, removeFromSet, addToSet, isIndexNumberInIndexRangeFunction, minAndMaxNumber, getDaysOfWeekNames, reduceBooleansWithAnd, mergeObjects, KeyValueTypleValueFilter } from '@dereekb/util';
+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 { 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';
 import * as i3$1 from '@dereekb/dbx-core';
@@ -98,7 +98,7 @@ function initialCalendarScheduleSelectionState() {
     const defaultScheduleDays = new Set([DateScheduleDayCode.WEEKDAY, DateScheduleDayCode.WEEKEND]);
     const allowedDaysOfWeek = expandDateScheduleDayCodesToDayOfWeekSet(defaultScheduleDays);
     const start = startOfDay(new Date());
-    const indexFactory = dateTimingRelativeIndexFactory({ start });
+    const indexFactory = dateBlockTimingRelativeIndexFactory({ start });
     const indexDayOfWeek = dateBlockDayOfWeekFactory(start);
     return {
         start,
@@ -168,6 +168,7 @@ class DbxCalendarScheduleSelectionStore extends ComponentStore {
         map(calendarScheduleStartBeingUsedFromFilter), distinctUntilChanged(), shareReplay(1));
         this.dateRange$ = this.currentDateRange$.pipe(filterMaybe(), shareReplay(1));
         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));
@@ -264,7 +265,7 @@ function updateStateWithExclusions(state, inputExclusions) {
     let computedExclusions;
     if (inputExclusions) {
         const { indexFactory } = state;
-        const indexArrayFactory = dateTimingRelativeIndexArrayFactory(indexFactory);
+        const indexArrayFactory = dateBlockTimingRelativeIndexArrayFactory(indexFactory);
         computedExclusions = indexArrayFactory(inputExclusions);
     }
     state = { ...state, inputExclusions, computedExclusions };
@@ -325,7 +326,7 @@ function updateStateWithFilter(state, inputFilter) {
     if (filter && filter.start) {
         const start = filter.start;
         state.start = start;
-        state.indexFactory = dateTimingRelativeIndexFactory({ start });
+        state.indexFactory = dateBlockTimingRelativeIndexFactory({ start });
         state.indexDayOfWeek = dateBlockDayOfWeekFactory(start);
     }
     // attempt to re-apply the initial selection state once filter is applied
@@ -796,9 +797,9 @@ class DbxScheduleSelectionCalendarDateRangeComponent {
         }), shareReplay(1));
         this.pickerOpened$ = this._pickerOpened.asObservable();
         this.defaultDatePickerFilter = () => true;
-        this.datePickerFilter$ = this.dbxCalendarScheduleSelectionStore.isEnabledFilterDayFunction$.pipe(map((isEnabled) => {
+        this.datePickerFilter$ = combineLatest([this.dbxCalendarScheduleSelectionStore.isEnabledFilterDayFunction$, this.dbxCalendarScheduleSelectionStore.isInAllowedDaysOfWeekFunction$]).pipe(map(([isEnabled, isAllowedDayOfWeek]) => {
             const fn = (date) => {
-                const result = date ? isEnabled(date) : true;
+                const result = date ? isAllowedDayOfWeek(date) && isEnabled(date) : true;
                 return result;
             };
             return fn;