@dereekb/dbx-form 10.1.16 → 10.1.18

package/fesm2022/dereekb-dbx-form.mjs

@@ -10,7 +10,7 @@ import { AbstractSubscriptionDirective, safeDetectChanges, DbxInjectionComponent
 import * as i2$1 from '@dereekb/dbx-web';
 import { DbxActionTransitionSafetyDirective, DbxTextModule, DbxLoadingModule, DbxFlexLayoutModule, DbxSectionLayoutModule, DbxRouterAnchorModule, dbxValueListItemDecisionFunction, DbxButtonModule, DbxListLayoutModule, AbstractDbxSelectionListWrapperDirective, DEFAULT_LIST_WRAPPER_DIRECTIVE_TEMPLATE, AbstractDbxSelectionListViewDirective, addConfigToValueListItems, provideDbxListView, AbstractDbxValueListViewItemComponent, DbxActionModule, mapCompactModeObs, DbxBarLayoutModule } from '@dereekb/dbx-web';
 import { isPast, addSeconds, startOfDay, addMinutes, addDays, isAfter } from 'date-fns';
-import { BehaviorSubject, switchMap, first, exhaustMap, of, catchError, delay, filter, combineLatest, map, distinctUntilChanged, shareReplay, Subject, tap, takeUntil, EMPTY, throttleTime, mergeMap, startWith, debounceTime, skipWhile, scan, combineLatestWith, interval, merge, timer } from 'rxjs';
+import { BehaviorSubject, switchMap, first, exhaustMap, of, catchError, delay, filter, combineLatest, map, distinctUntilChanged, shareReplay, Subject, tap, takeUntil, EMPTY, throttleTime, mergeMap, startWith, debounceTime, skipWhile, scan, skip, combineLatestWith, interval, merge, timer } from 'rxjs';
 import { LockSet, SubscriptionObject, asObservable, cleanup, errorOnEmissionsInPeriod, loadingStateHasFinishedLoading, switchMapMaybeObs, filterMaybe, switchMapMaybeDefault, SimpleLoadingContext, distinctUntilHasDifferentValues, startWithBeginLoading, mapLoadingStateResults, successResult, ListLoadingStateContextInstance, isListLoadingStateEmpty, LoadingStateContextInstance, loadingStateHasValue, loadingStateIsLoading, beginLoading, mapLoadingStateValueWithOperator, valueFromLoadingState, loadingStateContext, skipFirstMaybe, asObservableFromGetter, asyncPusherCache, scanCount } from '@dereekb/rxjs';
 import * as i1$1 from '@ngx-formly/core';
 import { FieldType, FieldWrapper, FormlyModule, FieldArrayType } from '@ngx-formly/core';
@@ -3911,6 +3911,9 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
     get showClearButton() {
         return this.field.props.showClearButton;
     }
+    get minuteStep() {
+        return this.field.props.minuteStep ?? this.field.props.step ?? 5;
+    }
     constructor(cdRef, dbxDateTimeFieldConfigService) {
         super();
         this.cdRef = cdRef;
@@ -3918,6 +3921,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
         this._sub = new SubscriptionObject();
         this._valueSub = new SubscriptionObject();
         this._config = new BehaviorSubject(undefined);
+        this.latestConfig$ = this._config.pipe(switchMapMaybeDefault(), distinctUntilChanged(), shareReplay(1));
         this._syncConfigObs = new BehaviorSubject(undefined);
         this._defaultTimezone = new BehaviorSubject(undefined);
         this._timeDate = new BehaviorSubject(undefined);
@@ -3929,6 +3933,9 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
         this.formControl$ = this._formControlObs.pipe(filterMaybe());
         this._cleared = new Subject();
         this._updateTime = new Subject();
+        this._configUpdateTimeSync = new SubscriptionObject(this.latestConfig$.pipe(skip(1)).subscribe((x) => {
+            this._updateTime.next();
+        }));
         this.timezone$ = this._defaultTimezone.pipe(switchMapMaybeDefault(), distinctUntilChanged()).pipe(map((defaultTimezone) => {
             return defaultTimezone ?? guessCurrentTimezone();
         }), distinctUntilChanged(), shareReplay(1));
@@ -4034,7 +4041,10 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
                             }) ?? date;
                     }
                     else if (!this.timeOnly) {
-                        result = date;
+                        if (this.timeMode !== DbxDateTimeFieldTimeMode.REQUIRED) {
+                            // only autofill the date if the time is marked as required (and the time string is empty)
+                            result = date;
+                        }
                     }
                 }
             }
@@ -4069,7 +4079,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
             }
         }), shareReplay(1));
         this.defaultPickerFilter = () => true;
-        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]) => {
+        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 && current[2] === next[2]), tap(([, stepsOffset]) => (stepsOffset ? this._offset.next(0) : 0)), map(([date, stepsOffset, config]) => {
             if (date != null) {
                 const instance = new DateTimeMinuteInstance({
                     date,
@@ -4077,7 +4087,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
                     roundDownToMinute: true
                 });
                 date = instance.clamp(date);
-                const minutes = stepsOffset * 5;
+                const minutes = stepsOffset * this.minuteStep;
                 if (minutes != 0) {
                     date = addMinutes(date, minutes);
                     date = instance.clamp(date); // clamp the date again
@@ -4180,6 +4190,7 @@ class DbxDateTimeFieldComponent extends FieldType$1 {
         this._sub.destroy();
         this._valueSub.destroy();
         this._config.complete();
+        this._configUpdateTimeSync.destroy();
         this._defaultTimezone.complete();
         this._timeDate.complete();
         this._presets.complete();
@@ -4956,7 +4967,7 @@ function timeOnlyField(config = {}) {
     });
 }
 function dateTimeField(config = {}) {
-    const { key = 'date', showClearButton, dateLabel, timeLabel, allDayLabel, atTimeLabel, timeDate, timezone, showTimezone, timeMode = DbxDateTimeFieldTimeMode.REQUIRED, valueMode, fullDayInUTC, fullDayFieldName, pickerConfig, getSyncFieldsObs, hideDatePicker, hideDateHint, timeOnly = false, presets, materialFormField } = config;
+    const { key = 'date', showClearButton, dateLabel, timeLabel, allDayLabel, atTimeLabel, timeDate, timezone, minuteStep, showTimezone, timeMode = DbxDateTimeFieldTimeMode.REQUIRED, valueMode, fullDayInUTC, fullDayFieldName, pickerConfig, getSyncFieldsObs, hideDatePicker, hideDateHint, timeOnly = false, presets, materialFormField } = config;
     const classGetter = 'dbx-mat-form-field-disable-underline dbx-mat-form-date-time-field-wrapper';
     const fieldConfig = formlyField({
         key,
@@ -4972,6 +4983,7 @@ function dateTimeField(config = {}) {
             valueMode,
             timeOnly,
             presets,
+            minuteStep,
             timeMode: timeOnly ? DbxDateTimeFieldTimeMode.REQUIRED : timeMode,
             timezone,
             timeDate,
@@ -4987,7 +4999,7 @@ function dateTimeField(config = {}) {
     return fieldConfig;
 }
 function dateRangeField(config = {}) {
-    const { required: inputRequired, start, end, timeDate, timezone, showTimezone, presets } = config;
+    const { required: inputRequired, start, end, timeDate, timezone, showTimezone, presets, valueMode, minuteStep } = config;
     const required = inputRequired ?? start?.required ?? false;
     const startFieldKey = start?.key ?? 'start';
     const endFieldKey = end?.key ?? 'end';
@@ -5000,6 +5012,8 @@ function dateRangeField(config = {}) {
         timeDate,
         timezone,
         showTimezone,
+        valueMode,
+        minuteStep,
         ...start,
         required,
         key: startFieldKey
@@ -5013,6 +5027,8 @@ function dateRangeField(config = {}) {
         timeDate,
         timezone,
         showTimezone,
+        valueMode,
+        minuteStep,
         ...end,
         required,
         key: endFieldKey
@@ -5023,14 +5039,15 @@ function dateRangeField(config = {}) {
     };
 }
 function dateTimeRangeField(inputConfig = {}) {
-    const { required = false, start: inputStart, end: inputEnd, timezone, timeDate, showTimezone, presets, valueMode } = inputConfig;
+    const { required = false, start: inputStart, end: inputEnd, timezone, timeDate, showTimezone, presets, valueMode, minuteStep } = inputConfig;
     function dateTimeRangeFieldConfig(config) {
         return {
+            valueMode,
+            minuteStep,
             ...config,
             required,
             timeMode: DbxDateTimeFieldTimeMode.REQUIRED,
             getSyncFieldsObs: undefined,
-            valueMode,
             timeOnly: true,
             hideDateHint: true
         };