@dereekb/dbx-form 13.6.0 → 13.6.1

package/fesm2022/dereekb-dbx-form.mjs

@@ -3,10 +3,10 @@ import { forwardRef, inject, input, Directive, effect, Injectable, viewChild, si
 import * as i1$2 from '@dereekb/dbx-web';
 import { DbxActionTransitionSafetyDirective, AbstractDialogDirective, DbxDialogContentDirective, DbxActionModule, DbxButtonModule, DbxDialogContentCloseComponent, DbxAnchorComponent, DbxSectionLayoutModule, DbxFlexGroupDirective, DbxSubSectionComponent, DbxLoadingComponent, dbxValueListItemDecisionFunction, DbxListModifierModule, AbstractDbxSelectionListWrapperDirective, DbxListWrapperComponentImportsModule, provideDbxListViewWrapper, DEFAULT_LIST_WRAPPER_COMPONENT_CONFIGURATION_TEMPLATE, AbstractDbxSelectionListViewDirective, addConfigToValueListItems, DbxSelectionValueListViewContentComponent, provideDbxListView, AbstractDbxValueListViewItemComponent, DbxLoadingModule, DbxButtonComponent, DbxButtonSpacerDirective, CompactContextStore, mapCompactModeObs, DbxBarDirective } from '@dereekb/dbx-web';
 import { isPast, addSeconds, startOfDay, addMinutes, addDays, isBefore } from 'date-fns';
-import { map, of, shareReplay, switchMap, first, exhaustMap, catchError, delay, filter, combineLatest, distinctUntilChanged, BehaviorSubject, Subject, startWith, throttleTime, scan, timer, merge, tap, takeUntil, EMPTY, mergeMap, debounceTime, skip, combineLatestWith, interval } from 'rxjs';
+import { map, of, shareReplay, switchMap, first, exhaustMap, catchError, delay, filter, combineLatest, distinctUntilChanged, BehaviorSubject, Subject, startWith, throttleTime, scan, timer, merge, EMPTY, mergeMap, debounceTime, tap, skip, combineLatestWith, interval } from 'rxjs';
 import * as i2 from '@dereekb/dbx-core';
 import { DbxActionContextStoreSourceInstance, cleanLockSet, cleanWithLockSet, cleanSubscription, DbxInjectionComponent, mergeDbxInjectionComponentConfigs, GetValuePipe, DateDistancePipe, TimeDistancePipe } from '@dereekb/dbx-core';
-import { makeIsModifiedFunctionObservable, SubscriptionObject, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, cleanup, errorOnEmissionsInPeriod, asObservableFromGetter, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, SimpleLoadingContext, distinctUntilHasDifferentValues, startWithBeginLoading, mapLoadingStateResults, successResult, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, skipUntilTimeElapsedAfterLastEmission, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, skipAllInitialMaybe, asyncPusherCache } from '@dereekb/rxjs';
+import { makeIsModifiedFunctionObservable, SubscriptionObject, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, errorOnEmissionsInPeriod, asObservableFromGetter, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, SimpleLoadingContext, distinctUntilHasDifferentValues, startWithBeginLoading, mapLoadingStateResults, successResult, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, skipUntilTimeElapsedAfterLastEmission, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, skipAllInitialMaybe, asyncPusherCache } from '@dereekb/rxjs';
 import { toObservable, toSignal } from '@angular/core/rxjs-interop';
 import { BooleanStringKeyArrayUtility, iterablesAreSetEquivalent, objectIsEmpty, mergeObjectsFunction, filterFromPOJOFunction, mergeObjects, filterFromPOJO, asArray, objectHasNoKeys, addPlusPrefixToNumber, convertMaybeToArray, isSelectedDecisionFunctionFactory, readKeysFrom, hasDifferentValues, makeValuesGroupMap, separateValues, filterUniqueValues, searchStringFilterFunction, caseInsensitiveFilterByIndexOfDecisionFactory, sortByStringFunction, mergeArraysIntoArray, lastValue, arrayToMap, setContainsAllValues, addToSetCopy, setsAreEquivalent, filterMaybeArrayValues, mergeArrays, firstValue, cachedGetter, makeGetter, asDecisionFunction, getValueFromGetter, asGetter, dateFromMinuteOfDay, dateToMinuteOfDay, isISO8601DayStringStart, mapIdentityFunction, MS_IN_MINUTE, isMonthDaySlashDate, HAS_WEBSITE_DOMAIN_NAME_REGEX, KeyValueTypleValueFilter, valuesFromPOJO, allObjectsAreEqual, isNumberDivisibleBy, nearestDivisibleValues, isE164PhoneNumber as isE164PhoneNumber$1, isValidPhoneExtensionNumber, e164PhoneNumberExtensionPair, isWebsiteUrlWithPrefix, websiteUrlDetails, mapMaybeFunction, transformNumberFunction, concatArrays, DOLLAR_AMOUNT_PRECISION, e164PhoneNumberFromE164PhoneNumberExtensionPair, transformStringFunction, US_STATE_CODE_STRING_REGEX, ZIP_CODE_STRING_REGEX, LAT_LNG_PATTERN, capitalizeFirstLetter } from '@dereekb/util';
 import * as i1 from '@angular/forms';
@@ -659,26 +659,11 @@ function dbxFormSourceObservableFromStream(streamObs, inputObs, modeObs) {
     const mode$ = asObservable(modeObs).pipe(distinctUntilChanged());
     return combineLatest([mode$, value$]).pipe(map((x) => x[0]), distinctUntilChanged(), switchMap((mode) => {
         if (mode === 'reset') {
-            // reset only
+            // Reset mode: forward exactly one value each time the form enters RESET state,
+            // then ignore subsequent source changes until the next reset.
             return state$.pipe(exhaustMap((state) => {
                 if (state === DbxFormState.RESET) {
-                    let firstValueSent = false;
-                    const doneSubject = new Subject();
-                    return combineLatest([value$, state$]).pipe(map(([value, state]) => {
-                        if (!firstValueSent || state === DbxFormState.RESET) {
-                            return [value, true]; // always forward the first value.
-                        }
-                        else {
-                            return [value, false];
-                        }
-                    }), tap(([_, send]) => {
-                        firstValueSent = true;
-                        if (!send) {
-                            doneSubject.next(undefined);
-                        }
-                    }), filter(([_, send]) => send), map(([value, _]) => value), takeUntil(doneSubject), cleanup(() => {
-                        doneSubject.complete();
-                    }));
+                    return value$.pipe(first());
                 }
                 else {
                     return EMPTY;
@@ -736,8 +721,16 @@ class DbxFormSourceDirective {
         const mode = this.dbxFormSourceMode() ?? 'reset';
         let subscription;
         if (formSource) {
-            subscription = dbxFormSourceObservableFromStream(this.form.stream$, formSource, mode).subscribe((x) => {
+            // Guard against the feedback loop where setValue() calls resetForm() internally,
+            // which triggers a new RESET state on stream$, causing another value to be forwarded.
+            // The flag is set before setValue and cleared on the next microtask, so the synchronous
+            // stream$ emissions from the feedback reset are filtered out.
+            let isSettingValue = false;
+            const guardedStream$ = this.form.stream$.pipe(filter(() => !isSettingValue));
+            subscription = dbxFormSourceObservableFromStream(guardedStream$, formSource, mode).subscribe((x) => {
+                isSettingValue = true;
                 this.form.setValue(x);
+                Promise.resolve().then(() => (isSettingValue = false));
             });
         }
         this._effectSub.setSub(subscription);