@dereekb/dbx-form 10.1.4 → 10.1.6

package/fesm2022/dereekb-dbx-form.mjs

@@ -3952,7 +3952,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
             }
             return result;
         }), distinctUntilChanged(isSameDateHoursAndMinutes), shareReplay(1));
-        this.config$ = combineLatest([this._config.pipe(switchMapMaybeObs()), this.syncConfigBeforeValue$, this.syncConfigAfterValue$]).pipe(map(([x, dateInputMin, dateInputMax]) => {
+        this.dateTimePickerConfig$ = combineLatest([this._config.pipe(switchMapMaybeObs()), this.syncConfigBeforeValue$, this.syncConfigAfterValue$]).pipe(map(([x, dateInputMin, dateInputMax]) => {
             let result = x;
             if (dateInputMin != null || dateInputMax != null) {
                 const { min: limitMin, max: limitMax } = x?.limits ?? {};
@@ -3969,9 +3969,9 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
             }
             return result;
         }), distinctUntilChanged(), shareReplay(1));
-        this.dateInputMin$ = this.config$.pipe(map((x) => (x?.limits?.min ?? null)), distinctUntilChanged(isSameDate), shareReplay(1));
-        this.dateInputMax$ = this.config$.pipe(map((x) => (x?.limits?.max ?? null)), distinctUntilChanged(isSameDate), shareReplay(1));
-        this.pickerFilter$ = this.config$.pipe(distinctUntilChanged(), map((x) => {
+        this.dateInputMin$ = this.dateTimePickerConfig$.pipe(map((x) => (x?.limits?.min ?? null)), distinctUntilChanged(isSameDate), shareReplay(1));
+        this.dateInputMax$ = this.dateTimePickerConfig$.pipe(map((x) => (x?.limits?.max ?? null)), distinctUntilChanged(isSameDate), shareReplay(1));
+        this.pickerFilter$ = this.dateTimePickerConfig$.pipe(distinctUntilChanged(), map((x) => {
             if (x) {
                 const filter = dateTimeMinuteWholeDayDecisionFunction(x, false);
                 return (x) => (x != null ? filter(x) : true);
@@ -3981,7 +3981,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
             }
         }), shareReplay(1));
         this.defaultPickerFilter = () => true;
-        this.timeOutput$ = combineLatest([this.rawDateTime$, this._offset, this.config$]).pipe(throttleTime(TIME_OUTPUT_THROTTLE_TIME$1, undefined, { leading: false, trailing: true }), distinctUntilChanged((current, next) => current[0] === next[0] && next[1] === 0), tap(([, stepsOffset]) => (stepsOffset ? this._offset.next(0) : 0)), map(([date, stepsOffset, config]) => {
+        this.timeOutput$ = combineLatest([this.rawDateTime$, this._offset, this.dateTimePickerConfig$]).pipe(throttleTime(TIME_OUTPUT_THROTTLE_TIME$1, undefined, { leading: false, trailing: true }), distinctUntilChanged((current, next) => current[0] === next[0] && next[1] === 0), tap(([, stepsOffset]) => (stepsOffset ? this._offset.next(0) : 0)), map(([date, stepsOffset, config]) => {
             if (date != null) {
                 const instance = new DateTimeMinuteInstance({
                     date,
@@ -4156,9 +4156,18 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
             offset = 7;
         }
         if (direction !== 0) {
-            this.date$.pipe(first()).subscribe((date) => {
-                const newDate = addDays(date, offset * direction);
-                this.setDateInputValue(newDate);
+            combineLatest([this.date$, this.dateTimePickerConfig$])
+                .pipe(first())
+                .subscribe(([date, config]) => {
+                const newDate = startOfDay(addDays(date, offset * direction));
+                const instance = new DateTimeMinuteInstance({
+                    date: newDate,
+                    ...config
+                });
+                const nextDate = instance.isInSchedule(newDate) ? newDate : instance.findNextAvailableDayInSchedule(newDate, direction === 1 ? 'future' : 'past');
+                if (nextDate != null) {
+                    this.setDateInputValue(instance.clampToLimit(nextDate));
+                }
             });
         }
     }