@dereekb/dbx-form 13.10.8 → 13.11.0

package/fesm2022/dereekb-dbx-form.mjs

@@ -6,7 +6,7 @@ import { isPast, addSeconds, startOfDay, addMinutes, addDays, isBefore } from 'd
 import { map, of, shareReplay, switchMap, first, exhaustMap, catchError, delay, filter, combineLatest, distinctUntilChanged, BehaviorSubject, Subject, startWith, throttleTime, scan, timer, merge, EMPTY, skip, debounceTime, combineLatestWith, interval, tap, withLatestFrom, mergeMap } from 'rxjs';
 import * as i1$2 from '@dereekb/dbx-core';
 import { DbxActionContextStoreSourceInstance, cleanLockSet, cleanSubscription, completeOnDestroy, cleanWithLockSet, GetValuePipe, DateDistancePipe, TimeDistancePipe, DbxInjectionComponent, mergeDbxInjectionComponentConfigs } from '@dereekb/dbx-core';
-import { makeIsModifiedFunctionObservable, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, errorOnEmissionsInPeriod, asObservableFromGetter, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, skipAllInitialMaybe, successResult, startWithBeginLoading, skipUntilTimeElapsedAfterLastEmission, mapLoadingStateResults, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, distinctUntilHasDifferentValues, SimpleLoadingContext, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, asyncPusherCache } from '@dereekb/rxjs';
+import { makeIsModifiedFunctionObservable, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, errorOnEmissionsInPeriod, asObservableFromGetter, tapLog, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, skipAllInitialMaybe, successResult, startWithBeginLoading, skipUntilTimeElapsedAfterLastEmission, mapLoadingStateResults, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, distinctUntilHasDifferentValues, SimpleLoadingContext, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, asyncPusherCache } from '@dereekb/rxjs';
 import { toObservable, toSignal, rxResource } from '@angular/core/rxjs-interop';
 import { BooleanStringKeyArrayUtility, iterablesAreSetEquivalent, filterUndefinedValues, filterMaybeArrayValues, filterUniqueValues, areEqualPOJOValuesUsingPojoFilter, NOOP_MODIFIER, asArray, mergeArrays, filterNullAndUndefinedValues, objectHasNoKeys, mapMaybeFunction, isWebsiteUrlWithPrefix, websiteUrlDetails, transformStringFunction, US_STATE_CODE_STRING_REGEX, ZIP_CODE_STRING_REGEX, LAT_LNG_PATTERN, transformNumberFunction, DOLLAR_AMOUNT_PRECISION, stripObject, getValueFromGetter, asGetter, dateFromMinuteOfDay, dateToMinuteOfDay, isISO8601DayStringStart, mapIdentityFunction, isDate, MS_IN_MINUTE, isMonthDaySlashDate, filterFromPOJO, TIME_UNIT_SHORT_LABEL_MAP, timeUnitToMilliseconds, ALL_TIME_UNITS, minutesToHoursAndMinutes, millisecondsToTimeUnit, hoursAndMinutesToTimeUnit, isE164PhoneNumber as isE164PhoneNumber$1, isValidPhoneExtensionNumber, e164PhoneNumberExtensionPair, e164PhoneNumberFromE164PhoneNumberExtensionPair, mergeArraysIntoArray, convertMaybeToArray, lastValue, filterEmptyArrayValues, setContainsAllValues, addToSetCopy, setsAreEquivalent, makeValuesGroupMap, sortByStringFunction, separateValues, isSelectedDecisionFunctionFactory, readKeysFrom, hasDifferentValues, capitalizeFirstLetter, objectIsEmpty, mergeObjectsFunction, filterFromPOJOFunction, mergeObjects, addPlusPrefixToNumber, searchStringFilterFunction, caseInsensitiveFilterByIndexOfDecisionFactory, arrayToMap, firstValue, cachedGetter, makeGetter, asDecisionFunction, TIME_UNIT_LABEL_MAP, HAS_WEBSITE_DOMAIN_NAME_REGEX, KeyValueTypleValueFilter, valuesFromPOJO, allObjectsAreEqual, isNumberDivisibleBy, nearestDivisibleValues, concatArrays } from '@dereekb/util';
 import * as i1 from '@angular/forms';
@@ -101,6 +101,8 @@ class DbxForm {
      * value to feed user-supplied isValid/isModified functions even while the form is invalid.
      * Defaults to {@link getValue}; implementations that gate {@link getValue} on validity
      * should override this to bypass that gate.
+     *
+     * @returns An observable of the form's current value, even when validity gates would suppress {@link getValue}.
      */
     currentValue() {
         return this.getValue();
@@ -1321,7 +1323,7 @@ class DbxForgeFormContext {
     _isValid = new BehaviorSubject(false);
     _setValue = new BehaviorSubject(undefined);
     _reset = new BehaviorSubject(new Date());
-    _internalConfig$ = this._config.pipe(scan((acc, config) => {
+    _internalConfig$ = this._config.pipe(tapLog('internal config'), scan((acc, config) => {
         let result;
         if (config) {
             if (acc?.input !== config) {
@@ -1335,8 +1337,8 @@ class DbxForgeFormContext {
             result = undefined;
         }
         return result;
-    }, undefined), shareReplay(1));
-    config$ = this._internalConfig$.pipe(filterMaybe(), map(({ config }) => config), shareReplay(1));
+    }, undefined), tapLog('internal config result'), shareReplay(1));
+    config$ = this._internalConfig$.pipe(filterMaybe(), map(({ config }) => config), tapLog('config'), shareReplay(1));
     /**
      * Form event stream that restarts on each reset, mirroring the formly form's
      * switchMap-on-reset pattern. This ensures that each resetForm() produces a fresh
@@ -1378,6 +1380,8 @@ class DbxForgeFormContext {
      * Emits the current form value regardless of {@link requireValid}. Used by infrastructure
      * that needs the underlying value while the form is invalid (e.g. {@link DbxActionFormDirective}
      * feeding the value into user-supplied isModified functions to drive the action's disabled state).
+     *
+     * @returns An observable of the latest non-null form value, regardless of validity.
      */
     currentValue() {
         return this._value.pipe(filterMaybe());
@@ -1573,7 +1577,7 @@ class DbxForgeFormComponent {
     _disabledSub = cleanSubscription();
     dynamicForm = viewChild(DynamicForm, ...(ngDevMode ? [{ debugName: "dynamicForm" }] : /* istanbul ignore next */ []));
     formValue = signal({}, { ...(ngDevMode ? { debugName: "formValue" } : /* istanbul ignore next */ {}), equal: (a, b) => _forgeFormValueEqual(a, b, this._context) });
-    configSignal = toSignal(this._context.config$, { initialValue: undefined });
+    configSignal = toSignal(this._context.config$.pipe(tapLog('forge.config')), { initialValue: undefined });
     _changesCount = signal(0, ...(ngDevMode ? [{ debugName: "_changesCount" }] : /* istanbul ignore next */ []));
     _lastResetAt = signal(new Date(), ...(ngDevMode ? [{ debugName: "_lastResetAt" }] : /* istanbul ignore next */ []));
     _isReset = signal(true, ...(ngDevMode ? [{ debugName: "_isReset" }] : /* istanbul ignore next */ []));
@@ -3373,6 +3377,7 @@ function isFlexFieldConfig(input) {
  *
  * @param input - {@link DbxForgeFlexLayoutConfig} with a `fields` property and layout defaults.
  *   For backwards compatibility, may also be passed as a deprecated array of fields paired with an optional config.
+ * @param legacyConfig - Only consulted when `input` is the deprecated array form; supplies the layout defaults that would otherwise live on the config object.
  * @returns A {@link ContainerField} with the flex wrapper applied and sized children
  *
  * @dbxFormField
@@ -4058,8 +4063,8 @@ function configureDbxForgeFormFieldWrapper(instance) {
  * config entirely when no values remain — keeps the wrapper bare in the common case
  * (e.g. a checkbox/toggle with no label override).
  *
- * @param props - wrapper props applied to the inserted wrapper config
- * @returns a configurator that mutates the builder instance to add the wrapper
+ * @param inputProps - Wrapper props applied to the inserted wrapper config; undefined entries are stripped and the `props` block is omitted entirely when no values remain.
+ * @returns A configurator that mutates the builder instance to add the form-field wrapper with the resolved props.
  */
 function configureDbxForgeFormFieldWrapperWith(inputProps) {
     const props = stripObject(inputProps);
@@ -6051,7 +6056,12 @@ class DbxForgeDateTimeFieldComponent {
                 return;
             const currentDateCtrl = this.dateCtrl.value;
             if (!currentDateCtrl || !isSameDateDay(currentDateCtrl, date)) {
-                this.dateCtrl.setValue(date, { emitEvent: false });
+                // Emit valueChanges (default) so currentDate$ — and therefore date$/dateValue$/_rawDateTimeDate$
+                // — see the inbound date. Without this emission, rawDateTime$.combineLatest is starved on the
+                // date side and a user-typed time edit can never propagate back to the form value.
+                // The outbound pipeline's `filter(!dbxDateTimeIsSameDateTimeFieldValue(x, currentValue))`
+                // prevents the resulting _updateTime tick from causing a feedback write.
+                this.dateCtrl.setValue(date);
             }
             // Do not overwrite time control while user is actively editing it
             if (!isTimeFocused) {
@@ -6061,10 +6071,14 @@ class DbxForgeDateTimeFieldComponent {
                 }
             }
         });
-        // Main output subscription: timeOutput$ → field value
-        this._sub.subscription = this.valueInSystemTimezone$
-            .pipe(combineLatestWith$1(this.timezoneInstance$.pipe(map$1((tz) => dbxDateTimeOutputValueFactory(this.valueMode(), tz)))), throttleTime$1(TIME_OUTPUT_THROTTLE_TIME$2, undefined, { leading: false, trailing: true }), switchMap$1(([currentValue, valueFactory]) => {
-            return this.timeOutput$.pipe(throttleTime$1(TIME_OUTPUT_THROTTLE_TIME$2 * 2, undefined, { leading: false, trailing: true }), skipAllInitialMaybe(), distinctUntilChanged$1(isSameDateHoursAndMinutes), map$1((x) => valueFactory(x)), filter$1((x) => !dbxDateTimeIsSameDateTimeFieldValue(x, currentValue)));
+        // Main output subscription: timeOutput$ → field value.
+        // The filter must compare in storage form against the raw fieldValue. Comparing against
+        // valueInSystemTimezone$ (display-shifted) is wrong: with a non-zero system↔target tz shift,
+        // a freshly picked time can have the same timestamp as the previous valueInSystemTimezone$
+        // and be incorrectly dropped (e.g. CDT system + UTC field tz: pick 12pm → pick 5pm collides).
+        this._sub.subscription = this.fieldValue$
+            .pipe(combineLatestWith$1(this.timezoneInstance$.pipe(map$1((tz) => dbxDateTimeOutputValueFactory(this.valueMode(), tz)))), throttleTime$1(TIME_OUTPUT_THROTTLE_TIME$2, undefined, { leading: false, trailing: true }), switchMap$1(([currentRawValue, valueFactory]) => {
+            return this.timeOutput$.pipe(throttleTime$1(TIME_OUTPUT_THROTTLE_TIME$2 * 2, undefined, { leading: false, trailing: true }), skipAllInitialMaybe(), distinctUntilChanged$1(isSameDateHoursAndMinutes), map$1((x) => valueFactory(x)), filter$1((x) => !dbxDateTimeIsSameDateTimeFieldValue(x, currentRawValue)));
         }))
             .subscribe((value) => {
             this._setFieldValue(value);
@@ -8092,8 +8106,8 @@ class DbxForgeValueSelectionFieldComponent {
     addClearOptionSignal = computed(() => this.props()?.addClearOption, ...(ngDevMode ? [{ debugName: "addClearOptionSignal" }] : /* istanbul ignore next */ []));
     addClearOption$ = toObservable(this.addClearOptionSignal).pipe(distinctUntilChanged());
     inputOptionsSignal = computed(() => this.props()?.options, ...(ngDevMode ? [{ debugName: "inputOptionsSignal" }] : /* istanbul ignore next */ []));
-    inputOptions$ = toObservable(this.inputOptionsSignal).pipe(maybeValueFromObservableOrValue());
-    resolvedOptions$ = combineLatest([this.inputOptions$, this.addClearOption$]).pipe(map(([options, addClearOption]) => resolveForgeSelectionOptions(options ?? [], addClearOption ?? false)));
+    inputOptions$ = toObservable(this.inputOptionsSignal).pipe(tapLog('yyy'), maybeValueFromObservableOrValue());
+    resolvedOptions$ = combineLatest([this.inputOptions$, this.addClearOption$]).pipe(tapLog('xxxx'), map(([options, addClearOption]) => resolveForgeSelectionOptions(options ?? [], addClearOption ?? false)));
     resolvedOptionsSignal = toSignal(this.resolvedOptions$);
     multipleSignal = computed(() => this.props()?.multiple ?? false, ...(ngDevMode ? [{ debugName: "multipleSignal" }] : /* istanbul ignore next */ []));
     effectiveAppearance = computed(() => this.props()?.appearance ?? this.materialConfig?.appearance ?? 'outline', ...(ngDevMode ? [{ debugName: "effectiveAppearance" }] : /* istanbul ignore next */ []));