@coolon/angular-ui-powerups 0.0.89 → 0.0.91

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

@@ -4,10 +4,10 @@ import { FormsModule } from '@angular/forms';
 import { MatInputModule, MatFormFieldModule, MatSelectModule, MatDialog, MatButtonModule, MatDialogModule, MatTabsModule as MatTabsModule$1, MatProgressSpinnerModule } from '@angular/material';
 import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { __extends, __decorate, __metadata, __assign, __awaiter, __generator, __spread } from 'tslib';
-import { assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, Binding, MutableValueModel, Trace, Guard as Guard$1, Command, StoreInValueModel, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { __extends, __decorate, __metadata, __awaiter, __generator, __assign, __spread } from 'tslib';
+import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableListModel, MutableValueModel, Binding, Trace, Guard as Guard$1, Command, StoreInValueModel, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import { Router, RouterModule, UrlSegment, NavigationStart, NavigationEnd, NavigationError, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSerializer } from '@angular/router';
+import { Router, RouterModule, NavigationStart, NavigationEnd, NavigationError, UrlSerializer, UrlSegment, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import ___default, { last, isNil, isEqual } from 'lodash';
 import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
 import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
@@ -32,9 +32,28 @@ var CommandDirective = /** @class */ (function (_super) {
     function CommandDirective(elementRef) {
         var _this = _super.call(this) || this;
         _this.elementRef = elementRef;
+        _this._commandEnabled = new DelegatingValueModel().withDefault(false);
         _this._commandParameterProvided = false;
         return _this;
     }
+    Object.defineProperty(CommandDirective.prototype, "pectinCommand", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._command;
+        },
+        set: /**
+         * @param {?} command
+         * @return {?}
+         */
+        function (command) {
+            this._command = command;
+            this._commandEnabled.setDelegate(command ? command.enabled : null);
+        },
+        enumerable: true,
+        configurable: true
+    });
     Object.defineProperty(CommandDirective.prototype, "commandParameter", {
         get: /**
          * @return {?}
@@ -83,7 +102,7 @@ var CommandDirective = /** @class */ (function (_super) {
         // for some reason mat-buttons kills the disabled host binding.  It works on a regular button but for now
         // we need to do this.
         var chain = Dsl.disposeWith(this).chain;
-        chain(this.pectinCommand.enabled).subscribe((/**
+        chain(this._commandEnabled).subscribe((/**
          * @param {?} enabled
          * @return {?}
          */
@@ -152,8 +171,16 @@ var CommandDirective = /** @class */ (function (_super) {
     return CommandDirective;
 }(GarbageCollector));
 if (false) {
-    /** @type {?} */
-    CommandDirective.prototype.pectinCommand;
+    /**
+     * @type {?}
+     * @private
+     */
+    CommandDirective.prototype._command;
+    /**
+     * @type {?}
+     * @private
+     */
+    CommandDirective.prototype._commandEnabled;
     /**
      * @type {?}
      * @private
@@ -893,24 +920,107 @@ var  /**
 InteractionContext = /** @class */ (function (_super) {
     __extends(InteractionContext, _super);
     function InteractionContext() {
-        return _super.call(this) || this;
-    }
-    Object.defineProperty(InteractionContext.prototype, "currentActivity", {
+        var _this = _super.call(this) || this;
         /**
-         * Returns the activity that is currently active.
+         * Returns the current list of activities that are in progress.
          * This model is only updated in the next tick after the view has been updated.
          */
+        _this._activityListDelegate = new DelegatingListModel();
+        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;
+        when.listOf(_this.activityList).becomesPopulated((/**
+         * @param {?} activities
+         * @return {?}
+         */
+        function (activities) {
+            if (_this.deferredGetCurrentActivity) {
+                _this.deferredGetCurrentActivity.resolve(last(activities));
+                _this.deferredGetCurrentActivity = null;
+            }
+        }));
+        return _this;
+    }
+    /**
+     * @protected
+     * @param {?} activityList
+     * @return {?}
+     */
+    InteractionContext.prototype.setActivityList = /**
+     * @protected
+     * @param {?} activityList
+     * @return {?}
+     */
+    function (activityList) {
+        this._activityListDelegate.setDelegate(activityList);
+    };
+    Object.defineProperty(InteractionContext.prototype, "activityList", {
         get: /**
-         * Returns the activity that is currently active.
-         * This model is only updated in the next tick after the view has been updated.
          * @return {?}
          */
         function () {
-            return last(this.activityList.value);
+            return this._activityListDelegate.readonly;
         },
         enumerable: true,
         configurable: true
     });
+    /**
+     * Returns the activity that is currently active.
+     * This model is only updated in the next tick after the view has been updated.
+     */
+    /**
+     * Returns the activity that is currently active.
+     * This model is only updated in the next tick after the view has been updated.
+     * @return {?}
+     */
+    InteractionContext.prototype.getCurrentActivity = /**
+     * Returns the activity that is currently active.
+     * This model is only updated in the next tick after the view has been updated.
+     * @return {?}
+     */
+    function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (!this.isActive()) {
+                    return [2 /*return*/, Promise.reject('no activity in progress')];
+                }
+                else {
+                    if (this.deferredGetCurrentActivity) {
+                        // we're already waiting then just return the same promise
+                        return [2 /*return*/, this.deferredGetCurrentActivity.promise];
+                    }
+                    else {
+                        if (this.activityList.length < 1) {
+                            this.deferredGetCurrentActivity = Deferred.defer();
+                            return [2 /*return*/, this.deferredGetCurrentActivity.promise];
+                        }
+                        else {
+                            return [2 /*return*/, last(this.activityList.value)];
+                        }
+                    }
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * @param {?} confirm
+     * @return {?}
+     */
+    InteractionContext.prototype.confirm = /**
+     * @param {?} confirm
+     * @return {?}
+     */
+    function (confirm) {
+        // Important: we have to implement confirmOrReject as the main entry point
+        // as the canDeactivation guards need to be able to cancel an interaction
+        // without caring about returning a value.
+        return this.confirmOrReject(confirm).then((/**
+         * @return {?}
+         */
+        function () { return true; })).catch((/**
+         * @return {?}
+         */
+        function () { return false; }));
+    };
     return InteractionContext;
 }(GarbageCollector));
 if (false) {
@@ -918,8 +1028,14 @@ if (false) {
      * Returns the current list of activities that are in progress.
      * This model is only updated in the next tick after the view has been updated.
      * @type {?}
+     * @private
+     */
+    InteractionContext.prototype._activityListDelegate;
+    /**
+     * @type {?}
+     * @private
      */
-    InteractionContext.prototype.activityList;
+    InteractionContext.prototype.deferredGetCurrentActivity;
     /**
      * Returns true if an activity is currently running.
      * @abstract
@@ -939,7 +1055,7 @@ if (false) {
      * @param {?} confirm
      * @return {?}
      */
-    InteractionContext.prototype.confirm = function (confirm) { };
+    InteractionContext.prototype.confirmOrReject = function (confirm) { };
     /**
      * Presents the confirmation to the user and runs the activity only if the user confirms.
      * @abstract
@@ -1561,6 +1677,7 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
          * @return {?}
          */
         function () { return _this.onNestedActivityFinished(); }));
+        _this.setActivityList(_this._activityList.readonly);
         return _this;
     }
     Object.defineProperty(ActivityContainerComponent.prototype, "initialActivityOutletContext", {
@@ -1616,16 +1733,6 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
     function () {
         return !!this._initialActivityOutletContext;
     };
-    Object.defineProperty(ActivityContainerComponent.prototype, "activityList", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return this._activityList.readonly;
-        },
-        enumerable: true,
-        configurable: true
-    });
     Object.defineProperty(ActivityContainerComponent.prototype, "isFinished", {
         get: /**
          * @return {?}
@@ -1727,7 +1834,7 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
      * @param {?} confirm
      * @return {?}
      */
-    ActivityContainerComponent.prototype.confirm = /**
+    ActivityContainerComponent.prototype.confirmOrReject = /**
      * @param {?} confirm
      * @return {?}
      */
@@ -1943,21 +2050,12 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
     /**
      * @return {?}
      */
-    InplaceInteractionContextComponent.prototype.ngOnInit = /**
+    InplaceInteractionContextComponent.prototype.ngAfterViewInit = /**
      * @return {?}
      */
     function () {
+        this.setActivityList(this.interactionContext.activityList);
     };
-    Object.defineProperty(InplaceInteractionContextComponent.prototype, "activityList", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return this.interactionContext.activityList;
-        },
-        enumerable: true,
-        configurable: true
-    });
     /**
      * @return {?}
      */
@@ -1983,7 +2081,7 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
      * @param {?} confirm
      * @return {?}
      */
-    InplaceInteractionContextComponent.prototype.confirm = /**
+    InplaceInteractionContextComponent.prototype.confirmOrReject = /**
      * @param {?} confirm
      * @return {?}
      */
@@ -2177,11 +2275,9 @@ var DialogInteractionService = /** @class */ (function (_super) {
         _this.router = router;
         _this.dialogServiceDefaults = dialogServiceDefaults;
         _this.matDialogDefaultConfig = matDialogDefaultConfig;
-        _this._activityList = new DelegatingListModel();
         _this.startingGuard = new Guard();
+        _this._inActivityPromise = new MutableValueModel(false);
         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;
     }
     /**
@@ -2191,23 +2287,14 @@ var DialogInteractionService = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        return this.active.value;
+        return this._inActivityPromise.value;
     };
-    /**
-     * @return {?}
-     */
-    DialogInteractionService.prototype.cancelActivity = /**
-     * @return {?}
-     */
-    function () {
-        this.currentActivity.cancel(null);
-    };
-    Object.defineProperty(DialogInteractionService.prototype, "activityList", {
+    Object.defineProperty(DialogInteractionService.prototype, "active", {
         get: /**
          * @return {?}
          */
         function () {
-            return this._activityList.readonly;
+            return this._inActivityPromise.readonly;
         },
         enumerable: true,
         configurable: true
@@ -2258,6 +2345,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
          */
         function () {
             console.log('######  STARTING');
+            _this._inActivityPromise.value = true;
             // this.currentActivityId = uuid.v1();
             // this.location.go(this.router.routerState.snapshot.url, "aup");
             /** @type {?} */
@@ -2316,6 +2404,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
              * @return {?}
              */
             function () {
+                _this._inActivityPromise.value = false;
                 console.log('######  FINISHED');
                 // this.currentActivityId = null;
                 self.safelyUpdateActivityListDelegate(null);
@@ -2341,7 +2430,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
         setTimeout((/**
          * @return {?}
          */
-        function () { return _this._activityList.setDelegate(delegate); }));
+        function () { return _this.setActivityList(delegate); }));
     };
     /**
      * @param {?} alert
@@ -2359,7 +2448,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
      * @param {?} confirm
      * @return {?}
      */
-    DialogInteractionService.prototype.confirm = /**
+    DialogInteractionService.prototype.confirmOrReject = /**
      * @param {?} confirm
      * @return {?}
      */
@@ -2408,14 +2497,12 @@ if (false) {
      * @type {?}
      * @private
      */
-    DialogInteractionService.prototype._activityList;
+    DialogInteractionService.prototype.startingGuard;
     /**
      * @type {?}
      * @private
      */
-    DialogInteractionService.prototype.startingGuard;
-    /** @type {?} */
-    DialogInteractionService.prototype.active;
+    DialogInteractionService.prototype._inActivityPromise;
     /**
      * @type {?}
      * @private
@@ -2912,49 +2999,25 @@ var PlaceDefinition = /** @class */ (function () {
         return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
     };
     /**
-     * Returns angular router commands that specify the route id and any route parameters.  The result does
-     * not include any path information.
-     */
-    // getFormattedRouterCommands(visit: Visit): any[] {
-    //   return this.hasRouteId() ?
-    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
-    //     [this.getFormattedRouteParameters(visit)];
-    // }
-    /**
-     * Returns angular router commands that specify the route id and any route parameters.  The result does
-     * not include any path information.
      * @param {?} visit
      * @return {?}
      */
-    // getFormattedRouterCommands(visit: Visit): any[] {
-    //   return this.hasRouteId() ?
-    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
-    //     [this.getFormattedRouteParameters(visit)];
-    // }
     PlaceDefinition.prototype.getFormattedRouteId = /**
-     * Returns angular router commands that specify the route id and any route parameters.  The result does
-     * not include any path information.
      * @param {?} visit
      * @return {?}
      */
-    // getFormattedRouterCommands(visit: Visit): any[] {
-    //   return this.hasRouteId() ?
-    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
-    //     [this.getFormattedRouteParameters(visit)];
-    // }
     function (visit) {
-        return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;
+        // Note: RouteIds are always present in the url and are just empty strings when not defined.  This is
+        // mandated by the fact that redirects from <path> to <path>/:id always include the id parameter as
+        // an empty string.
+        return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : "";
     };
-    // @Trace()
-    // @Trace()
     /**
      * @param {?} visit
      * @param {?=} includeRouteId
      * @return {?}
      */
-    PlaceDefinition.prototype.getFormattedRouteParameters = 
-    // @Trace()
-    /**
+    PlaceDefinition.prototype.getFormattedRouteParameters = /**
      * @param {?} visit
      * @param {?=} includeRouteId
      * @return {?}
@@ -3050,15 +3113,17 @@ var PlaceDefinition = /** @class */ (function () {
                 }
                 else {
                     /** @type {?} */
-                    var value = def.urlFormat.parse(params.get(def.name));
-                    // because our id routes redirect if the id isn't pressent we always have a id
-                    // parameter in our params.  This will bugger our remember and defaultvalue sanitisation
-                    // as it'll see that the id is present (event thought its null).  The sanitisation can't
-                    // check for null as that's a valid value for the id.
-                    /** @type {?} */
-                    var isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
-                    if (!isEmptyRouteId) {
-                        result[def.name] = value;
+                    var value = params.get(def.name);
+                    if (def.isRouteId) { // TODO: Move this to parameter def so it's a strategy pattern
+                        // because our id routes redirect if the id isn't present we always have a id
+                        // parameter in our params.  This will bugger our remember and defaultvalue sanitisation
+                        // as it'll see that the id is present (event thought its a blank string).
+                        if (!___default.isEmpty(value)) {
+                            result[def.name] = def.urlFormat.parse(value);
+                        }
+                    }
+                    else {
+                        result[def.name] = def.urlFormat.parse(value);
                     }
                 }
             }
@@ -3212,15 +3277,6 @@ var PlaceComponent = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
-    /**
-     * @return {?}
-     */
-    PlaceComponent.prototype.canDeactivate = /**
-     * @return {?}
-     */
-    function () {
-        return true;
-    };
     /**
      * @return {?}
      */
@@ -3229,36 +3285,13 @@ var PlaceComponent = /** @class */ (function (_super) {
      */
     function () {
     };
-    /**
-     * Called by the place outlet after all animations have finished.  We need this instead of ngOnDestroy
-     * to avoid the fact that the angular router calls it before the animations have run causing the component
-     * to loose any pectin bindings.
-     */
-    // @Trace()
-    /**
-     * Called by the place outlet after all animations have finished.  We need this instead of ngOnDestroy
-     * to avoid the fact that the angular router calls it before the animations have run causing the component
-     * to loose any pectin bindings.
-     * @return {?}
-     */
-    // @Trace()
-    PlaceComponent.prototype.onPlaceDestroyed = /**
-     * Called by the place outlet after all animations have finished.  We need this instead of ngOnDestroy
-     * to avoid the fact that the angular router calls it before the animations have run causing the component
-     * to loose any pectin bindings.
-     * @return {?}
-     */
-    // @Trace()
-    function () {
-        this.dispose();
-    };
     __decorate([
         Memoize$1(),
         __metadata("design:type", PlaceDefinition),
         __metadata("design:paramtypes", [])
     ], PlaceComponent.prototype, "placeDefinition", null);
     return PlaceComponent;
-}(GarbageCollector));
+}(DisposableComponent));
 if (false) {
     /**
      * @type {?}
@@ -3428,8 +3461,10 @@ var Visit = /** @class */ (function () {
             else {
                 // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
                 // defaults and remember sanitisation process.
+                /** @type {?} */
+                var value = _this.getParameter(def.name);
                 if (_this.hasParameter(def.name)) {
-                    params[def.name] = _this.getParameter(def.name);
+                    params[def.name] = value;
                 }
             }
         }));
@@ -3463,17 +3498,6 @@ var Visit = /** @class */ (function () {
         var sameNonRouteParameters = isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
         return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
     };
-    /**
-     * @return {?}
-     */
-    Visit.prototype.getUrlSegments = /**
-     * @return {?}
-     */
-    function () {
-        return this.placeDefinition.hasRouteId() ?
-            [new UrlSegment(this.placeDefinition.path, {}), new UrlSegment(this.placeDefinition.getFormattedRouteId(this), this.placeDefinition.getFormattedRouteParameters(this))] :
-            [new UrlSegment(this.placeDefinition.path, this.placeDefinition.getFormattedRouteParameters(this))];
-    };
     return Visit;
 }());
 if (false) {
@@ -3512,10 +3536,13 @@ var  /**
  * @abstract
  */
 NavigationSession = /** @class */ (function () {
-    function NavigationSession(firstNavigation) {
+    function NavigationSession(firstNavigation, appModalInteractionContext) {
         this.firstNavigation = firstNavigation;
+        this.appModalInteractionContext = appModalInteractionContext;
         this._alreadyAccepted = [];
         this._visits = new Map();
+        this.componentDeactivationHandlers = new Map();
+        this.dialogOpenOnStart = this.appModalInteractionContext.isActive();
     }
     /**
      * @param {?} visit
@@ -3539,52 +3566,36 @@ NavigationSession = /** @class */ (function () {
     function (placeDef) {
         return this._visits.get(placeDef);
     };
-    /**
-     * @param {?} params
-     * @return {?}
-     */
-    NavigationSession.prototype.mergePrivatePlaceParameters = /**
-     * @param {?} params
-     * @return {?}
-     */
-    function (params) {
-        return null;
-    };
-    // @Trace()
-    // @Trace()
-    /**
-     * @param {?} placeComponent
-     * @return {?}
-     */
-    NavigationSession.prototype.alreadyAccepted = 
-    // @Trace()
-    /**
-     * @param {?} placeComponent
-     * @return {?}
-     */
-    function (placeComponent) {
-        return this._alreadyAccepted.includes(placeComponent);
-    };
-    // @Trace()
-    // @Trace()
     /**
      * @param {?} component
+     * @param {?} nextState
      * @return {?}
      */
-    NavigationSession.prototype.rememberAcceptanceOf = 
-    // @Trace()
-    /**
+    NavigationSession.prototype.canDeactivate = /**
      * @param {?} component
+     * @param {?} nextState
      * @return {?}
      */
-    function (component) {
-        this._alreadyAccepted.push(component);
+    function (component, nextState) {
+        return __awaiter(this, void 0, void 0, function () {
+            var handler, isPrimaryHandler;
+            return __generator(this, function (_a) {
+                // lookup the handler and create it if we've not seen it yet
+                handler = this.componentDeactivationHandlers.get(component);
+                if (!handler) {
+                    isPrimaryHandler = this.componentDeactivationHandlers.size === 0;
+                    handler = new NavigationSession.ComponentDeactivationHandler(component, this.appModalInteractionContext, isPrimaryHandler);
+                    this.componentDeactivationHandlers.set(component, handler);
+                }
+                return [2 /*return*/, handler.canDeactivate(nextState)];
+            });
+        });
     };
     /**
      * @param {?} url
      * @return {?}
      */
-    NavigationSession.prototype.setPopstateReturn = /**
+    NavigationSession.prototype.setPopstateReturnUrl = /**
      * @param {?} url
      * @return {?}
      */
@@ -3641,13 +3652,25 @@ if (false) {
     /** @type {?} */
     NavigationSession.prototype.isExternal;
     /** @type {?} */
+    NavigationSession.prototype.dialogOpenOnStart;
+    /**
+     * @type {?}
+     * @private
+     */
+    NavigationSession.prototype.componentDeactivationHandlers;
+    /** @type {?} */
     NavigationSession.prototype.firstNavigation;
+    /**
+     * @type {?}
+     * @private
+     */
+    NavigationSession.prototype.appModalInteractionContext;
 }
 (function (NavigationSession) {
     var External = /** @class */ (function (_super) {
         __extends(External, _super);
-        function External(isFirstTime) {
-            var _this = _super.call(this, isFirstTime) || this;
+        function External(isFirstTime, appModelInteractionContext) {
+            var _this = _super.call(this, isFirstTime, appModelInteractionContext) || this;
             _this.isExternal = true;
             return _this;
         }
@@ -3659,8 +3682,8 @@ if (false) {
     }
     var Internal = /** @class */ (function (_super) {
         __extends(Internal, _super);
-        function Internal(visit) {
-            var _this = _super.call(this, false) || this;
+        function Internal(visit, appModelInteractionContext) {
+            var _this = _super.call(this, false, appModelInteractionContext) || this;
             _this.isExternal = false;
             _this.storeVisit(visit);
             return _this;
@@ -3671,22 +3694,192 @@ if (false) {
         /** @type {?} */
         Internal.prototype.isExternal;
     }
-    /**
-     * @param {?} visit
-     * @return {?}
-     */
-    function createInternal(visit) {
-        return new Internal(visit);
+    var Factory = /** @class */ (function () {
+        function Factory(appModelInteractionContext) {
+            this.appModelInteractionContext = appModelInteractionContext;
+        }
+        /**
+         * @param {?} visit
+         * @return {?}
+         */
+        Factory.prototype.createInternal = /**
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            return new Internal(visit, this.appModelInteractionContext);
+        };
+        /**
+         * @param {?} firstTimeRoute
+         * @return {?}
+         */
+        Factory.prototype.createExternal = /**
+         * @param {?} firstTimeRoute
+         * @return {?}
+         */
+        function (firstTimeRoute) {
+            return new External(firstTimeRoute, this.appModelInteractionContext);
+        };
+        Factory.decorators = [
+            { type: Injectable, args: [{
+                        providedIn: 'root'
+                    },] },
+        ];
+        /** @nocollapse */
+        Factory.ctorParameters = function () { return [
+            { type: InteractionContext }
+        ]; };
+        return Factory;
+    }());
+    NavigationSession.Factory = Factory;
+    if (false) {
+        /** @type {?} */
+        Factory.prototype.appModelInteractionContext;
     }
-    NavigationSession.createInternal = createInternal;
-    /**
-     * @param {?} firstTimeRoute
-     * @return {?}
-     */
-    function createExternal(firstTimeRoute) {
-        return new External(firstTimeRoute);
+    var ComponentDeactivationHandler = /** @class */ (function () {
+        function ComponentDeactivationHandler(component, appModelInteractionContext, primary) {
+            this.component = component;
+            this.appModelInteractionContext = appModelInteractionContext;
+            this.primary = primary;
+            this.alreadyAccepted = false;
+            // super();
+        }
+        /**
+         * @param {?} nextState
+         * @return {?}
+         */
+        ComponentDeactivationHandler.prototype.canDeactivate = /**
+         * @param {?} nextState
+         * @return {?}
+         */
+        function (nextState) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            console.log(this.constructor.name + ".canDeactivate", { component: this.component });
+                            if (!this.alreadyAccepted) return [3 /*break*/, 1];
+                            // We'll get called multiple times if there's any parameter sanitisation so
+                            // we always return true if we accepted on a previous cycle of the current
+                            // navigation session.
+                            return [2 /*return*/, true];
+                        case 1:
+                            if (!(this.primary && this.appModelInteractionContext.isActive())) return [3 /*break*/, 3];
+                            // We check the global interaction first
+                            return [4 /*yield*/, this.cancelCurrentActivityOf(this.appModelInteractionContext)];
+                        case 2:
+                            // We check the global interaction first
+                            _b.sent();
+                            return [2 /*return*/, false];
+                        case 3:
+                            _a = this;
+                            return [4 /*yield*/, this.canDeactivateComponent(nextState)];
+                        case 4:
+                            _a.alreadyAccepted = _b.sent();
+                            return [2 /*return*/, this.alreadyAccepted];
+                    }
+                });
+            });
+        };
+        /**
+         * @protected
+         * @param {?} nextState
+         * @return {?}
+         */
+        ComponentDeactivationHandler.prototype.canDeactivateComponent = /**
+         * @protected
+         * @param {?} nextState
+         * @return {?}
+         */
+        function (nextState) {
+            return __awaiter(this, void 0, void 0, function () {
+                var hasCustomInteractionContext;
+                return __generator(this, function (_a) {
+                    // check if the component has an active interaction.  This will handle
+                    // an inplace interaction contexts
+                    hasCustomInteractionContext = this.component.interactionContext &&
+                        !this.isAppModalInteractionContext(this.component.interactionContext) &&
+                        this.component.interactionContext.isActive();
+                    if (hasCustomInteractionContext) {
+                        this.cancelCurrentActivityOf(this.component.interactionContext);
+                        return [2 /*return*/, false];
+                    }
+                    if (this.isLeavingCurrentPlace(nextState) && this.component.canDeactivate) {
+                        // No interaction in progress, so ask the component .
+                        // This may start an interaction, hence checking the interaction context before now. I.e. if the place pops up the dialog, and
+                        // the user clicks back again, we'll re-enter here and go bang when the component tries to open another dialog.
+                        return [2 /*return*/, this.component.canDeactivate()];
+                    }
+                    return [2 /*return*/, true];
+                });
+            });
+        };
+        /**
+         * @param {?} interactionContext
+         * @return {?}
+         */
+        ComponentDeactivationHandler.prototype.isAppModalInteractionContext = /**
+         * @param {?} interactionContext
+         * @return {?}
+         */
+        function (interactionContext) {
+            return this.appModelInteractionContext === interactionContext;
+        };
+        /**
+         * @protected
+         * @param {?} interactionContext
+         * @return {?}
+         */
+        ComponentDeactivationHandler.prototype.cancelCurrentActivityOf = /**
+         * @protected
+         * @param {?} interactionContext
+         * @return {?}
+         */
+        function (interactionContext) {
+            return __awaiter(this, void 0, void 0, function () {
+                var activity;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, interactionContext.getCurrentActivity()];
+                        case 1:
+                            activity = _a.sent();
+                            console.log('cancelling', { activity: activity });
+                            activity.cancel(null);
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        /**
+         * @protected
+         * @param {?} nextState
+         * @return {?}
+         */
+        ComponentDeactivationHandler.prototype.isLeavingCurrentPlace = /**
+         * @protected
+         * @param {?} nextState
+         * @return {?}
+         */
+        function (nextState) {
+            return !nextState.includesPathOf(this.component.placeDefinition);
+        };
+        return ComponentDeactivationHandler;
+    }());
+    NavigationSession.ComponentDeactivationHandler = ComponentDeactivationHandler;
+    if (false) {
+        /**
+         * @type {?}
+         * @private
+         */
+        ComponentDeactivationHandler.prototype.alreadyAccepted;
+        /** @type {?} */
+        ComponentDeactivationHandler.prototype.component;
+        /** @type {?} */
+        ComponentDeactivationHandler.prototype.appModelInteractionContext;
+        /** @type {?} */
+        ComponentDeactivationHandler.prototype.primary;
     }
-    NavigationSession.createExternal = createExternal;
 })(NavigationSession || (NavigationSession = {}));
 
 /**
@@ -3775,9 +3968,11 @@ if (false) {
  */
 var PlaceRouter = /** @class */ (function (_super) {
     __extends(PlaceRouter, _super);
-    function PlaceRouter(router, angularLocation, placeHistory) {
+    function PlaceRouter(router, urlSerializer, navigationSessionFactory, angularLocation, placeHistory) {
         var _this = _super.call(this) || this;
         _this.router = router;
+        _this.urlSerializer = urlSerializer;
+        _this.navigationSessionFactory = navigationSessionFactory;
         _this.angularLocation = angularLocation;
         _this.placeHistory = placeHistory;
         _this.firstRoute = true;
@@ -3807,8 +4002,11 @@ var PlaceRouter = /** @class */ (function (_super) {
             if (event instanceof NavigationStart) {
                 _this.onAngularRouterStarted(event);
             }
-            if (event instanceof NavigationEnd || event instanceof NavigationError) {
-                _this.onAngularRouterFinished();
+            if (event instanceof NavigationEnd) {
+                _this.onAngularRouterFinished(false);
+            }
+            if (event instanceof NavigationError) {
+                _this.onAngularRouterFinished(true);
             }
         }));
         _this.navigationSessionActive = chain(_this.navigationSessionModel).isNotNil();
@@ -3928,19 +4126,19 @@ var PlaceRouter = /** @class */ (function (_super) {
                          * @return {?}
                          */
                         function (router) {
-                            // we have to to use the definition for route id as our redirection always includes
-                            // the id in the url segements (but leaves it blank when there's no id). I.e. in the
-                            // no id case we're doing the following redirect [<placePath>, ""] -> ["..", <id>]
-                            /** @type {?} */
-                            var relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
                             /** @type {?} */
-                            var commands = __spread([
-                                relativePath
-                            ], _this.createRouteParameters(next), _this.extractChildPath(activatedRoute.snapshot));
-                            console.log('### Push Changes to route Redirect', { commands: commands, relativeTo: activatedRoute.snapshot.url });
-                            return router.navigate(commands, {
-                                relativeTo: activatedRoute
-                            });
+                            var commands = _this.parseUrl(_this.router.routerState.snapshot).createRedirectCommandsFor(next);
+                            // // we have to to use the definition for route id as our redirection always includes
+                            // // the id in the url segements (but leaves it blank when there's no id). I.e. in the
+                            // // no id case we're doing the following redirect [<placePath>, ""] -> ["..", <id>]
+                            // const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
+                            // const commands = [
+                            //   relativePath,
+                            //   ...this.createRouteParameters(next),
+                            //   ...this.extractChildPath(activatedRoute.snapshot)
+                            // ];
+                            console.log('### Push Changes to route Redirect', { commands: commands });
+                            return router.navigate(commands);
                         }))];
                 }
                 return [2 /*return*/];
@@ -3962,7 +4160,7 @@ var PlaceRouter = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this._navigationSessionModel.value = NavigationSession.createInternal(visit);
+                        this._navigationSessionModel.value = this.navigationSessionFactory.createInternal(visit);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, , 3, 4]);
@@ -3971,8 +4169,10 @@ var PlaceRouter = /** @class */ (function (_super) {
                         _a.sent();
                         return [3 /*break*/, 4];
                     case 3:
+                        // Router has finished (since there was no router change required) so we
+                        // need to end the navigation session.
                         if (this.navigationSession && !this.router.getCurrentNavigation()) {
-                            this.onAngularRouterFinished();
+                            this.onAngularRouterFinished(false);
                         }
                         return [7 /*endfinally*/];
                     case 4: return [2 /*return*/];
@@ -4015,9 +4215,9 @@ var PlaceRouter = /** @class */ (function (_super) {
         if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)
             console.log('navigation started', { firstTime: this.firstRoute });
             /** @type {?} */
-            var session = NavigationSession.createExternal(this.firstRoute);
+            var session = this.navigationSessionFactory.createExternal(this.firstRoute);
             if (event.navigationTrigger === 'popstate') {
-                session.setPopstateReturn(this.router.routerState.snapshot.url);
+                session.setPopstateReturnUrl(this.router.routerState.snapshot.url);
             }
             this._navigationSessionModel.value = session;
         }
@@ -4027,30 +4227,40 @@ var PlaceRouter = /** @class */ (function (_super) {
     // @Trace()
     /**
      * @private
+     * @param {?} cancelled
      * @return {?}
      */
     PlaceRouter.prototype.onAngularRouterFinished = 
     // @Trace()
     /**
      * @private
+     * @param {?} cancelled
      * @return {?}
      */
-    function () {
+    function (cancelled) {
         var _this = this;
         /** @type {?} */
         var session = this._navigationSessionModel.value;
-        // Update visits before we end the navigation session.  This allows the place out let to
-        // gate ignore changes that occur while the visit is active
-        /** @type {?} */
-        var visits = session.getVisits();
-        visits.forEach((/**
-         * @param {?} v
-         * @return {?}
-         */
-        function (v) {
-            _this.placeHistory.add(v);
-        }));
-        this._activeVisits.value = visits;
+        if (!cancelled) {
+            // Update visits before we end the navigation session.  This allows the placeOutets to
+            // ignore visit changes that occur while the navigation is in progress
+            /** @type {?} */
+            var visits = session.getVisits();
+            visits.forEach((/**
+             * @param {?} v
+             * @return {?}
+             */
+            function (v) { return _this.placeHistory.add(v); }));
+            this._activeVisits.value = visits;
+        }
+        else {
+            // Angular doesn't preserve the url when a guard cancels the back button.
+            // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+            if (session.isPopState) {
+                console.log('cancelled during popstate');
+                this.angularLocation.go(session.popStateReturnUrl);
+            }
+        }
         this._navigationSessionModel.value = null;
     };
     /**
@@ -4068,6 +4278,17 @@ var PlaceRouter = /** @class */ (function (_super) {
          */
         function (child) { return child.url; })));
     };
+    /**
+     * @param {?} snapshot
+     * @return {?}
+     */
+    PlaceRouter.prototype.parseUrl = /**
+     * @param {?} snapshot
+     * @return {?}
+     */
+    function (snapshot) {
+        return new PlaceRouter.UrlHelper(this.urlSerializer.parse(snapshot.url));
+    };
     PlaceRouter.decorators = [
         { type: Injectable, args: [{
                     providedIn: 'root'
@@ -4076,10 +4297,12 @@ var PlaceRouter = /** @class */ (function (_super) {
     /** @nocollapse */
     PlaceRouter.ctorParameters = function () { return [
         { type: Router },
+        { type: UrlSerializer },
+        { type: NavigationSession.Factory },
         { type: Location },
         { type: PlaceHistory }
     ]; };
-    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(Location), ɵɵinject(PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
+    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(UrlSerializer), ɵɵinject(NavigationSession.Factory), ɵɵinject(Location), ɵɵinject(PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
     __decorate([
         Trace(),
         __metadata("design:type", Function),
@@ -4113,11 +4336,145 @@ if (false) {
      * @private
      */
     PlaceRouter.prototype.router;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouter.prototype.urlSerializer;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouter.prototype.navigationSessionFactory;
     /** @type {?} */
     PlaceRouter.prototype.angularLocation;
     /** @type {?} */
     PlaceRouter.prototype.placeHistory;
 }
+(function (PlaceRouter) {
+    var UrlHelper = /** @class */ (function () {
+        function UrlHelper(urlTree) {
+            this.urlTree = urlTree;
+            console.log({ segments: this.urlTree.root.children.primary.segments });
+        }
+        /**
+         * @return {?}
+         */
+        UrlHelper.prototype.cloneUrlSegmentList = /**
+         * @return {?}
+         */
+        function () {
+            return __spread(this.urlTree.root.children.primary.segments);
+        };
+        /**
+         * @param {?} visit
+         * @return {?}
+         */
+        UrlHelper.prototype.updateVisitSegments = /**
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            // Ugly, but it works for now.
+            /** @type {?} */
+            var segments = this.cloneUrlSegmentList();
+            /** @type {?} */
+            var visitSegments = this.convertToUrlSegments(visit);
+            /** @type {?} */
+            var replaceAt = segments.findIndex((/**
+             * @param {?} segment
+             * @return {?}
+             */
+            function (segment) { return segment.path === visitSegments[0].path; }));
+            // do not use the return value, it's the items that were removed!
+            segments.splice.apply(segments, __spread([replaceAt, visitSegments.length], visitSegments));
+            return segments;
+        };
+        /**
+         * Converts the visit into segments.  Please not that these segments are not e
+         * @param visit
+         */
+        /**
+         * Converts the visit into segments.  Please not that these segments are not e
+         * @param {?} visit
+         * @return {?}
+         */
+        UrlHelper.prototype.convertToUrlSegments = /**
+         * Converts the visit into segments.  Please not that these segments are not e
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            return visit.placeDefinition.hasRouteId() ?
+                [
+                    // NOTE:
+                    // It's important to attach the params to the root path and not the id.  If we attach them
+                    // to an empty id then the angular router won't match the pattern.
+                    new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit)),
+                    new UrlSegment(visit.placeDefinition.getFormattedRouteId(visit), {})
+                ]
+                :
+                    [
+                        new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit))
+                    ];
+        };
+        /**
+         * @param {?} visit
+         * @return {?}
+         */
+        UrlHelper.prototype.createRedirectCommandsFor = /**
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            /** @type {?} */
+            var segments = this.updateVisitSegments(visit);
+            /** @type {?} */
+            var commands = [];
+            segments.forEach((/**
+             * @param {?} s
+             * @return {?}
+             */
+            function (s) {
+                commands.push(s.path);
+                if (s.parameterMap.keys.length > 0) {
+                    commands.push(s.parameters);
+                }
+            }));
+            return commands;
+        };
+        /**
+         * @param {?} placeDef
+         * @return {?}
+         */
+        UrlHelper.prototype.includesPathOf = /**
+         * @param {?} placeDef
+         * @return {?}
+         */
+        function (placeDef) {
+            return this.cloneUrlSegmentList().find((/**
+             * @param {?} s
+             * @return {?}
+             */
+            function (s) { return s.path === placeDef.path; }));
+        };
+        __decorate([
+            Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [Visit]),
+            __metadata("design:returntype", Array)
+        ], UrlHelper.prototype, "createRedirectCommandsFor", null);
+        return UrlHelper;
+    }());
+    PlaceRouter.UrlHelper = UrlHelper;
+    if (false) {
+        /**
+         * @type {?}
+         * @private
+         */
+        UrlHelper.prototype.urlTree;
+    }
+})(PlaceRouter || (PlaceRouter = {}));
 
 /**
  * @fileoverview added by tsickle
@@ -5868,7 +6225,7 @@ var EnterPlaceGuard = /** @class */ (function () {
      */
     function (activatedRoute, state) {
         return __awaiter(this, void 0, void 0, function () {
-            var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, routerStateUrlTree, commands;
+            var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, commands;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5885,9 +6242,8 @@ var EnterPlaceGuard = /** @class */ (function () {
                         // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
                         this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
                         if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
-                            routerStateUrlTree = this.urlSerializer.parse(state.url);
                             // Regenerate the url
-                            commands = this.createRedirectCommands(sanitisedVisit, __spread(routerStateUrlTree.root.children.primary.segments)).commands;
+                            commands = this.placeRouter.parseUrl(state).createRedirectCommandsFor(sanitisedVisit);
                             console.log('##### Place Guard Redirect', commands);
                             return [2 /*return*/, this.router.createUrlTree(commands, {
                                     replaceUrl: true,
@@ -5904,46 +6260,6 @@ var EnterPlaceGuard = /** @class */ (function () {
             });
         });
     };
-    /**
-     * @private
-     * @param {?} sanitisedVisit
-     * @param {?} path
-     * @return {?}
-     */
-    EnterPlaceGuard.prototype.createRedirectCommands = /**
-     * @private
-     * @param {?} sanitisedVisit
-     * @param {?} path
-     * @return {?}
-     */
-    function (sanitisedVisit, path) {
-        // Ugly, but it works for now.
-        /** @type {?} */
-        var newSegments = sanitisedVisit.getUrlSegments();
-        /** @type {?} */
-        var replaceAt = path.findIndex((/**
-         * @param {?} segment
-         * @return {?}
-         */
-        function (segment) { return segment.path === newSegments[0].path; }));
-        /** @type {?} */
-        var newPath = __spread(path);
-        newPath.splice.apply(newPath, __spread([replaceAt, newSegments.length], newSegments)); // do not use the return value, it's the items that were removed!
-        // do not use the return value, it's the items that were removed!
-        /** @type {?} */
-        var commands = [];
-        newPath.forEach((/**
-         * @param {?} s
-         * @return {?}
-         */
-        function (s) {
-            commands.push(s.path);
-            if (s.parameterMap.keys.length > 0) {
-                commands.push(s.parameters);
-            }
-        }));
-        return { newPath: newPath, commands: commands };
-    };
     EnterPlaceGuard.decorators = [
         { type: Injectable, args: [{
                     providedIn: 'root'
@@ -6149,90 +6465,9 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 var LeavePlaceGuard = /** @class */ (function () {
-    function LeavePlaceGuard(router, injector, placeRouter, dialogInteractionContext, angularLocation) {
-        this.router = router;
-        this.injector = injector;
+    function LeavePlaceGuard(placeRouter) {
         this.placeRouter = placeRouter;
-        this.dialogInteractionContext = dialogInteractionContext;
-        this.angularLocation = angularLocation;
     }
-    // @Trace()
-    // @Trace()
-    /**
-     * @private
-     * @param {?} nextState
-     * @param {?} placeDefinition
-     * @return {?}
-     */
-    LeavePlaceGuard.prototype.isLeavingTheCurrentPlace = 
-    // @Trace()
-    /**
-     * @private
-     * @param {?} nextState
-     * @param {?} placeDefinition
-     * @return {?}
-     */
-    function (nextState, placeDefinition) {
-        // TODO: this will break with child routes... need to examine the router states properly.
-        // console.log('canDeactivate', {
-        //   staticPath: placeDefinitionPath,
-        //   currentStateUrl: currentState.url,
-        //   nextStateUrl: nextState.url
-        //   // alreadyDeclined: this._alreadyAccepted
-        // });
-        // Example of the above when navigating to a different child route.
-        // canDeactivate {staticPath: "/hero-details",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details",
-        //    nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats"
-        // }
-        // TODO: this will break with child routes... need to examine the router states properly.
-        // console.log('canDeactivate', {
-        //   staticPath: placeDefinitionPath,
-        //   currentStateUrl: currentState.url,
-        //   nextStateUrl: nextState.url
-        //   // alreadyDeclined: this._alreadyAccepted
-        // });
-        // Example of the above when navigating to a different child route.
-        // canDeactivate {staticPath: "/hero-details",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details",
-        //    nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats"
-        // }
-        // Example clicking on router tab of the parent component (de-activates the parent due to route param changes)
-        // canDeactivate {
-        //    staticPath: "/hero-stats",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
-        //    nextStateUrl: "/route-parameters/"
-        // }
-        // canDeactivate {
-        //    staticPath: "/route-parameters",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
-        //    nextStateUrl: "/route-parameters/"
-        // }
-        // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: undefined, dl: Array(0), …}
-        // parameter-snapshot.ts:20 {name: "idModel", mine: -1, theirs: null}
-        // place-router.ts:28 redirect path (3) ["route-parameters", "-1", {…}]
-        // canDeactivate {
-        //    staticPath: "/hero-stats",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
-        //    nextStateUrl: "/route-parameters/-1"
-        // }
-        // canDeactivate {
-        //    staticPath: "/route-parameters",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
-        //    nextStateUrl: "/route-parameters/-1"
-        // }
-        // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: "A", dl: Array(3), …}
-        // parameter-snapshot.ts:20 {name: "dv", mine: "A", theirs: undefined}
-        // place-router.ts:28 redirect path (3) ["route-parameters", "-1", {…}]
-        // canDeactivate {
-        //    staticPath: "/hero-stats",
-        //    currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
-        //    nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c"
-        // }
-        /** @type {?} */
-        var placeDefinitionPath = "/" + placeDefinition.path;
-        return !nextState.url.startsWith(placeDefinitionPath);
-    };
     /**
      * @param {?} component
      * @param {?} currentRoute
@@ -6249,72 +6484,8 @@ var LeavePlaceGuard = /** @class */ (function () {
      */
     function (component, currentRoute, currentState, nextState) {
         return __awaiter(this, void 0, void 0, function () {
-            var self_1, canLeave;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.placeRouter.navigationSession.alreadyAccepted(component)) return [3 /*break*/, 1];
-                        // We'll get called multiple times if there's any parameter sanitisation so
-                        // we always return true if we accepted on a previous cycle of the current
-                        // navigation session.
-                        return [2 /*return*/, true];
-                    case 1:
-                        self_1 = this;
-                        canLeave = true;
-                        if (!this.isLeavingTheCurrentPlace(nextState, component.placeDefinition)) return [3 /*break*/, 4];
-                        // 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 (this.dialogInteractionContext.isActive()) {
-                            console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
-                            this.dialogInteractionContext.currentActivity.cancel(null);
-                            canLeave = false;
-                        }
-                        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()];
-                    case 2:
-                        // TODO: Add tests: hit back -> confirm leave dialog -> hit back -> close dialog ->  hit back -> confirm leave dialog.
-                        canLeave = _a.sent();
-                        _a.label = 3;
-                    case 3: return [3 /*break*/, 5];
-                    case 4:
-                        if (this.dialogInteractionContext.isActive()) {
-                            console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
-                            this.dialogInteractionContext.currentActivity.cancel(null);
-                            canLeave = false;
-                        }
-                        else {
-                            canLeave = true;
-                        }
-                        _a.label = 5;
-                    case 5:
-                        if (canLeave) {
-                            // We'll get called multiple times if there's any parameter sanitisation so
-                            // we remember the acceptance for the duration of the current navigation session.
-                            self_1.placeRouter.navigationSession.rememberAcceptanceOf(component);
-                        }
-                        else {
-                            // Angular doesn't preserve the url when a guard cancels the back button.
-                            // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-                            if (this.placeRouter.navigationSession.isPopState) {
-                                console.log('cancelled during popstate');
-                                this.angularLocation.go(this.placeRouter.navigationSession.popStateReturnUrl);
-                            }
-                        }
-                        return [2 /*return*/, canLeave];
-                }
+                return [2 /*return*/, this.placeRouter.navigationSession.canDeactivate(component, this.placeRouter.parseUrl(nextState))];
             });
         });
     };
@@ -6325,35 +6496,17 @@ var LeavePlaceGuard = /** @class */ (function () {
     ];
     /** @nocollapse */
     LeavePlaceGuard.ctorParameters = function () { return [
-        { type: Router },
-        { type: Injector },
-        { type: PlaceRouter },
-        { type: InteractionContext },
-        { type: Location }
+        { type: PlaceRouter }
     ]; };
-    /** @nocollapse */ LeavePlaceGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function LeavePlaceGuard_Factory() { return new LeavePlaceGuard(ɵɵinject(Router), ɵɵinject(INJECTOR), ɵɵinject(PlaceRouter), ɵɵinject(InteractionContext), ɵɵinject(Location)); }, token: LeavePlaceGuard, providedIn: "root" });
+    /** @nocollapse */ LeavePlaceGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function LeavePlaceGuard_Factory() { return new LeavePlaceGuard(ɵɵinject(PlaceRouter)); }, token: LeavePlaceGuard, providedIn: "root" });
     return LeavePlaceGuard;
 }());
 if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    LeavePlaceGuard.prototype.router;
-    /**
-     * @type {?}
-     * @private
-     */
-    LeavePlaceGuard.prototype.injector;
     /**
      * @type {?}
      * @private
      */
     LeavePlaceGuard.prototype.placeRouter;
-    /** @type {?} */
-    LeavePlaceGuard.prototype.dialogInteractionContext;
-    /** @type {?} */
-    LeavePlaceGuard.prototype.angularLocation;
 }
 
 /**
@@ -6376,5 +6529,5 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 
-export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionService, Dimension, DirectivesModule, DisposableComponent, EmptyStateComponent, EnterPlaceGuard, FocusBindingDirective, Formatter, InplaceInteractionContextComponent, InteractionContext, InteractionGuard, InteractionModule, InteractionOutletComponent, LEFT_RIGHT_PLACE_ANIMATION, LeavePlaceGuard, ListPlaceNavComponent, NavigationSession, NoopComponent, NumberInputComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, Visit, VisitParameter, VisitParameterList, VisitSanitiser, leftRightPlaceAnimation, slideDownAndUpAnimation, DirectivesModule as ɵa, CommandDirective as ɵb, InteractionContext as ɵba, ActivityOutletComponent as ɵbb, ConfirmationDialogComponent as ɵbc, AbstractActivity as ɵbd, ACTIVITY_DATA as ɵbe, Activity as ɵbf, ConfirmThenDialogComponent as ɵbh, AlertDialogComponent as ɵbi, InteractionOutletComponent as ɵbk, InplaceInteractionContextComponent as ɵbl, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbm, DialogInteractionService as ɵbn, FocusBindingDirective as ɵc, DisposableComponent as ɵd, ComponentsModule as ɵe, NumberInputComponent as ɵf, AbstractInputComponent as ɵg, StringInputComponent as ɵh, PasswordInputComponent as ɵi, SelectInputComponent as ɵj, NoopComponent as ɵk, PlaceModule as ɵl, EmptyStateComponent as ɵm, BusyOverlayComponent as ɵn, PlaceOutletComponent as ɵo, leftRightPlaceAnimation as ɵp, LEFT_RIGHT_PLACE_ANIMATION as ɵq, AUP_PLACE_CONFIG as ɵr, PlaceRouter as ɵt, PlaceHistory as ɵu, TabbedPlaceNavigationComponent as ɵv, AbstractPlaceNavigationComponent as ɵw, ListPlaceNavComponent as ɵx, InteractionModule as ɵy, ActivityContainerComponent as ɵz };
+export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionService, Dimension, DirectivesModule, DisposableComponent, EmptyStateComponent, EnterPlaceGuard, FocusBindingDirective, Formatter, InplaceInteractionContextComponent, InteractionContext, InteractionGuard, InteractionModule, InteractionOutletComponent, LEFT_RIGHT_PLACE_ANIMATION, LeavePlaceGuard, ListPlaceNavComponent, NavigationSession, NoopComponent, NumberInputComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, Visit, VisitParameter, VisitParameterList, VisitSanitiser, leftRightPlaceAnimation, slideDownAndUpAnimation, DirectivesModule as ɵa, CommandDirective as ɵb, InteractionModule as ɵba, ActivityContainerComponent as ɵbb, ActivityOutletComponent as ɵbc, ConfirmationDialogComponent as ɵbd, AbstractActivity as ɵbe, ACTIVITY_DATA as ɵbf, Activity as ɵbg, ConfirmThenDialogComponent as ɵbi, AlertDialogComponent as ɵbj, InteractionOutletComponent as ɵbl, InplaceInteractionContextComponent as ɵbm, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbn, DialogInteractionService as ɵbo, FocusBindingDirective as ɵc, DisposableComponent as ɵd, ComponentsModule as ɵe, NumberInputComponent as ɵf, AbstractInputComponent as ɵg, StringInputComponent as ɵh, PasswordInputComponent as ɵi, SelectInputComponent as ɵj, NoopComponent as ɵk, PlaceModule as ɵl, EmptyStateComponent as ɵm, BusyOverlayComponent as ɵn, PlaceOutletComponent as ɵo, leftRightPlaceAnimation as ɵp, LEFT_RIGHT_PLACE_ANIMATION as ɵq, AUP_PLACE_CONFIG as ɵr, PlaceRouter as ɵt, NavigationSession as ɵu, InteractionContext as ɵv, PlaceHistory as ɵw, TabbedPlaceNavigationComponent as ɵx, AbstractPlaceNavigationComponent as ɵy, ListPlaceNavComponent as ɵz };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map