@coolon/angular-ui-powerups 0.0.85 → 0.0.87

package/fesm5/coolon-angular-ui-powerups.js

@@ -2180,6 +2180,8 @@ var DialogInteractionService = /** @class */ (function (_super) {
         _this._activityList = new DelegatingListModel();
         _this.startingGuard = new Guard();
         assert$1.notNil(dialogService);
+        var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
+        _this.active = chain(_this._activityList).isNotEmpty();
         return _this;
     }
     /**
@@ -2189,7 +2191,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        return this._activityList.length > 0;
+        return this.active.value;
     };
     /**
      * @return {?}
@@ -2412,11 +2414,8 @@ if (false) {
      * @private
      */
     DialogInteractionService.prototype.startingGuard;
-    /**
-     * @type {?}
-     * @private
-     */
-    DialogInteractionService.prototype.currentActivityId;
+    /** @type {?} */
+    DialogInteractionService.prototype.active;
     /**
      * @type {?}
      * @private
@@ -6258,10 +6257,19 @@ var LeavePlaceGuard = /** @class */ (function () {
                         self_1 = this;
                         canLeave = true;
                         if (!this.isLeavingTheCurrentPlace(nextState, component.placeDefinition)) return [3 /*break*/, 4];
-                        // we check the interaction first, so that components that don't need to check if they're in an
+                        // we check the dialog interaction first, so that components that don't need to check if they're in an
                         // interaction during the canDeactivate cycle.
                         // TODO: Add tests: show dialog -> hit back -> same route
-                        if (component.interactionContext && component.interactionContext.isActive()) {
+                        if (this.interactionContext.isActive()) {
+                            console.log('cancelling', { activity: this.interactionContext.currentActivity });
+                            this.interactionContext.currentActivity.cancel(null);
+                            canLeave = false;
+                        }
+                        else {
+                            canLeave = true;
+                        }
+                        // now check if the component has an active interaction context
+                        if (canLeave && component.interactionContext && component.interactionContext.isActive()) {
                             canLeave = false;
                             console.log('cancelling', { activity: component.interactionContext.currentActivity });
                             component.interactionContext.currentActivity.cancel(null);