@dereekb/dbx-core 1.1.0 → 2.1.0

package/fesm2015/dereekb-dbx-core.mjs

@@ -1,16 +1,15 @@
 import * as i0 from '@angular/core';
-import { Directive, forwardRef, Host, Input, Injectable, Optional, Component, NgModule, EventEmitter, Output, LOCALE_ID, Pipe, Inject, ViewChild, InjectionToken, Injector, ViewContainerRef } from '@angular/core';
+import { Directive, Injectable, forwardRef, Host, Input, Optional, Component, NgModule, EventEmitter, Output, LOCALE_ID, Pipe, Inject, ViewChild, InjectionToken, Injector, ViewContainerRef } from '@angular/core';
 import * as i1$3 from '@dereekb/rxjs';
-import { SubscriptionObject, LockSet, filterMaybe, scanCount, combineLatestFromMapValuesObsFn, skipFirstMaybe, FilterSourceInstance, FilterSource, FilterSourceConnector, FilterMap } from '@dereekb/rxjs';
+import { SubscriptionObject, LockSet, filterMaybe, LoadingStateType, beginLoading, idleLoadingState, errorResult, successResult, scanCount, combineLatestFromMapValuesObsFn, asObservable, returnIfIs, skipFirstMaybe, FilterSourceInstance, FilterSource, FilterSourceConnector, FilterMap } from '@dereekb/rxjs';
 import * as i1 from 'rxjs';
-import { BehaviorSubject, combineLatest, Subject, interval, EMPTY, of, isObservable, delay as delay$1, filter as filter$1, startWith as startWith$1, switchMap as switchMap$1, shareReplay as shareReplay$1, first as first$1, Observable, tap as tap$1 } from 'rxjs';
+import { BehaviorSubject, combineLatest, Subject, interval, EMPTY, of, isObservable, delay as delay$1, switchMap as switchMap$1, map as map$1, catchError, tap as tap$1, filter as filter$1, startWith as startWith$1, shareReplay as shareReplay$1, first as first$1, Observable } from 'rxjs';
 import { switchMap, first, distinctUntilChanged, filter, debounce, throttle, exhaustMap, mergeMap, map, shareReplay, withLatestFrom, startWith, tap, delay } from 'rxjs/operators';
 import * as i1$4 from '@dereekb/util';
-import { hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, getValueFromObjectOrGetter, expandTreeFunction, flattenTreeToArrayFunction, expandFlattenTreeFunction, mergeArrayIntoArray, objectFlatMergeMatrix, mergeArrays, filterMaybeValues, mergeObjects, mergeArrayOrValueIntoArray, DataIsExpiredError, DataDoesNotExistError, filterMaybeValuesFn, StorageObjectUtility, SHARED_MEMORY_STORAGE } from '@dereekb/util';
+import { isDefinedAndNotFalse, hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, isUndefinedAndNotFalse, getValueFromObjectOrGetter, expandTreeFunction, flattenTreeToArrayFunction, expandFlattenTreeFunction, mergeArrayIntoArray, objectFlatMergeMatrix, mergeArrays, filterMaybeValues, mergeObjects, mergeArrayOrValueIntoArray, DataIsExpiredError, DataDoesNotExistError, filterMaybeValuesFn, StorageObjectUtility, SHARED_MEMORY_STORAGE } from '@dereekb/util';
 import { ComponentStore } from '@ngrx/component-store';
 import * as i2 from '@angular/common';
 import { CommonModule, formatDate } from '@angular/common';
-import ms from 'ms';
 import * as i1$1 from '@angular/router';
 import { NavigationStart, NavigationEnd } from '@angular/router';
 import { isArray } from 'class-validator';
@@ -81,8 +80,10 @@ function pipeActionStore(source, pipeFn) {
 function useActionStore(source, useFn) {
     return source.store$.pipe(first()).subscribe(useFn);
 }
-// tslint:disable-next-line: directive-class-suffix
-class ActionContextStoreSourceInstance {
+/**
+ * Service that wraps a ActionContextStoreSource.
+ */
+class DbxActionContextStoreSourceInstance {
     constructor(source) {
         this.source = source;
         this.lockSet = new LockSet();
@@ -124,6 +125,9 @@ class ActionContextStoreSourceInstance {
     get isModified$() {
         return this.pipeStore(x => x.isModified$);
     }
+    get canTrigger$() {
+        return this.pipeStore(x => x.canTrigger$);
+    }
     get isModifiedAndCanTriggerUpdates$() {
         return this.pipeStore(x => x.isModifiedAndCanTriggerUpdates$);
     }
@@ -133,12 +137,21 @@ class ActionContextStoreSourceInstance {
     get actionState$() {
         return this.pipeStore(x => x.actionState$);
     }
+    get loadingState$() {
+        return this.pipeStore(x => x.loadingState$);
+    }
+    get loadingStateType$() {
+        return this.pipeStore(x => x.loadingStateType$);
+    }
     get isWorking$() {
         return this.pipeStore(x => x.isWorking$);
     }
     get isSuccess$() {
         return this.pipeStore(x => x.isSuccess$);
     }
+    get disabledKeys$() {
+        return this.pipeStore(x => x.disabledKeys$);
+    }
     get isDisabled$() {
         return this.pipeStore(x => x.isDisabled$);
     }
@@ -166,23 +179,23 @@ class ActionContextStoreSourceInstance {
     reject(error) {
         this.useStore((x) => x.reject(error));
     }
-    success(value) {
-        this.useStore((x) => x.success(value));
+    resolve(value) {
+        this.useStore((x) => x.resolve(value));
     }
     reset() {
         this.useStore((x) => x.reset());
     }
 }
-ActionContextStoreSourceInstance.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: ActionContextStoreSourceInstance, deps: [{ token: ActionContextStoreSource }], target: i0.ɵɵFactoryTarget.Directive });
-ActionContextStoreSourceInstance.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: ActionContextStoreSourceInstance, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: ActionContextStoreSourceInstance, decorators: [{
-            type: Directive
+DbxActionContextStoreSourceInstance.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextStoreSourceInstance, deps: [{ token: ActionContextStoreSource }], target: i0.ɵɵFactoryTarget.Injectable });
+DbxActionContextStoreSourceInstance.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextStoreSourceInstance });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextStoreSourceInstance, decorators: [{
+            type: Injectable
         }], ctorParameters: function () { return [{ type: ActionContextStoreSource }]; } });
 const actionContextStoreSourceInstanceFactory = (source) => {
-    return new ActionContextStoreSourceInstance(source);
+    return new DbxActionContextStoreSourceInstance(source);
 };
 /**
- * Provides an ActionContextStoreSource, as well as an ActionContextStoreSourceInstance.
+ * Provides an ActionContextStoreSource, as well as an DbxActionContextStoreSourceInstance.
  */
 function ProvideActionStoreSource(sourceType) {
     return [{
@@ -190,7 +203,7 @@ function ProvideActionStoreSource(sourceType) {
             useExisting: forwardRef(() => sourceType)
         },
         {
-            provide: ActionContextStoreSourceInstance,
+            provide: DbxActionContextStoreSourceInstance,
             useFactory: actionContextStoreSourceInstanceFactory,
             deps: [ActionContextStoreSource]
         }];
@@ -214,7 +227,7 @@ class DbxActionAutoModifyDirective extends AbstractSubscriptionDirective {
         return this._autoModifyEnabled.value;
     }
     set autoModifyEnabled(autoModifyEnabled) {
-        this._autoModifyEnabled.next(autoModifyEnabled !== 'false');
+        this._autoModifyEnabled.next(autoModifyEnabled !== false);
     }
     ngOnInit() {
         const obs = combineLatest([
@@ -234,7 +247,7 @@ class DbxActionAutoModifyDirective extends AbstractSubscriptionDirective {
         });
     }
 }
-DbxActionAutoModifyDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoModifyDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionAutoModifyDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoModifyDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionAutoModifyDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionAutoModifyDirective, selector: "[dbxActionAutoModify]", inputs: { autoModifyEnabled: ["dbxActionAutoModify", "autoModifyEnabled"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoModifyDirective, decorators: [{
             type: Directive,
@@ -242,7 +255,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionAutoModify]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { autoModifyEnabled: [{
@@ -255,7 +268,7 @@ const DEFAULT_THROTTLE_MS = 10 * 1000;
 const DEFAULT_ERROR_THROTTLE_MS = 3 * 1000;
 const MAX_ERRORS_TO_THROTTLE_ON = 6;
 /**
- * Extension of DbxActionTransitionSafetyDirective that automatically triggers the action periodically when it is in a modified state.
+ * Directive that automatically triggers the action periodically when it is in a modified state.
  */
 class DbxActionAutoTriggerDirective extends AbstractSubscriptionDirective {
     constructor(source) {
@@ -307,7 +320,7 @@ class DbxActionAutoTriggerDirective extends AbstractSubscriptionDirective {
      * Used in forms that are simple.
      */
     set fastTrigger(fastTrigger) {
-        if (fastTrigger) {
+        if (isDefinedAndNotFalse(fastTrigger)) {
             this.triggerDebounce = 200;
             this.triggerThrottle = 500;
         }
@@ -318,7 +331,7 @@ class DbxActionAutoTriggerDirective extends AbstractSubscriptionDirective {
      * Used in forms that generally return a single value.
      */
     set instantTrigger(instantTrigger) {
-        if (instantTrigger) {
+        if (isDefinedAndNotFalse(instantTrigger)) {
             this.triggerDebounce = 10;
             this.triggerThrottle = 0;
         }
@@ -346,7 +359,7 @@ class DbxActionAutoTriggerDirective extends AbstractSubscriptionDirective {
         });
     }
 }
-DbxActionAutoTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoTriggerDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionAutoTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoTriggerDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionAutoTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionAutoTriggerDirective, selector: "dbxActionAutoTrigger, [dbxActionAutoTrigger]", inputs: { triggerEnabled: ["dbxActionAutoTrigger", "triggerEnabled"], triggerDebounce: "triggerDebounce", triggerThrottle: "triggerThrottle", triggerErrorThrottle: "triggerErrorThrottle", fastTrigger: "fastTrigger", instantTrigger: "instantTrigger", triggerLimit: "triggerLimit" }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoTriggerDirective, decorators: [{
             type: Directive,
@@ -354,7 +367,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: 'dbxActionAutoTrigger, [dbxActionAutoTrigger]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { triggerEnabled: [{
@@ -375,19 +388,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
             }] } });
 
 /**
- * Directive that watches an observable for changes and sets the new value and modified states as necessary.
+ * Directive that watches a value observable for changes and sets the new value and modified states as necessary.
  */
-class DbxActionAutoTriggerValueDirective {
+class dbxActionValueStreamDirective {
     constructor(source) {
         this.source = source;
         this._valueObs = new BehaviorSubject(EMPTY);
         this._isModifiedFn = new BehaviorSubject(undefined);
         this._modifiedSub = new SubscriptionObject();
         this._triggerSub = new SubscriptionObject();
-        this.modifiedValue$ = this._valueObs.pipe(switchMap((obs) => obs.pipe(withLatestFrom(this._isModifiedFn), mergeMap(([value, dbxActionAutoTriggerModified]) => {
+        this.modifiedValue$ = this._valueObs.pipe(switchMap((obs) => obs.pipe(withLatestFrom(this._isModifiedFn), mergeMap(([value, dbxActionValueStreamModified]) => {
             let result;
-            if (dbxActionAutoTriggerModified) {
-                result = dbxActionAutoTriggerModified(value).pipe(map((isModified) => [isModified, value]));
+            if (dbxActionValueStreamModified) {
+                result = dbxActionValueStreamModified(value).pipe(map((isModified) => [isModified, value]));
             }
             else {
                 result = of([true, value]);
@@ -395,18 +408,18 @@ class DbxActionAutoTriggerValueDirective {
             return result;
         }), shareReplay(1))));
     }
-    set dbxActionAutoTriggerValue(dbxActionAutoTriggerValue) {
-        this._valueObs.next(dbxActionAutoTriggerValue);
+    set dbxActionValueStream(dbxActionValueStream) {
+        this._valueObs.next(dbxActionValueStream);
     }
-    set dbxActionAutoTriggerModifiedNonEmptyValue(requireNonEmpty) {
-        if (requireNonEmpty) {
-            this.dbxActionAutoTriggerModified = (value) => {
+    set dbxActionValueStreamIsNotEmpty(requireNonEmpty) {
+        if (isDefinedAndNotFalse(requireNonEmpty)) {
+            this.dbxActionValueStreamModified = (value) => {
                 return of(hasValueOrNotEmpty(value));
             };
         }
     }
-    set dbxActionAutoTriggerModified(dbxActionAutoTriggerModified) {
-        this._isModifiedFn.next(dbxActionAutoTriggerModified);
+    set dbxActionValueStreamModified(dbxActionValueStreamModified) {
+        this._isModifiedFn.next(dbxActionValueStreamModified);
     }
     ngOnInit() {
         // Update Modified value.
@@ -414,89 +427,109 @@ class DbxActionAutoTriggerValueDirective {
             this.source.setIsModified(isModified);
         });
         // Set the value on triggers.
-        this._triggerSub.subscription = this.source.triggered$.pipe(mergeMap(x => this.modifiedValue$)).subscribe(([isModified, value]) => {
-            this.source.readyValue(value);
+        this._triggerSub.subscription = this.source.triggered$.pipe(switchMap(_ => this.modifiedValue$)).subscribe(([isModified, value]) => {
+            if (isModified) {
+                this.source.readyValue(value);
+            }
         });
     }
     ngOnDestroy() {
         this.source.lockSet.onNextUnlock(() => {
-            this._isModifiedFn.complete();
             this._valueObs.complete();
+            this._isModifiedFn.complete();
             this._modifiedSub.destroy();
             this._triggerSub.destroy();
         });
     }
 }
-DbxActionAutoTriggerValueDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoTriggerValueDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
-DbxActionAutoTriggerValueDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionAutoTriggerValueDirective, selector: "[dbxActionAutoTriggerValue]", inputs: { dbxActionAutoTriggerValue: "dbxActionAutoTriggerValue", dbxActionAutoTriggerModifiedNonEmptyValue: "dbxActionAutoTriggerModifiedNonEmptyValue", dbxActionAutoTriggerModified: "dbxActionAutoTriggerModified" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionAutoTriggerValueDirective, decorators: [{
+dbxActionValueStreamDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: dbxActionValueStreamDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+dbxActionValueStreamDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: dbxActionValueStreamDirective, selector: "[dbxActionValueStream]", inputs: { dbxActionValueStream: "dbxActionValueStream", dbxActionValueStreamIsNotEmpty: "dbxActionValueStreamIsNotEmpty", dbxActionValueStreamModified: "dbxActionValueStreamModified" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: dbxActionValueStreamDirective, decorators: [{
             type: Directive,
             args: [{
-                    selector: '[dbxActionAutoTriggerValue]',
+                    selector: '[dbxActionValueStream]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
-    }, propDecorators: { dbxActionAutoTriggerValue: [{
-                type: Input,
-                args: ['dbxActionAutoTriggerValue']
-            }], dbxActionAutoTriggerModifiedNonEmptyValue: [{
+    }, propDecorators: { dbxActionValueStream: [{
+                type: Input
+            }], dbxActionValueStreamIsNotEmpty: [{
                 type: Input
-            }], dbxActionAutoTriggerModified: [{
+            }], dbxActionValueStreamModified: [{
                 type: Input
             }] } });
 
 /**
  * Used by ActionContextState to denote what state the action is in.
  */
-var ActionState;
-(function (ActionState) {
+var DbxActionState;
+(function (DbxActionState) {
     /**
      * No action in progress. Waiting for the trigger.
      */
-    ActionState["Idle"] = "idle";
+    DbxActionState["IDLE"] = "idle";
     /**
      * Idle state that can be set to show that the source is not yet ready.
      */
-    ActionState["Disabled"] = "disabled";
+    DbxActionState["DISABLED"] = "disabled";
     /**
      * The action was triggered. We wait (and allow) the value to be updated.
      */
-    ActionState["Triggered"] = "triggered";
+    DbxActionState["TRIGGERED"] = "triggered";
     /**
      * The trigger was accepted and the value is updated. It should begin working immediately.
      *
      * ValueReady cannot be set until triggered is set.
      */
-    ActionState["ValueReady"] = "valueReady";
+    DbxActionState["VALUE_READY"] = "valueReady";
     /**
      * The action is in progress.
      */
-    ActionState["Working"] = "working";
+    DbxActionState["WORKING"] = "working";
     /**
      * The trigger, action, or value was rejected due to an error or other issue.
      *
      * An error may be specified optionally.
      */
-    ActionState["Rejected"] = "rejected";
+    DbxActionState["REJECTED"] = "rejected";
     /**
-     * The action was successful.
+     * The action resolved without issue.
      */
-    ActionState["Success"] = "success";
-})(ActionState || (ActionState = {}));
-const DEFAULT_ACTION_DISABLED_KEY = 'default';
+    DbxActionState["RESOLVED"] = "resolved";
+})(DbxActionState || (DbxActionState = {}));
+const DEFAULT_ACTION_DISABLED_KEY = 'dbx_action_disabled';
 function isIdleActionState(actionState) {
     switch (actionState) {
-        case ActionState.Idle:
-        case ActionState.Disabled:
-        case ActionState.Rejected:
-        case ActionState.Success:
+        case DbxActionState.IDLE:
+        case DbxActionState.DISABLED:
+        case DbxActionState.REJECTED:
+        case DbxActionState.RESOLVED:
             return true;
         default:
             return false;
     }
 }
+function loadingStateTypeForActionState(actionState) {
+    let loadingStateType;
+    switch (actionState) {
+        case DbxActionState.RESOLVED:
+            loadingStateType = LoadingStateType.SUCCESS;
+            break;
+        case DbxActionState.REJECTED:
+            loadingStateType = LoadingStateType.ERROR;
+            break;
+        case DbxActionState.IDLE:
+        case DbxActionState.DISABLED:
+            loadingStateType = LoadingStateType.IDLE;
+            break;
+        default:
+            loadingStateType = LoadingStateType.LOADING;
+            break;
+    }
+    return loadingStateType;
+}
 
 function isActionContextEnabled(state) {
     return BooleanStringKeyArrayUtilityInstance.isFalse(state.disabled);
@@ -511,13 +544,13 @@ function isWorkingActionState(actionState) {
     return !isIdleActionState(actionState);
 }
 function canTriggerActionState(actionState) {
-    return actionState !== ActionState.Disabled && isIdleActionState(actionState);
+    return actionState !== DbxActionState.DISABLED && isIdleActionState(actionState);
 }
 function canTriggerAction(state) {
     return isActionContextEnabled(state) && isIdleActionState(state.actionState);
 }
 function canReadyValue(state) {
-    return state.actionState === ActionState.Triggered;
+    return state.actionState === DbxActionState.TRIGGERED;
 }
 function actionContextIsModifiedAndCanTrigger(state) {
     // console.log('check: ', state, state.isModified, canTriggerAction(state));
@@ -526,20 +559,42 @@ function actionContextIsModifiedAndCanTrigger(state) {
 function actionContextHasNoErrorAndIsModifiedAndCanTrigger(state) {
     return !state.error && actionContextIsModifiedAndCanTrigger(state);
 }
+function loadingStateForActionContextState(state) {
+    let loadingState;
+    switch (state.actionState) {
+        case DbxActionState.RESOLVED:
+            loadingState = successResult(state.result);
+            break;
+        case DbxActionState.REJECTED:
+            loadingState = errorResult(state.error);
+            break;
+        case DbxActionState.IDLE:
+        case DbxActionState.DISABLED:
+            loadingState = idleLoadingState();
+            break;
+        default:
+            loadingState = beginLoading();
+            break;
+    }
+    return loadingState;
+}
+function loadingStateTypeForActionContextState(state) {
+    return loadingStateTypeForActionState(state.actionState);
+}
 const INITIAL_STATE = {
     isModified: false,
-    actionState: ActionState.Idle
+    actionState: DbxActionState.IDLE
 };
 class ActionContextStore extends ComponentStore {
     constructor() {
         super(Object.assign({}, INITIAL_STATE));
         this.lockSet = new LockSet();
         // MARK: Accessors
-        this.actionState$ = this.state$.pipe(map(x => isDisabledActionContextState(x) ? ActionState.Disabled : x.actionState), shareReplay(1));
+        this.actionState$ = this.state$.pipe(map(x => isDisabledActionContextState(x) ? DbxActionState.DISABLED : x.actionState), shareReplay(1));
         /**
-         * Returns the current disabled reasons.
+         * Returns the current disabled reasons/keys.
          */
-        this.disabled$ = this.state$.pipe(map(x => { var _a; return [...(_a = x.disabled) !== null && _a !== void 0 ? _a : []]; }), distinctUntilChanged(), shareReplay(1));
+        this.disabledKeys$ = this.state$.pipe(map(x => { var _a; return [...(_a = x.disabled) !== null && _a !== void 0 ? _a : []]; }), distinctUntilChanged(), shareReplay(1));
         /**
          * Maps the current state to true or not when the action state changes to/from disabled.
          */
@@ -551,19 +606,19 @@ class ActionContextStore extends ComponentStore {
         /**
          * Pipes true when triggered.
          */
-        this.triggered$ = this.afterDistinctActionState(ActionState.Triggered, () => true);
+        this.triggered$ = this.afterDistinctActionState(DbxActionState.TRIGGERED, () => true);
         /**
          * Pipes the readied value on ValueReady.
          */
-        this.valueReady$ = this.afterDistinctActionState(ActionState.ValueReady, x => x.value);
+        this.valueReady$ = this.afterDistinctActionState(DbxActionState.VALUE_READY, x => x.value);
         /**
          * Pipes the error on the rejection state.
          */
-        this.rejected$ = this.afterDistinctActionState(ActionState.Rejected, x => x.error);
+        this.rejected$ = this.afterDistinctActionState(DbxActionState.REJECTED, x => x.error);
         /**
          * Pipes the result when the ActionState becomes working.
          */
-        this.working$ = this.afterDistinctActionState(ActionState.Working, () => true);
+        this.working$ = this.afterDistinctActionState(DbxActionState.WORKING, () => true);
         /**
          * Whether or not it is currently in a working state.
          */
@@ -575,11 +630,19 @@ class ActionContextStore extends ComponentStore {
         /**
          * Pipes the result when the ActionState becomes success.
          */
-        this.success$ = this.afterDistinctActionState(ActionState.Success, x => x.result);
+        this.success$ = this.afterDistinctActionState(DbxActionState.RESOLVED, x => x.result);
         /**
          * Whether or not it is currently in a success state.
          */
-        this.isSuccess$ = this.afterDistinctBoolean(x => x.actionState === ActionState.Success);
+        this.isSuccess$ = this.afterDistinctBoolean(x => x.actionState === DbxActionState.RESOLVED);
+        /**
+         * Returns a loading state based on the current state.
+         */
+        this.loadingState$ = this.afterDistinctLoadingStateTypeChange().pipe(map(x => loadingStateForActionContextState(x)), shareReplay(1));
+        /**
+         * Returns the current LoadingStateType based on the current state.
+         */
+        this.loadingStateType$ = this.state$.pipe(map(x => loadingStateTypeForActionContextState(x)), distinctUntilChanged(), shareReplay(1));
         /**
          * Number of errors since last success.
          */
@@ -611,35 +674,35 @@ class ActionContextStore extends ComponentStore {
         /**
          * Triggers the modified state, if not disabled.
          */
-        this.setIsModified = this.updater((state, isModified) => (Object.assign(Object.assign({}, state), { actionState: (state.actionState === ActionState.Success) ? ActionState.Idle : state.actionState, isModified: isModified !== null && isModified !== void 0 ? isModified : true })));
+        this.setIsModified = this.updater((state, isModified) => (Object.assign(Object.assign({}, state), { actionState: (state.actionState === DbxActionState.RESOLVED) ? DbxActionState.IDLE : state.actionState, isModified: isModified !== null && isModified !== void 0 ? isModified : true })));
         /**
          * Triggers the action if the state is currently not idle. The current state is cleared, but the error is retained (as we may need the error from the previous attempt).
          *
          * Will not fire if the action is disabled.
          */
         this.trigger = this.updater((state) => canTriggerAction(state)
-            ? ({ isModified: state.isModified, actionState: ActionState.Triggered, error: state.error, value: undefined })
+            ? ({ isModified: state.isModified, actionState: DbxActionState.TRIGGERED, error: state.error, value: undefined })
             : state);
         /**
          * Updates the value, setting value ready. The current result is cleared.
          */
         this.readyValue = this.updater((state, value) => canReadyValue(state)
-            ? (Object.assign(Object.assign({}, state), { actionState: ActionState.ValueReady, value, result: undefined }))
+            ? (Object.assign(Object.assign({}, state), { actionState: DbxActionState.VALUE_READY, value, result: undefined }))
             : state);
         /**
          * Notifys the context that the action is in progress.
          */
-        this.startWorking = this.updater((state) => (Object.assign(Object.assign({}, state), { actionState: ActionState.Working })));
+        this.startWorking = this.updater((state) => (Object.assign(Object.assign({}, state), { actionState: DbxActionState.WORKING })));
         /**
          * Triggers rejection of the action. The value is cleared.
          */
-        this.reject = this.updater((state, error) => { var _a; return ({ isModified: state.isModified, actionState: ActionState.Rejected, error, errorCount: ((_a = state.errorCount) !== null && _a !== void 0 ? _a : 0) + 1 }); });
+        this.reject = this.updater((state, error) => { var _a; return ({ isModified: state.isModified, actionState: DbxActionState.REJECTED, error, errorCount: ((_a = state.errorCount) !== null && _a !== void 0 ? _a : 0) + 1, disabled: state.disabled }); });
         /**
          * Updates the state to success, and optionally sets a result.
          *
          * Clears modified state, and any errors.
          */
-        this.success = this.updater((state, result) => ({ isModified: false, actionState: ActionState.Success, value: state.value, result, error: undefined }));
+        this.resolve = this.updater((state, result) => ({ isModified: false, actionState: DbxActionState.RESOLVED, value: state.value, result, error: undefined, disabled: state.disabled }));
         /**
          * Completely resets the store.
          */
@@ -651,9 +714,16 @@ class ActionContextStore extends ComponentStore {
         return this.state$.pipe(map(x => fromState(x)), distinctUntilChanged(), shareReplay(1));
     }
     afterDistinctActionState(actionState, fromState) {
+        return this.afterDistinctActionStateChange().pipe(filter((x) => x.actionState === actionState), // Only pipe when the new action state matches.
+        map(x => fromState(x)), shareReplay(1));
+    }
+    afterDistinctActionStateChange() {
         return this.state$.pipe(map((x) => ([x, x.actionState])), distinctUntilChanged((a, b) => (a === null || a === void 0 ? void 0 : a[1]) === (b === null || b === void 0 ? void 0 : b[1])), // Filter out when the state remains the same.
-        filter(([x, y]) => y === actionState), // Only pipe when the action state matches.
-        map(x => fromState(x[0])), shareReplay(1));
+        map(x => x[0]), shareReplay(1));
+    }
+    afterDistinctLoadingStateTypeChange() {
+        return this.state$.pipe(map((x) => ([x, loadingStateForActionContextState(x)])), distinctUntilChanged((a, b) => (a === null || a === void 0 ? void 0 : a[1]) === (b === null || b === void 0 ? void 0 : b[1])), // Filter out when the loading state remains the same.
+        map(x => x[0]), shareReplay(1));
     }
     // MARK: Cleanup
     ngOnDestroy() {
@@ -672,7 +742,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
 /**
  * Abstract class that can either use SecondaryActionContextStoreSource or create it's own.
  */
-class ActionContextBaseSource {
+class DbxActionContextBaseSource {
     constructor(inputSource) {
         this.inputSource = inputSource;
         if (this.inputSource) {
@@ -682,7 +752,7 @@ class ActionContextBaseSource {
             this._store = new ActionContextStore();
             this._store$ = of(this._store);
         }
-        this._instance = new ActionContextStoreSourceInstance(this);
+        this._instance = new DbxActionContextStoreSourceInstance(this);
         this.isModified$ = this._instance.isModified$;
         this.triggered$ = this._instance.triggered$;
         this.success$ = this._instance.success$;
@@ -714,12 +784,21 @@ class ActionContextBaseSource {
     reset() {
         this._instance.reset();
     }
+    enable(key, enable) {
+        this._instance.enable(key, enable);
+    }
+    disable(key, disable) {
+        this._instance.disable(key, disable);
+    }
+    setIsModified(isModified) {
+        this._instance.setIsModified(isModified);
+    }
 }
 
 /**
  * Provides an DbxActionContext.
  */
-class DbxActionDirective extends ActionContextBaseSource {
+class DbxActionDirective extends DbxActionContextBaseSource {
     constructor(inputSource) {
         super(inputSource);
     }
@@ -730,12 +809,12 @@ class DbxActionDirective extends ActionContextBaseSource {
     }
 }
 DbxActionDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDirective, deps: [{ token: SecondaryActionContextStoreSource, host: true, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
-DbxActionDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionDirective, selector: "dbx-action,[dbxAction],dbx-action-context,[dbxActionContext]", providers: ProvideActionStoreSource(DbxActionDirective), exportAs: ["action"], usesInheritance: true, ngImport: i0 });
+DbxActionDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionDirective, selector: "dbx-action,[dbxAction],dbx-action-context,[dbxActionContext]", providers: ProvideActionStoreSource(DbxActionDirective), exportAs: ["action", "dbxAction"], usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: 'dbx-action,[dbxAction],dbx-action-context,[dbxActionContext]',
-                    exportAs: 'action',
+                    exportAs: 'action,dbxAction',
                     providers: ProvideActionStoreSource(DbxActionDirective)
                 }]
         }], ctorParameters: function () {
@@ -794,7 +873,7 @@ class DbxActionContextLoggerDirective extends AbstractSubscriptionDirective {
         });
     }
 }
-DbxActionContextLoggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextLoggerDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionContextLoggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextLoggerDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionContextLoggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionContextLoggerDirective, selector: "[dbxActionLogger],[dbxActionContextLogger]", usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionContextLoggerDirective, decorators: [{
             type: Directive,
@@ -802,7 +881,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionLogger],[dbxActionContextLogger]'
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     } });
@@ -957,7 +1036,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
 class ActionContextStoreSourceMap {
 }
 
-const DEFAULT_ACTION_MAP_WORKING_DISABLED_KEY = '__disabled';
+const DEFAULT_ACTION_MAP_WORKING_DISABLED_KEY = 'action_map_working_disable';
 /**
  * Used to communicate with an dbxActionMap and set the ActionContextStore to be disabled if any other element in the map is working.
  */
@@ -977,7 +1056,7 @@ class DbxActionMapWorkingDisableDirective extends AbstractSubscriptionDirective
         this.source.enable(this.disabledKey || DEFAULT_ACTION_MAP_WORKING_DISABLED_KEY);
     }
 }
-DbxActionMapWorkingDisableDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionMapWorkingDisableDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }, { token: DbxActionContextMapDirective }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionMapWorkingDisableDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionMapWorkingDisableDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }, { token: DbxActionContextMapDirective }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionMapWorkingDisableDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionMapWorkingDisableDirective, selector: "[dbxActionMapWorkingDisable]", inputs: { disabledKey: ["dbxActionMapWorkingDisable", "disabledKey"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionMapWorkingDisableDirective, decorators: [{
             type: Directive,
@@ -985,7 +1064,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionMapWorkingDisable]'
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }, { type: DbxActionContextMapDirective }];
     }, propDecorators: { disabledKey: [{
@@ -1018,10 +1097,11 @@ class DbxActionDisabledDirective extends AbstractSubscriptionDirective {
         return this._disabled.value;
     }
     set disabled(disabled) {
-        this._disabled.next(disabled);
+        const disable = isUndefinedAndNotFalse(disabled);
+        this._disabled.next(disable);
     }
 }
-DbxActionDisabledDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDisabledDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionDisabledDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDisabledDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionDisabledDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionDisabledDirective, selector: "[dbxActionDisabled]", inputs: { disabled: ["dbxActionDisabled", "disabled"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDisabledDirective, decorators: [{
             type: Directive,
@@ -1029,7 +1109,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionDisabled]'
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { disabled: [{
@@ -1037,40 +1117,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                 args: ['dbxActionDisabled']
             }] } });
 
-const APP_ACTION_DISABLED_UNTIL_MODIFIED_DIRECTIVE_KEY = 'dbx_action_is_not_modified';
-/**
- * Directive that sets the disabled state based on the current isModified state.
- */
-class DbxActionDisabledUntilModifiedDirective extends AbstractSubscriptionDirective {
-    constructor(source) {
-        super();
-        this.source = source;
-    }
-    ngOnInit() {
-        this.sub = this.source.isModified$.subscribe((x) => {
-            this.source.disable(APP_ACTION_DISABLED_UNTIL_MODIFIED_DIRECTIVE_KEY, !x);
-        });
-    }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-        this.source.enable(APP_ACTION_DISABLED_UNTIL_MODIFIED_DIRECTIVE_KEY);
-    }
-}
-DbxActionDisabledUntilModifiedDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDisabledUntilModifiedDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
-DbxActionDisabledUntilModifiedDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionDisabledUntilModifiedDirective, selector: "[dbxActionDisabledUntilModified]", usesInheritance: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionDisabledUntilModifiedDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: '[dbxActionDisabledUntilModified]'
-                }]
-        }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
-                        type: Host
-                    }] }];
-    } });
-
 /**
- * WorkHandlerContextDelegate implementation using an ActionContextStoreSourceInstance.
+ * WorkHandlerContextDelegate implementation using an DbxActionContextStoreSourceInstance.
  */
 class WorkHandlerContextSourceDelegate {
     constructor(source) {
@@ -1080,7 +1128,7 @@ class WorkHandlerContextSourceDelegate {
         this.source.startWorking();
     }
     success(result) {
-        this.source.success(result);
+        this.source.resolve(result);
     }
     reject(error) {
         this.source.reject(error);
@@ -1231,7 +1279,7 @@ class DbxActionHandlerDirective extends AbstractSubscriptionDirective {
             const context = handleWorkValueReadyFn({ handlerFunction, delegate: this._delegate })(value);
             if (context) {
                 // Add the action to the lockSet for the source to prevent it from being destroyed until the action completes.
-                this.source.lockSet.addLock('actionhandler', context.isComplete$.pipe(map(x => !x)));
+                this.source.lockSet.addLock('dbxActionHandler', context.isComplete$.pipe(map(x => !x)));
             }
         })))).subscribe();
     }
@@ -1241,7 +1289,7 @@ class DbxActionHandlerDirective extends AbstractSubscriptionDirective {
         });
     }
 }
-DbxActionHandlerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionHandlerDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionHandlerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionHandlerDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionHandlerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionHandlerDirective, selector: "[dbxActionHandler]", inputs: { handlerFunction: ["dbxActionHandler", "handlerFunction"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionHandlerDirective, decorators: [{
             type: Directive,
@@ -1249,7 +1297,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionHandler]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { handlerFunction: [{
@@ -1280,7 +1328,7 @@ class DbxActionSuccessComponent {
         }), shareReplay(1));
     }
 }
-DbxActionSuccessComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionSuccessComponent, deps: [{ token: ActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Component });
+DbxActionSuccessComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionSuccessComponent, deps: [{ token: DbxActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Component });
 DbxActionSuccessComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionSuccessComponent, selector: "dbx-action-success", inputs: { hideAfter: "hideAfter" }, ngImport: i0, template: `
     <ng-container *ngIf="show$ | async">
       <ng-content></ng-content>
@@ -1296,7 +1344,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
     </ng-container>
   `
                 }]
-        }], ctorParameters: function () { return [{ type: ActionContextStoreSourceInstance }]; }, propDecorators: { hideAfter: [{
+        }], ctorParameters: function () { return [{ type: DbxActionContextStoreSourceInstance }]; }, propDecorators: { hideAfter: [{
                 type: Input
             }] } });
 
@@ -1326,7 +1374,7 @@ class DbxActionSuccessDirective extends AbstractSubscriptionDirective {
         this._successFunction.complete();
     }
 }
-DbxActionSuccessDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionSuccessDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionSuccessDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionSuccessDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionSuccessDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionSuccessDirective, selector: "[dbxActionSuccess]", inputs: { successFunction: ["dbxActionSuccess", "successFunction"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionSuccessDirective, decorators: [{
             type: Directive,
@@ -1334,7 +1382,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionSuccess]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { successFunction: [{
@@ -1358,7 +1406,7 @@ class DbxActionValueDirective extends AbstractSubscriptionDirective {
         return this._valueOrFunction.value;
     }
     set valueOrFunction(valueOrFunction) {
-        this._valueOrFunction.next(valueOrFunction);
+        this._valueOrFunction.next(valueOrFunction || undefined);
     }
     ngOnInit() {
         this.sub = this.valueOrFunction$.pipe(switchMap(valueOrFunction => this.source.triggered$.pipe(tap(() => {
@@ -1367,11 +1415,13 @@ class DbxActionValueDirective extends AbstractSubscriptionDirective {
         })))).subscribe();
     }
     ngOnDestroy() {
-        super.ngOnDestroy();
-        this._valueOrFunction.complete();
+        this.source.lockSet.onNextUnlock(() => {
+            super.ngOnDestroy();
+            this._valueOrFunction.complete();
+        });
     }
 }
-DbxActionValueDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionValueDirective, deps: [{ token: ActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionValueDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionValueDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionValueDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionValueDirective, selector: "[dbxActionValue]", inputs: { valueOrFunction: ["dbxActionValue", "valueOrFunction"] }, usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionValueDirective, decorators: [{
             type: Directive,
@@ -1379,7 +1429,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     selector: '[dbxActionValue]',
                 }]
         }], ctorParameters: function () {
-        return [{ type: ActionContextStoreSourceInstance, decorators: [{
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
                         type: Host
                     }] }];
     }, propDecorators: { valueOrFunction: [{
@@ -1396,7 +1446,7 @@ class DbxActionWorkingComponent {
         this.show$ = this.source.isWorking$;
     }
 }
-DbxActionWorkingComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionWorkingComponent, deps: [{ token: ActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Component });
+DbxActionWorkingComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionWorkingComponent, deps: [{ token: DbxActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Component });
 DbxActionWorkingComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionWorkingComponent, selector: "dbx-action-working", ngImport: i0, template: `
     <ng-container *ngIf="show$ | async">
       <ng-content></ng-content>
@@ -1412,45 +1462,177 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
     </ng-container>
   `
                 }]
-        }], ctorParameters: function () { return [{ type: ActionContextStoreSourceInstance }]; } });
-
-const DEFAULT_SNACKBAR_DIRECTIVE_DURATION = ms('4s');
-const DEFAULT_SNACKBAR_UNDO_DIRECTIVE_DURATION = ms('30s');
-var ActionSnackbarDefaultType;
-(function (ActionSnackbarDefaultType) {
-    ActionSnackbarDefaultType["NONE"] = "none";
-    ActionSnackbarDefaultType["CREATE"] = "create";
-    ActionSnackbarDefaultType["SAVE"] = "save";
-    ActionSnackbarDefaultType["DELETE"] = "delete";
-    ActionSnackbarDefaultType["MERGE"] = "merge";
-    ActionSnackbarDefaultType["SEND"] = "send";
-    ActionSnackbarDefaultType["CANCEL"] = "cancel";
-    ActionSnackbarDefaultType["RESTORE"] = "restore";
-    ActionSnackbarDefaultType["REFRESH"] = "refresh";
-    ActionSnackbarDefaultType["MARK_READ"] = "read";
-    ActionSnackbarDefaultType["MARK_UNREAD"] = "unread";
-})(ActionSnackbarDefaultType || (ActionSnackbarDefaultType = {}));
-var ActionSnackbarEventType;
-(function (ActionSnackbarEventType) {
-    ActionSnackbarEventType[ActionSnackbarEventType["WORKING"] = 0] = "WORKING";
-    ActionSnackbarEventType[ActionSnackbarEventType["SUCCESS"] = 1] = "SUCCESS";
-    ActionSnackbarEventType[ActionSnackbarEventType["REJECTED"] = 2] = "REJECTED";
-})(ActionSnackbarEventType || (ActionSnackbarEventType = {}));
-
-// export * from './snackbar.directive';
+        }], ctorParameters: function () { return [{ type: DbxActionContextStoreSourceInstance }]; } });
+
+const APP_ACTION_ENFORCE_MODIFIED_DIRECTIVE_KEY = 'dbx_action_enforce_modified';
+/**
+ * Directive that toggles disabling an action if the action is not marked modified.
+ */
+class DbxActionEnforceModifiedDirective extends AbstractSubscriptionDirective {
+    constructor(source) {
+        super();
+        this.source = source;
+        this._enabled = new BehaviorSubject(true);
+    }
+    ngOnInit() {
+        this.sub = combineLatest([this.source.isModified$, this._enabled]).pipe(delay$1(0)).subscribe(([modified, enableDirective]) => {
+            const disable = enableDirective && !modified;
+            this.source.disable(APP_ACTION_ENFORCE_MODIFIED_DIRECTIVE_KEY, disable);
+        });
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this._enabled.complete();
+        this.source.enable(APP_ACTION_ENFORCE_MODIFIED_DIRECTIVE_KEY);
+    }
+    get enabled() {
+        return this._enabled.value;
+    }
+    set enabled(enabled) {
+        this._enabled.next(enabled !== null && enabled !== void 0 ? enabled : true);
+    }
+}
+DbxActionEnforceModifiedDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionEnforceModifiedDirective, deps: [{ token: DbxActionContextStoreSourceInstance, host: true }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionEnforceModifiedDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionEnforceModifiedDirective, selector: "[dbxActionEnforceModified]", inputs: { enabled: ["[dbxActionEnforceModified]", "enabled"] }, usesInheritance: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionEnforceModifiedDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[dbxActionEnforceModified]'
+                }]
+        }], ctorParameters: function () {
+        return [{ type: DbxActionContextStoreSourceInstance, decorators: [{
+                        type: Host
+                    }] }];
+    }, propDecorators: { enabled: [{
+                type: Input,
+                args: ['[dbxActionEnforceModified]']
+            }] } });
+
+/**
+ * Utility class that handles trigger events to retrieve a value.
+ */
+class DbxActionValueOnTriggerInstance {
+    constructor(config) {
+        this._valueGetter = new BehaviorSubject(undefined);
+        this.valueGetter$ = this._valueGetter.pipe(filterMaybe());
+        this._triggeredSub = new SubscriptionObject();
+        this.source = config.source;
+        this._valueGetter.next(config.valueGetter);
+    }
+    get valueGetter() {
+        return this._valueGetter.value;
+    }
+    set valueGetter(valueGetter) {
+        this._valueGetter.next(valueGetter);
+    }
+    init() {
+        // Ready the value after the source is triggered. Do modified check one last time.
+        this._triggeredSub.subscription = this.source.triggered$.pipe(switchMap$1(() => this.valueGetter$.pipe(switchMap$1((valueGetter) => asObservable(valueGetter())))
+            .pipe(
+        // If the value is not null/undefined and is considered modified, then pass the value.
+        switchMap$1((value) => returnIfIs(this.isModifiedFunction, value, false).pipe(map$1((value) => ({ value })))), 
+        // Catch any errors and pass them to reject.
+        catchError((reject) => of({ reject }))))).subscribe((result) => {
+            if (result.value != null) {
+                this.source.readyValue(result.value);
+            }
+            else {
+                this.source.reject(result.reject);
+            }
+        });
+    }
+    destroy() {
+        this.source.lockSet.onNextUnlock(() => {
+            this._triggeredSub.destroy();
+        });
+    }
+}
+
+/**
+ * Abstract class for directives that may perform an action when trigger is called, and returns a value.
+ */
+class AbstractDbxActionValueOnTriggerDirective {
+    constructor(source, valueGetter) {
+        this.source = source;
+        this._triggeredSub = new SubscriptionObject();
+        this._instance = new DbxActionValueOnTriggerInstance({
+            source: this.source,
+            valueGetter
+        });
+    }
+    get valueGetter() {
+        return this._instance.valueGetter;
+    }
+    set valueGetter(valueGetter) {
+        this._instance.valueGetter = valueGetter;
+    }
+    get isModifiedFunction() {
+        return this._instance.isModifiedFunction;
+    }
+    set isModifiedFunction(isModifiedFunction) {
+        this._instance.isModifiedFunction = isModifiedFunction;
+    }
+    ngOnInit() {
+        this._instance.init();
+    }
+    ngOnDestroy() {
+        this._instance.destroy();
+        this._triggeredSub.destroy();
+    }
+}
+AbstractDbxActionValueOnTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: AbstractDbxActionValueOnTriggerDirective, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
+AbstractDbxActionValueOnTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: AbstractDbxActionValueOnTriggerDirective, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: AbstractDbxActionValueOnTriggerDirective, decorators: [{
+            type: Directive
+        }], ctorParameters: function () { return [{ type: DbxActionContextStoreSourceInstance }, { type: undefined }]; } });
+/**
+ * Action directive that is used to trigger/display a popover, then watches that popover for a value.
+ */
+class DbxActionValueTriggerDirective extends AbstractDbxActionValueOnTriggerDirective {
+    constructor(elementRef, source) {
+        super(source);
+        this.elementRef = elementRef;
+    }
+    set dbxActionValueOnTrigger(dbxActionValueTrigger) {
+        this.valueGetter = dbxActionValueTrigger;
+    }
+    set dbxActionValueTriggerModified(isModifiedFunction) {
+        this.isModifiedFunction = isModifiedFunction;
+    }
+}
+DbxActionValueTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionValueTriggerDirective, deps: [{ token: i0.ElementRef }, { token: DbxActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionValueTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionValueTriggerDirective, selector: "[dbxActionValueOnTrigger]", inputs: { dbxActionValueOnTrigger: "dbxActionValueOnTrigger", dbxActionValueTriggerModified: "dbxActionValueTriggerModified" }, exportAs: ["dbxActionValueOnTrigger"], usesInheritance: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionValueTriggerDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    exportAs: 'dbxActionValueOnTrigger',
+                    selector: '[dbxActionValueOnTrigger]'
+                }]
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: DbxActionContextStoreSourceInstance }]; }, propDecorators: { dbxActionValueOnTrigger: [{
+                type: Input,
+                args: ['dbxActionValueOnTrigger']
+            }], dbxActionValueTriggerModified: [{
+                type: Input
+            }] } });
 
 /**
  * Configurable machine that handles components of the ActionContextStore lifecycle.
+ *
+ * It can be configured to activate only once before cleaning itself up. It can be used directly as a DbxActionContextSourceReference in cases where it is created as a one-off action.
  */
-class ActionContextMachine extends ActionContextBaseSource {
+class DbxActionContextMachine extends DbxActionContextBaseSource {
     constructor(config, source) {
         super(source);
         this.config = config;
         this._isShutdown = true;
         this._handleValueReadySub = new SubscriptionObject();
+        this._successSub = new SubscriptionObject();
         // Handle Value Ready
         this._handleValueReadySub.subscription = this.sourceInstance.valueReady$.subscribe((value) => {
-            handleWorkValueReadyFn({ handlerFunction: config.handleValueReady, delegate: new WorkHandlerContextSourceDelegate(this.sourceInstance) })(value);
+            handleWorkValueReadyFn({
+                handlerFunction: config.handleValueReady,
+                delegate: new WorkHandlerContextSourceDelegate(this.sourceInstance)
+            })(value);
         });
         // If this is a one-time use, then destroy it after the first success comes through.
         if (this.config.oneTimeUse) {
@@ -1459,12 +1641,13 @@ class ActionContextMachine extends ActionContextBaseSource {
             });
         }
         if (this.config.onSuccess) {
-            this.sourceInstance.success$.subscribe(this.config.onSuccess);
+            this._successSub.subscription = this.sourceInstance.success$.subscribe(this.config.onSuccess);
         }
     }
     destroy() {
         super.destroy();
         this._handleValueReadySub.destroy();
+        this._successSub.destroy();
         this._isShutdown = true;
     }
     get isShutdown() {
@@ -1476,11 +1659,11 @@ class DbxCoreActionModule {
 }
 DbxCoreActionModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxCoreActionModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
 DbxCoreActionModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxCoreActionModule, declarations: [DbxActionDirective, DbxActionContextMapDirective, DbxActionFromMapDirective, DbxActionMapSourceDirective,
-        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionDisabledUntilModifiedDirective,
-        DbxActionAutoTriggerDirective, DbxActionAutoTriggerValueDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
+        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionEnforceModifiedDirective,
+        DbxActionAutoTriggerDirective, dbxActionValueStreamDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
         DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionWorkingComponent], imports: [CommonModule], exports: [DbxActionDirective, DbxActionContextMapDirective, DbxActionFromMapDirective, DbxActionMapSourceDirective,
-        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionDisabledUntilModifiedDirective,
-        DbxActionAutoTriggerDirective, DbxActionAutoTriggerValueDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
+        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionEnforceModifiedDirective,
+        DbxActionAutoTriggerDirective, dbxActionValueStreamDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
         DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionWorkingComponent] });
 DbxCoreActionModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxCoreActionModule, imports: [[
             CommonModule
@@ -1493,19 +1676,70 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
                     ],
                     declarations: [
                         DbxActionDirective, DbxActionContextMapDirective, DbxActionFromMapDirective, DbxActionMapSourceDirective,
-                        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionDisabledUntilModifiedDirective,
-                        DbxActionAutoTriggerDirective, DbxActionAutoTriggerValueDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
-                        DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionWorkingComponent
+                        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionEnforceModifiedDirective,
+                        DbxActionAutoTriggerDirective, dbxActionValueStreamDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
+                        DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionWorkingComponent,
                     ],
                     exports: [
                         DbxActionDirective, DbxActionContextMapDirective, DbxActionFromMapDirective, DbxActionMapSourceDirective,
-                        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionDisabledUntilModifiedDirective,
-                        DbxActionAutoTriggerDirective, DbxActionAutoTriggerValueDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
+                        DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionHandlerDirective, DbxActionDisabledDirective, DbxActionEnforceModifiedDirective,
+                        DbxActionAutoTriggerDirective, dbxActionValueStreamDirective, DbxActionAutoModifyDirective, DbxActionValueDirective, DbxActionContextLoggerDirective,
                         DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionWorkingComponent
                     ]
                 }]
         }] });
 
+function makeDbxActionContextSourceReference(sourceInstance) {
+    return {
+        sourceInstance,
+        destroy: () => 0
+    };
+}
+
+/**
+ * Convenience function used within observables for views that need to detect changes after a value changes.
+ *
+ * @param cdRef
+ * @param timeout
+ * @returns
+ */
+function tapDetectChanges(cdRef, timeout = 0) {
+    return tap$1(() => setTimeout(() => safeDetectChanges(cdRef), timeout));
+}
+/**
+ * Triggers a detection change on the input view as long as the view has not been destroyed.
+ *
+ * @param cdRef
+ */
+function safeDetectChanges(cdRef) {
+    if (!cdRef.destroyed) {
+        cdRef.detectChanges();
+    }
+}
+/**
+ * Used to check an injected ElementRef that wraps an ng-content injection point whether or not any content was injected,
+ * or more specifically if the parent component passed any target content to the child. This will still return true if
+ * passed content is empty.
+ *
+ * TS:
+ * @ViewChild('customLoading', { static: false }) customCustom: ElementRef;
+ *
+ * HTML:
+ * <div #customContent>
+ *  <ng-content select="[content]"></ng-content>
+ * </div>
+ */
+function checkNgContentWrapperHasContent(ref) {
+    // https://github.com/angular/angular/issues/26083
+    let hasContent = false;
+    if (ref != null) {
+        const childNodes = ref.nativeElement.childNodes;
+        const hasChildNodes = childNodes && childNodes.length > 0;
+        hasContent = Boolean(hasChildNodes);
+    }
+    return hasContent;
+}
+
 class DbxButton {
 }
 function ProvideDbxButton(sourceType) {
@@ -1533,7 +1767,7 @@ class DbxActionButtonTriggerDirective extends AbstractSubscriptionDirective {
         this.source.trigger();
     }
 }
-DbxActionButtonTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonTriggerDirective, deps: [{ token: DbxButton, host: true }, { token: ActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionButtonTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonTriggerDirective, deps: [{ token: DbxButton, host: true }, { token: DbxActionContextStoreSourceInstance }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionButtonTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionButtonTriggerDirective, selector: "[dbxActionButtonTrigger]", usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonTriggerDirective, decorators: [{
             type: Directive,
@@ -1543,28 +1777,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
         }], ctorParameters: function () {
         return [{ type: DbxButton, decorators: [{
                         type: Host
-                    }] }, { type: ActionContextStoreSourceInstance }];
+                    }] }, { type: DbxActionContextStoreSourceInstance }];
     } });
 
 /**
  * Context used for linking a button to an ActionContext.
  */
 class DbxActionButtonDirective extends DbxActionButtonTriggerDirective {
-    constructor(button, source, ngZone) {
+    constructor(button, source, cdRef) {
         super(button, source);
-        this.ngZone = ngZone;
+        this.cdRef = cdRef;
         this._workingSub = new SubscriptionObject();
         this._disabledSub = new SubscriptionObject();
     }
     ngOnInit() {
         super.ngOnInit();
         this._workingSub.subscription = this.source.isWorking$.subscribe((working) => {
-            // console.log('Working: ', working);
-            this.ngZone.run(() => this.button.working = working);
+            this.button.working = working;
+            safeDetectChanges(this.cdRef);
         });
         this._disabledSub.subscription = this.source.isDisabled$.subscribe((disabled) => {
-            // console.log('Disabled: ', disabled);
-            this.ngZone.run(() => this.button.disabled = disabled);
+            this.button.disabled = disabled;
+            safeDetectChanges(this.cdRef);
         });
     }
     ngOnDestroy() {
@@ -1573,7 +1807,7 @@ class DbxActionButtonDirective extends DbxActionButtonTriggerDirective {
         this._disabledSub.destroy();
     }
 }
-DbxActionButtonDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonDirective, deps: [{ token: DbxButton, host: true }, { token: ActionContextStoreSourceInstance }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
+DbxActionButtonDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonDirective, deps: [{ token: DbxButton, host: true }, { token: DbxActionContextStoreSourceInstance }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
 DbxActionButtonDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: DbxActionButtonDirective, selector: "[dbxActionButton]", usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: DbxActionButtonDirective, decorators: [{
             type: Directive,
@@ -1583,7 +1817,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
         }], ctorParameters: function () {
         return [{ type: DbxButton, decorators: [{
                         type: Host
-                    }] }, { type: ActionContextStoreSourceInstance }, { type: i0.NgZone }];
+                    }] }, { type: DbxActionContextStoreSourceInstance }, { type: i0.ChangeDetectorRef }];
     } });
 
 const expandClickableAnchorLinkTreeNode = expandTreeFunction({
@@ -2467,12 +2701,12 @@ class AbstractActionFilterSourceDirective extends AbstractFilterSourceDirective
     }
 }
 AbstractActionFilterSourceDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: AbstractActionFilterSourceDirective, deps: null, target: i0.ɵɵFactoryTarget.Directive });
-AbstractActionFilterSourceDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: AbstractActionFilterSourceDirective, viewQueries: [{ propertyName: "filterAction", first: true, predicate: ActionContextStoreSourceInstance, descendants: true, read: ActionContextStoreSourceInstance, static: true }], usesInheritance: true, ngImport: i0 });
+AbstractActionFilterSourceDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.2.4", type: AbstractActionFilterSourceDirective, viewQueries: [{ propertyName: "filterAction", first: true, predicate: DbxActionContextStoreSourceInstance, descendants: true, read: DbxActionContextStoreSourceInstance, static: true }], usesInheritance: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImport: i0, type: AbstractActionFilterSourceDirective, decorators: [{
             type: Directive
         }], propDecorators: { filterAction: [{
                 type: ViewChild,
-                args: [ActionContextStoreSourceInstance, { static: true, read: ActionContextStoreSourceInstance }]
+                args: [DbxActionContextStoreSourceInstance, { static: true, read: DbxActionContextStoreSourceInstance }]
             }] } });
 
 /**
@@ -3251,53 +3485,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.4", ngImpor
             type: NgModule
         }] });
 
-/**
- * Convenience function used within observables for views that need to detect changes after a value changes.
- *
- * @param cdRef
- * @param timeout
- * @returns
- */
-function tapDetectChanges(cdRef, timeout = 0) {
-    return tap$1(() => setTimeout(() => safeDetectChanges(cdRef), timeout));
-}
-/**
- * Triggers a detection change on the input view as long as the view has not been destroyed.
- *
- * @param cdRef
- */
-function safeDetectChanges(cdRef) {
-    if (!cdRef.destroyed) {
-        cdRef.detectChanges();
-    }
-}
-/**
- * Used to check an injected ElementRef that wraps an ng-content injection point whether or not any content was injected,
- * or more specifically if the parent component passed any target content to the child. This will still return true if
- * passed content is empty.
- *
- * TS:
- * @ViewChild('customLoading', { static: false }) customCustom: ElementRef;
- *
- * HTML:
- * <div #customContent>
- *  <ng-content select="[content]"></ng-content>
- * </div>
- */
-function checkNgContentWrapperHasContent(ref) {
-    // https://github.com/angular/angular/issues/26083
-    let hasContent = false;
-    if (ref != null) {
-        const childNodes = ref.nativeElement.childNodes;
-        const hasChildNodes = childNodes && childNodes.length > 0;
-        hasContent = Boolean(hasChildNodes);
-    }
-    return hasContent;
-}
-
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { APP_ACTION_DISABLED_DIRECTIVE_KEY, APP_ACTION_DISABLED_UNTIL_MODIFIED_DIRECTIVE_KEY, AbstractActionFilterSourceDirective, AbstractDbxAnchorDirective, AbstractDbxButtonDirective, AbstractDbxFilterMapInstanceDirective, AbstractDbxInjectedDirective, AbstractFilterSourceConnectorDirective, AbstractFilterSourceDirective, AbstractLockSetSubscriptionDirective, AbstractSubscriptionDirective, AbstractTransitionDirective, AbstractTransitionWatcherDirective, ActionContextBaseSource, ActionContextMachine, ActionContextStore, ActionContextStoreSource, ActionContextStoreSourceInstance, ActionContextStoreSourceMap, ActionSnackbarDefaultType, ActionSnackbarEventType, ActionState, AnchorType, DBX_INJECTED_COMPONENT_DATA, DEFAULT_ACTION_DISABLED_KEY, DEFAULT_ACTION_MAP_WORKING_DISABLED_KEY, DEFAULT_SNACKBAR_DIRECTIVE_DURATION, DEFAULT_SNACKBAR_UNDO_DIRECTIVE_DURATION, DEFAULT_STORAGE_ACCESSOR_FACTORY_TOKEN, DEFAULT_STORAGE_OBJECT_TOKEN, DateDistancePipe, DateFormatDistancePipe, DateFromToTimePipe, DbxActionAutoModifyDirective, DbxActionAutoTriggerDirective, DbxActionAutoTriggerValueDirective, DbxActionButtonDirective, DbxActionButtonTriggerDirective, DbxActionContextLoggerDirective, DbxActionContextMapDirective, DbxActionContextMapDirectiveSourceInstance, DbxActionDirective, DbxActionDisabledDirective, DbxActionDisabledUntilModifiedDirective, DbxActionFromMapDirective, DbxActionHandlerDirective, DbxActionMapSourceDirective, DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionValueDirective, DbxActionWorkingComponent, DbxAnchor, DbxAngularRouterService, DbxButton, DbxButtonDirective, DbxButtonSegueDirective, DbxCoreActionModule, DbxCoreAngularRouterSegueModule, DbxCoreButtonModule, DbxCoreFilterModule, DbxCoreUIRouterSegueModule, DbxDatePipeModule, DbxFilterMapDirective, DbxFilterMapSourceConnectorDirective, DbxFilterMapSourceDirective, DbxFilterSourceConnectorDirective, DbxFilterSourceDirective, DbxInjectedComponent, DbxInjectedComponentInstance, DbxInjectedComponentModule, DbxLoadingButtonDirective, DbxRouterService, DbxRouterTransitionEventType, DbxRouterTransitionService, DbxStorageModule, DbxUIRouterService, FullLocalStorageObject, InstantStorageAccessor, LimitedStorageAccessor, MemoryStorageObject, MinutesStringPipe, ProvideActionStoreSource, ProvideDbxAnchor, ProvideDbxButton, ProvideFilterSource, ProvideFilterSourceConnector, ProvideSecondaryActionStoreSource, SecondaryActionContextStoreSource, SimpleStorageAccessor, SimpleStorageAccessorFactory, StorageAccessor, StringStorageAccessor, StringifySimpleStorageAccessorConverter, TimeDistanceCountdownPipe, TimeDistancePipe, ToJsDatePipe, ToMinutesPipe, WorkHandlerContext, WorkHandlerContextSourceDelegate, WrapperSimpleStorageAccessorDelegate, actionContextHasNoErrorAndIsModifiedAndCanTrigger, actionContextIsModifiedAndCanTrigger, actionContextStoreSourceInstanceFactory, actionContextStoreSourcePipe, anchorTypeForAnchor, canReadyValue, canTriggerAction, canTriggerActionState, checkNgContentWrapperHasContent, defaultStorageObjectFactory, expandClickableAnchorLinkTree, expandClickableAnchorLinkTreeNode, expandClickableAnchorLinkTrees, filterTransitionEvent, filterTransitionSuccess, flattenExpandedClickableAnchorLinkTree, flattenExpandedClickableAnchorLinkTreeToLinks, handleWorkValueReadyFn, handleWorkValueReadyWithConfigFn, isActionContextDisabled, isActionContextEnabled, isDisabledActionContextState, isIdleActionState, isWorkingActionState, mapRefStringObsToSegueRefObs, mergeDbxInjectedComponentConfigs, pipeActionStore, refStringToSegueRef, safeDetectChanges, successTransition, tapDetectChanges, useActionStore };
+export { APP_ACTION_DISABLED_DIRECTIVE_KEY, APP_ACTION_ENFORCE_MODIFIED_DIRECTIVE_KEY, AbstractActionFilterSourceDirective, AbstractDbxActionValueOnTriggerDirective, AbstractDbxAnchorDirective, AbstractDbxButtonDirective, AbstractDbxFilterMapInstanceDirective, AbstractDbxInjectedDirective, AbstractFilterSourceConnectorDirective, AbstractFilterSourceDirective, AbstractLockSetSubscriptionDirective, AbstractSubscriptionDirective, AbstractTransitionDirective, AbstractTransitionWatcherDirective, ActionContextStore, ActionContextStoreSource, ActionContextStoreSourceMap, AnchorType, DBX_INJECTED_COMPONENT_DATA, DEFAULT_ACTION_DISABLED_KEY, DEFAULT_ACTION_MAP_WORKING_DISABLED_KEY, DEFAULT_STORAGE_ACCESSOR_FACTORY_TOKEN, DEFAULT_STORAGE_OBJECT_TOKEN, DateDistancePipe, DateFormatDistancePipe, DateFromToTimePipe, DbxActionAutoModifyDirective, DbxActionAutoTriggerDirective, DbxActionButtonDirective, DbxActionButtonTriggerDirective, DbxActionContextBaseSource, DbxActionContextLoggerDirective, DbxActionContextMachine, DbxActionContextMapDirective, DbxActionContextMapDirectiveSourceInstance, DbxActionContextStoreSourceInstance, DbxActionDirective, DbxActionDisabledDirective, DbxActionEnforceModifiedDirective, DbxActionFromMapDirective, DbxActionHandlerDirective, DbxActionMapSourceDirective, DbxActionMapWorkingDisableDirective, DbxActionSourceDirective, DbxActionState, DbxActionSuccessComponent, DbxActionSuccessDirective, DbxActionValueDirective, DbxActionValueOnTriggerInstance, DbxActionValueTriggerDirective, DbxActionWorkingComponent, DbxAnchor, DbxAngularRouterService, DbxButton, DbxButtonDirective, DbxButtonSegueDirective, DbxCoreActionModule, DbxCoreAngularRouterSegueModule, DbxCoreButtonModule, DbxCoreFilterModule, DbxCoreUIRouterSegueModule, DbxDatePipeModule, DbxFilterMapDirective, DbxFilterMapSourceConnectorDirective, DbxFilterMapSourceDirective, DbxFilterSourceConnectorDirective, DbxFilterSourceDirective, DbxInjectedComponent, DbxInjectedComponentInstance, DbxInjectedComponentModule, DbxLoadingButtonDirective, DbxRouterService, DbxRouterTransitionEventType, DbxRouterTransitionService, DbxStorageModule, DbxUIRouterService, FullLocalStorageObject, InstantStorageAccessor, LimitedStorageAccessor, MemoryStorageObject, MinutesStringPipe, ProvideActionStoreSource, ProvideDbxAnchor, ProvideDbxButton, ProvideFilterSource, ProvideFilterSourceConnector, ProvideSecondaryActionStoreSource, SecondaryActionContextStoreSource, SimpleStorageAccessor, SimpleStorageAccessorFactory, StorageAccessor, StringStorageAccessor, StringifySimpleStorageAccessorConverter, TimeDistanceCountdownPipe, TimeDistancePipe, ToJsDatePipe, ToMinutesPipe, WorkHandlerContext, WorkHandlerContextSourceDelegate, WrapperSimpleStorageAccessorDelegate, actionContextHasNoErrorAndIsModifiedAndCanTrigger, actionContextIsModifiedAndCanTrigger, actionContextStoreSourceInstanceFactory, actionContextStoreSourcePipe, anchorTypeForAnchor, canReadyValue, canTriggerAction, canTriggerActionState, checkNgContentWrapperHasContent, dbxActionValueStreamDirective, defaultStorageObjectFactory, expandClickableAnchorLinkTree, expandClickableAnchorLinkTreeNode, expandClickableAnchorLinkTrees, filterTransitionEvent, filterTransitionSuccess, flattenExpandedClickableAnchorLinkTree, flattenExpandedClickableAnchorLinkTreeToLinks, handleWorkValueReadyFn, handleWorkValueReadyWithConfigFn, isActionContextDisabled, isActionContextEnabled, isDisabledActionContextState, isIdleActionState, isWorkingActionState, loadingStateForActionContextState, loadingStateTypeForActionContextState, loadingStateTypeForActionState, makeDbxActionContextSourceReference, mapRefStringObsToSegueRefObs, mergeDbxInjectedComponentConfigs, pipeActionStore, refStringToSegueRef, safeDetectChanges, successTransition, tapDetectChanges, useActionStore };
 //# sourceMappingURL=dereekb-dbx-core.mjs.map