@coolon/angular-ui-powerups 0.0.86 → 0.0.88

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
@@ -4070,12 +4069,16 @@ var PlaceRouter = /** @class */ (function (_super) {
             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
             [def.getFormattedRouteParameters(visit)];
     };
+    // @Trace()
+    // @Trace()
     /**
      * @private
      * @param {?} event
      * @return {?}
      */
-    PlaceRouter.prototype.onAngularRouterStarted = /**
+    PlaceRouter.prototype.onAngularRouterStarted = 
+    // @Trace()
+    /**
      * @private
      * @param {?} event
      * @return {?}
@@ -4092,11 +4095,15 @@ var PlaceRouter = /** @class */ (function (_super) {
         }
         this.firstRoute = false;
     };
+    // @Trace()
+    // @Trace()
     /**
      * @private
      * @return {?}
      */
-    PlaceRouter.prototype.onAngularRouterFinished = /**
+    PlaceRouter.prototype.onAngularRouterFinished = 
+    // @Trace()
+    /**
      * @private
      * @return {?}
      */
@@ -4151,18 +4158,6 @@ var PlaceRouter = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Visit, Object]),
         __metadata("design:returntype", Promise)
     ], PlaceRouter.prototype, "navigate", null);
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationStart]),
-        __metadata("design:returntype", void 0)
-    ], PlaceRouter.prototype, "onAngularRouterStarted", null);
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], PlaceRouter.prototype, "onAngularRouterFinished", null);
     return PlaceRouter;
 }(GarbageCollector));
 if (false) {
@@ -4432,12 +4427,12 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         var _this = this;
         /** @type {?} */
         var visit = this.routerVisit.value;
-        console.log({
-            visit: visit,
-            place: visit ? visit.placeDefinition.component : null,
-            inOutletActivation: this._inOutletActivation.value,
-            inRoutingSession: this.placeRouter.navigationSessionActive.value
-        });
+        // console.log({
+        //   visit,
+        //   place: visit ? visit.placeDefinition.component : null,
+        //   inOutletActivation: this._inOutletActivation.value,
+        //   inRoutingSession: this.placeRouter.navigationSessionActive.value
+        // });
         if (visit) { // can be null while the place and index sync up
             this._inRouteVisitUpdate.whileTrue((/**
              * @return {?}
@@ -4553,7 +4548,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        console.log({ activePlace: this._activePlace.value });
+        // console.log({ activePlace: this._activePlace.value });
     };
     // @Trace()
     // @Trace()
@@ -6145,11 +6140,11 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 var LeavePlaceGuard = /** @class */ (function () {
-    function LeavePlaceGuard(router, injector, placeRouter, interactionContext, angularLocation) {
+    function LeavePlaceGuard(router, injector, placeRouter, dialogInteractionContext, angularLocation) {
         this.router = router;
         this.injector = injector;
         this.placeRouter = placeRouter;
-        this.interactionContext = interactionContext;
+        this.dialogInteractionContext = dialogInteractionContext;
         this.angularLocation = angularLocation;
     }
     // @Trace()
@@ -6258,13 +6253,25 @@ 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.dialogInteractionContext.isActive()) {
+                            console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
+                            this.dialogInteractionContext.currentActivity.cancel(null);
                             canLeave = false;
-                            console.log('cancelling', { activity: component.interactionContext.currentActivity });
-                            component.interactionContext.currentActivity.cancel(null);
+                        }
+                        else {
+                            canLeave = true;
+                        }
+                        if (canLeave) {
+                            // now check if the component has an active interaction.  This will handle
+                            // an inplace interaction contexts
+                            if (component.interactionContext && component.interactionContext.isActive()) {
+                                canLeave = false;
+                                console.log('cancelling', { activity: component.interactionContext.currentActivity });
+                                component.interactionContext.currentActivity.cancel(null);
+                            }
                         }
                         if (!canLeave) return [3 /*break*/, 3];
                         return [4 /*yield*/, component.canDeactivate()];
@@ -6274,9 +6281,9 @@ var LeavePlaceGuard = /** @class */ (function () {
                         _a.label = 3;
                     case 3: return [3 /*break*/, 5];
                     case 4:
-                        if (this.interactionContext.isActive()) {
-                            console.log('cancelling', { activity: this.interactionContext.currentActivity });
-                            this.interactionContext.currentActivity.cancel(null);
+                        if (this.dialogInteractionContext.isActive()) {
+                            console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
+                            this.dialogInteractionContext.currentActivity.cancel(null);
                             canLeave = false;
                         }
                         else {
@@ -6335,7 +6342,7 @@ if (false) {
      */
     LeavePlaceGuard.prototype.placeRouter;
     /** @type {?} */
-    LeavePlaceGuard.prototype.interactionContext;
+    LeavePlaceGuard.prototype.dialogInteractionContext;
     /** @type {?} */
     LeavePlaceGuard.prototype.angularLocation;
 }