@coolon/angular-ui-powerups 0.0.62 → 0.0.63

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

@@ -807,20 +807,6 @@ InteractionContext = /** @class */ (function (_super) {
     function InteractionContext() {
         return _super.call(this) || this;
     }
-    /**
-     * Returns true if an activity is currently running.
-     */
-    /**
-     * Returns true if an activity is currently running.
-     * @return {?}
-     */
-    InteractionContext.prototype.isActive = /**
-     * Returns true if an activity is currently running.
-     * @return {?}
-     */
-    function () {
-        return this.activityList.length > 0;
-    };
     return InteractionContext;
 }(GarbageCollector));
 if (false) {
@@ -836,6 +822,12 @@ if (false) {
      * @type {?}
      */
     InteractionContext.prototype.activityList;
+    /**
+     * Returns true if an activity is currently running.
+     * @abstract
+     * @return {?}
+     */
+    InteractionContext.prototype.isActive = function () { };
     /**
      * @abstract
      * @template D, R, E
@@ -1725,29 +1717,16 @@ var DialogInteractionService = /** @class */ (function (_super) {
         var _a = Dsl.disposeWith(_this), chain = _a.chain, observe = _a.observe;
         _this.currentActivity = chain(_this.activityList).last();
         return _this;
-        // observe.valuesFrom(this.router.events)
-        //   .tap((event:RouterEvent) => {
-        //     const nav = router.getCurrentNavigation();
-        //     console.log({
-        //       previousUrl: nav.previousNavigation && nav.previousNavigation.finalUrl,
-        //       initialUrl: nav.initialUrl,
-        //       finalUrl: nav.finalUrl,
-        //     });
-        //
-        //   })
-        //   .filter(event => event instanceof NavigationStart)
-        //   .subscribe((event: NavigationStart) => {
-        //     console.log(event.navigationTrigger);
-        //     if (event.navigationTrigger === 'popstate' && this.isActive()) {
-        //       const prev = router.getCurrentNavigation().previousNavigation.finalUrl;
-        //       // this.router.navigateByUrl(prev.toString(), {
-        //       //   replaceUrl: true,
-        //       //   skipLocationChange: false
-        //       // });
-        //       // this.cancelActivity();
-        //     }
-        //   });
     }
+    /**
+     * @return {?}
+     */
+    DialogInteractionService.prototype.isActive = /**
+     * @return {?}
+     */
+    function () {
+        return this._active;
+    };
     /**
      * @return {?}
      */
@@ -4621,11 +4600,11 @@ var LeavePlaceGuard = /** @class */ (function () {
             // NavigationStart -> .... -> NavigationEnd === navigated (so ask next time)
             // NavigationStart -> .... -> NavigationError === canceled (guard cancelled so ask next time)
             if (event instanceof NavigationEnd) {
-                console.log("navigation ended");
+                console.log('navigation ended');
                 self._alreadyAccepted = [];
             }
             if (event instanceof NavigationError) {
-                console.log("navigation errored");
+                console.log('navigation errored');
                 self._alreadyAccepted = [];
             }
         }));
@@ -4699,7 +4678,8 @@ var LeavePlaceGuard = /** @class */ (function () {
             if (!nextState.url.startsWith(placeDefinitionPath)) {
                 /** @type {?} */
                 var self_1 = this;
-                return Promise.resolve(component.canDeactivate()).then((/**
+                return Promise.resolve(component.canDeactivate())
+                    .then((/**
                  * @param {?} canLeave
                  * @return {?}
                  */
@@ -4708,11 +4688,26 @@ var LeavePlaceGuard = /** @class */ (function () {
                         // Angular doesn't preserve the url when a guard cancels the back button.
                         // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
                         _this.location.go(currentState.url);
+                        return false;
                     }
                     else {
+                        if (_this.interactionContext.isActive()) {
+                            _this.interactionContext.currentActivity.value.cancel(null);
+                            return false;
+                        }
+                        else {
+                            return true;
+                        }
+                    }
+                })).then((/**
+                 * @param {?} canDeactivate
+                 * @return {?}
+                 */
+                function (canDeactivate) {
+                    if (canDeactivate) {
                         self_1._alreadyAccepted.push(component);
                     }
-                    return canLeave;
+                    return canDeactivate;
                 }));
             }
             return true;