@coolon/angular-ui-powerups 0.0.97 → 0.0.98

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

@@ -7,7 +7,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __extends, __decorate, __metadata, __awaiter, __generator, __assign, __spread } from 'tslib';
 import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, EventListenerList, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Trace, Guard as Guard$1, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import { RouterModule, NavigationStart, NavigationCancel, NavigationEnd, UrlSegment, NavigationError, Router, UrlSerializer, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { RouterModule, NavigationStart, NavigationCancel, NavigationError, NavigationEnd, UrlSegment, Router, UrlSerializer, 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, MatDialog as MatDialog$1, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
@@ -2001,7 +2001,7 @@ var ActivityContainerComponent = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        this._initialActivityOutletContext = null;
+        this._initialActivityOutletContext.value = null;
         this.initialActivityOutletContextEvent.emit(null);
     };
     // @Trace()
@@ -2178,8 +2178,7 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
     __extends(InplaceInteractionContextComponent, _super);
     function InplaceInteractionContextComponent() {
         var _this = _super.call(this) || this;
-        _this._active = new DelegatingValueModel().withDefault(false);
-        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 = new MutableValueModel(false);
         return _this;
     }
     /**
@@ -2190,7 +2189,6 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
      */
     function () {
         this.setActivityList(this.interactionContext.activityList);
-        this._active.setDelegate(this.interactionContext.active);
     };
     Object.defineProperty(InplaceInteractionContextComponent.prototype, "active", {
         get: /**
@@ -2218,6 +2216,7 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
      */
     function (activityType, data) {
         var _this = this;
+        this._active.value = true;
         /** @type {?} */
         var self = this;
         return new Promise((/**
@@ -2234,6 +2233,7 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
                  * @return {?}
                  */
                 function (result) {
+                    self._active.value = false;
                     resolve(result);
                 },
                 onCancel: /**
@@ -2241,6 +2241,7 @@ var InplaceInteractionContextComponent = /** @class */ (function (_super) {
                  * @return {?}
                  */
                 function (error) {
+                    self._active.value = false;
                     reject(error);
                 }
             };
@@ -3831,67 +3832,33 @@ var PlaceComponentDeactivationHandler = /** @class */ (function () {
      * @return {?}
      */
     function (nextState) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                // Automatically cancel any active activities if the navigation session was triggered
-                // by the back button.
-                if (this.navigationSession.isPopState && this.component.interactionContext && this.component.interactionContext.isActive()) {
-                    // Note: any modal interactions run in a different router outlet so we should never get place deactivated while
-                    // one is active. This is because:
-                    // 1. the user can't click anything to navigate away
-                    // 2. clicking the back button will only change the outlet route and will leave the component route alone. This
-                    //    is all handled by the InteractionGuard and so the component guards will never run.
-                    // TODO: how will I handle this now??
-                    // BUT: activities could call navigate while they're still active.. but we'll barf and tell them
-                    //      to call activity.done(newVisitToNavigateTo) and let the caller do the navigate after the
-                    //      dialog has closed.
-                    // Can I capture this in placeRouter.navigate(..) ? i.e. navigationSession && navigationSession.interactionContext.isActive()
-                    // Or can I just ignore it altogether?
-                    // 1. I no longer have a singleton dialog interaction that can be returned from any component in the deactivation cycle.
-                    // 2. We only ever check the component once per nav cycle
-                    // 3. The navigation session interaction context will barf if multiple components try and use it at once.
-                    // if (this.component.interactionContext instanceof DialogInteractionContext) {
-                    //   // BUT: activities could call navigate while they're still active.. but we'll barf and tell them
-                    //   //      to call activity.done(newVisitToNavigateTo) and let the caller do the navigate after the
-                    //   //      dialog has closed.
-                    //   lang.illegalState('Navigation started from an activity in a modal dialog. Have your activity return a Visit instead and navigate after the activity has finished');
-                    // }
-                    // Now we just cancel the current activity and stay where we are
-                    this.cancelCurrentActivityOf(this.component.interactionContext);
-                    return [2 /*return*/, false];
-                }
-                // Ok, so now we're really leaving, so we ask the component if we should.;
-                if (this.isNotJustAChangeInRouteId(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(this.navigationSession.interactionContext)];
-                }
-                return [2 /*return*/, true];
-            });
-        });
-    };
-    /**
-     * @protected
-     * @param {?} interactionContext
-     * @return {?}
-     */
-    PlaceComponentDeactivationHandler.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 0:
+                        if (!(this.navigationSession.isPopState && this.component.interactionContext && this.component.interactionContext.isActive())) return [3 /*break*/, 2];
+                        // Note: Modal interactions are run in a different router outlet so we never get place deactivating while
+                        // a model interaction is active. This is because:
+                        // 1. the user can't click anything to navigate away
+                        // 2. clicking the back button will only change the outlet route portion of the URL. This
+                        //    is all handled by the InteractionGuard and so the component guards will never run.
+                        //
+                        // Now we just cancel the current activity...
+                        return [4 /*yield*/, this.component.interactionContext.getCurrentActivity()];
                     case 1:
                         activity = _a.sent();
-                        console.log('cancelling', { activity: activity });
                         activity.cancel(null);
-                        return [2 /*return*/];
+                        return [2 /*return*/, false]; // ..and stay where we are.
+                    case 2:
+                        // Ok, so now we're really leaving, so we ask the component if we should.;
+                        if (this.isNotJustAChangeInRouteId(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(this.navigationSession.interactionContext)];
+                        }
+                        return [2 /*return*/, true];
                 }
             });
         });
@@ -3933,15 +3900,15 @@ if (false) {
 /**
  * @abstract
  */
-var NavigationSession = /** @class */ (function (_super) {
-    __extends(NavigationSession, _super);
-    function NavigationSession(context) {
+var NavigationState = /** @class */ (function (_super) {
+    __extends(NavigationState, _super);
+    function NavigationState(context) {
         var _this = _super.call(this) || this;
         _this.context = context;
         _this._visits = new Map();
         return _this;
     }
-    Object.defineProperty(NavigationSession.prototype, "interactionContext", {
+    Object.defineProperty(NavigationState.prototype, "interactionContext", {
         get: /**
          * @return {?}
          */
@@ -3955,7 +3922,7 @@ var NavigationSession = /** @class */ (function (_super) {
      * @param {?} visit
      * @return {?}
      */
-    NavigationSession.prototype.storeVisit = /**
+    NavigationState.prototype.storeVisit = /**
      * @param {?} visit
      * @return {?}
      */
@@ -3966,7 +3933,7 @@ var NavigationSession = /** @class */ (function (_super) {
      * @param {?} placeDef
      * @return {?}
      */
-    NavigationSession.prototype.getVisitFor = /**
+    NavigationState.prototype.getVisitFor = /**
      * @param {?} placeDef
      * @return {?}
      */
@@ -3977,7 +3944,7 @@ var NavigationSession = /** @class */ (function (_super) {
      * @param {?} newUrl
      * @return {?}
      */
-    NavigationSession.prototype.onBackClickedDuringNavigationInteraction = /**
+    NavigationState.prototype.onBackClickedDuringNavigationInteraction = /**
      * @param {?} newUrl
      * @return {?}
      */
@@ -3987,7 +3954,7 @@ var NavigationSession = /** @class */ (function (_super) {
     /**
      * @return {?}
      */
-    NavigationSession.prototype.getVisits = /**
+    NavigationState.prototype.getVisits = /**
      * @return {?}
      */
     function () {
@@ -3999,7 +3966,7 @@ var NavigationSession = /** @class */ (function (_super) {
      * @param {?} message
      * @return {?}
      */
-    NavigationSession.prototype.illegalTransition = /**
+    NavigationState.prototype.illegalTransition = /**
      * @protected
      * @template R
      * @param {?} message
@@ -4012,7 +3979,7 @@ var NavigationSession = /** @class */ (function (_super) {
      * @protected
      * @return {?}
      */
-    NavigationSession.prototype.currentRouterUrl = /**
+    NavigationState.prototype.currentRouterUrl = /**
      * @protected
      * @return {?}
      */
@@ -4024,21 +3991,21 @@ var NavigationSession = /** @class */ (function (_super) {
      * @param {?} event
      * @return {?}
      */
-    NavigationSession.prototype.createActiveSession = /**
+    NavigationState.prototype.createActiveSession = /**
      * @protected
      * @param {?} event
      * @return {?}
      */
     function (event) {
         // TODO: check if the event is purely for interaction context changes.
-        return new NavigationSession.Active(this.context, event.navigationTrigger === 'popstate', this.currentRouterUrl());
+        return new NavigationState.Active(this.context, event.navigationTrigger === 'popstate', this.currentRouterUrl());
     };
     /**
      * @protected
      * @param {?} url
      * @return {?}
      */
-    NavigationSession.prototype.updateLocation = /**
+    NavigationState.prototype.updateLocation = /**
      * @protected
      * @param {?} url
      * @return {?}
@@ -4049,7 +4016,7 @@ var NavigationSession = /** @class */ (function (_super) {
     /**
      * @return {?}
      */
-    NavigationSession.prototype.toString = /**
+    NavigationState.prototype.toString = /**
      * @return {?}
      */
     function () {
@@ -4060,59 +4027,59 @@ var NavigationSession = /** @class */ (function (_super) {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
-    ], NavigationSession.prototype, "updateLocation", null);
-    return NavigationSession;
+    ], NavigationState.prototype, "updateLocation", null);
+    return NavigationState;
 }(GarbageCollector));
 if (false) {
     /**
      * @type {?}
      * @private
      */
-    NavigationSession.prototype._visits;
+    NavigationState.prototype._visits;
     /** @type {?} */
-    NavigationSession.prototype.isPopState;
+    NavigationState.prototype.isPopState;
     /** @type {?} */
-    NavigationSession.prototype.active;
+    NavigationState.prototype.active;
     /** @type {?} */
-    NavigationSession.prototype.startingUrl;
+    NavigationState.prototype.startingUrl;
     /**
      * @type {?}
      * @protected
      */
-    NavigationSession.prototype.context;
+    NavigationState.prototype.context;
     /**
      * @abstract
      * @param {?} event
      * @return {?}
      */
-    NavigationSession.prototype.onStart = function (event) { };
+    NavigationState.prototype.onStart = function (event) { };
     /**
      * @abstract
      * @param {?} event
      * @return {?}
      */
-    NavigationSession.prototype.onCancel = function (event) { };
+    NavigationState.prototype.onCancel = function (event) { };
     /**
      * @abstract
      * @param {?} event
      * @return {?}
      */
-    NavigationSession.prototype.onError = function (event) { };
+    NavigationState.prototype.onError = function (event) { };
     /**
      * @abstract
      * @param {?} event
      * @return {?}
      */
-    NavigationSession.prototype.onEnd = function (event) { };
+    NavigationState.prototype.onEnd = function (event) { };
     /**
      * @abstract
      * @param {?} component
      * @param {?} nextState
      * @return {?}
      */
-    NavigationSession.prototype.canDeactivatePlace = function (component, nextState) { };
+    NavigationState.prototype.canDeactivatePlace = function (component, nextState) { };
 }
-(function (NavigationSession) {
+(function (NavigationState) {
     var Context = /** @class */ (function () {
         function Context(router, modalInteractionService, angularLocation, notifySuccess) {
             this.router = router;
@@ -4122,7 +4089,7 @@ if (false) {
         }
         return Context;
     }());
-    NavigationSession.Context = Context;
+    NavigationState.Context = Context;
     if (false) {
         /** @type {?} */
         Context.prototype.router;
@@ -4212,8 +4179,8 @@ if (false) {
             return this.illegalTransition(event);
         };
         return Idle;
-    }(NavigationSession));
-    NavigationSession.Idle = Idle;
+    }(NavigationState));
+    NavigationState.Idle = Idle;
     if (false) {
         /** @type {?} */
         Idle.prototype.isPopState;
@@ -4289,8 +4256,13 @@ if (false) {
          * @return {?}
          */
         function (event) {
-            // active sessions can have many cancel start cycles.
-            return this;
+            if (this.isPopState) { // back button clicked and a guard cancelled
+                // Angular doesn't preserve the url when a guard cancels the back button.
+                // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+                Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
+                this.updateLocation(this.startingUrl);
+            }
+            return this.isPopState ? new Idle(this.context) : this;
         };
         /**
          * @param {?} event
@@ -4391,9 +4363,27 @@ if (false) {
         function () {
             return this.constructor.name + "(startingUrl: " + this.startingUrl + ", isPopState:" + this.isPopState + ")";
         };
+        __decorate([
+            Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [NavigationStart]),
+            __metadata("design:returntype", NavigationState)
+        ], Active.prototype, "onStart", null);
+        __decorate([
+            Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [NavigationCancel]),
+            __metadata("design:returntype", NavigationState)
+        ], Active.prototype, "onCancel", null);
+        __decorate([
+            Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [NavigationError]),
+            __metadata("design:returntype", NavigationState)
+        ], Active.prototype, "onError", null);
         return Active;
-    }(NavigationSession));
-    NavigationSession.Active = Active;
+    }(NavigationState));
+    NavigationState.Active = Active;
     if (false) {
         /** @type {?} */
         Active.prototype.active;
@@ -4514,23 +4504,23 @@ if (false) {
             Trace(),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [NavigationStart]),
-            __metadata("design:returntype", NavigationSession)
+            __metadata("design:returntype", NavigationState)
         ], ModalInteractionSession.prototype, "onStart", null);
         __decorate([
             Trace(),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [NavigationCancel]),
-            __metadata("design:returntype", NavigationSession)
+            __metadata("design:returntype", NavigationState)
         ], ModalInteractionSession.prototype, "onCancel", null);
         __decorate([
             Trace(),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [NavigationEnd]),
-            __metadata("design:returntype", NavigationSession)
+            __metadata("design:returntype", NavigationState)
         ], ModalInteractionSession.prototype, "onEnd", null);
         return ModalInteractionSession;
-    }(NavigationSession));
-    NavigationSession.ModalInteractionSession = ModalInteractionSession;
+    }(NavigationState));
+    NavigationState.ModalInteractionSession = ModalInteractionSession;
     if (false) {
         /** @type {?} */
         ModalInteractionSession.prototype.active;
@@ -4643,8 +4633,8 @@ if (false) {
             return this.constructor.name + "(startingUrl: " + this.startingUrl + ", locationChangeTriggerUrl:" + this.locationChangeTriggerUrl + ")";
         };
         return CancelledDuringNavigationInteraction;
-    }(NavigationSession));
-    NavigationSession.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
+    }(NavigationState));
+    NavigationState.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
     if (false) {
         /** @type {?} */
         CancelledDuringNavigationInteraction.prototype.active;
@@ -4660,7 +4650,7 @@ if (false) {
         /** @type {?} */
         CancelledDuringNavigationInteraction.prototype.locationChangeTriggerUrl;
     }
-})(NavigationSession || (NavigationSession = {}));
+})(NavigationState || (NavigationState = {}));
 
 /**
  * @fileoverview added by tsickle
@@ -4878,14 +4868,14 @@ var PlaceRouter = /** @class */ (function (_super) {
         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.activeVisitIndex = chain(_this._activeVisits).indexBy('placeDefinition');
         _this.navigationSessionActive = chain(_this.navigationSessionModel).pluck('active');
-        _this._navigationSessionContext = new NavigationSession.Context(_this.router, _this.modalInteractionService, _this.angularLocation, (/**
+        _this._navigationSessionContext = new NavigationState.Context(_this.router, _this.modalInteractionService, _this.angularLocation, (/**
          * @param {?} session
          * @return {?}
          */
         function (session) {
             _this.processNavigationSuccess(session);
         }));
-        _this._navigationSessionModel.value = new NavigationSession.Idle(_this._navigationSessionContext);
+        _this._navigationSessionModel.value = new NavigationState.Idle(_this._navigationSessionContext);
         // TODO: make setup the callbacks in during module initiation to make this testable.
         _this.router.events.subscribe((/**
          * @param {?} event
@@ -4936,7 +4926,7 @@ var PlaceRouter = /** @class */ (function (_super) {
          * @return {?}
          */
         function (url) {
-            console.log("#### url changed -> " + url);
+            console.log("#### url changed ->", { url: url, navIsActive: _this.navigationSessionActive.value });
             /** @type {?} */
             var interactionContext = _this.navigationSessionActive.value && _this.navigationSession.interactionContext;
             if (interactionContext && interactionContext.isActive()) {
@@ -4962,6 +4952,9 @@ var PlaceRouter = /** @class */ (function (_super) {
      */
     function (session) {
         var _this = this;
+        // We need to update the visits before the session finishes.  This allows the placeOutets to ignore visit
+        // changes that occur while routerNavigationActive is true.
+        assert.isTruthy(this.navigationSessionActive.value);
         /** @type {?} */
         var visits = session.getVisits();
         visits.forEach((/**
@@ -4969,8 +4962,6 @@ var PlaceRouter = /** @class */ (function (_super) {
          * @return {?}
          */
         function (v) { return _this.placeHistory.add(v); }));
-        // Update visits before we end the navigation session.  This allows the placeOutets to
-        // ignore visit changes that occur while the navigation is in progress
         this._activeVisits.value = visits;
     };
     Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
@@ -5113,7 +5104,7 @@ var PlaceRouter = /** @class */ (function (_super) {
                          */
                         function (current) {
                             /** @type {?} */
-                            var session = new NavigationSession.Active(_this._navigationSessionContext, false, _this.router.routerState.snapshot.url);
+                            var session = new NavigationState.Active(_this._navigationSessionContext, false, _this.router.routerState.snapshot.url);
                             session.storeVisit(visit);
                             return session;
                         }));
@@ -5178,144 +5169,11 @@ var PlaceRouter = /** @class */ (function (_super) {
             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
             [def.getFormattedRouteParameters(visit)];
     };
-    // private onAngularRouterStarted(event: NavigationStart) {
-    //   if (!this.navigationSession) {
-    //     // We been activated by an external route rather than placeRouter.go(visit)
-    //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-    //   }
-    //   this.firstRoute = false;
-    // }
-    //
-    // private createExternalNavigationSession(event: NavigationStart) {
-    //   return new NavigationSession.Active(
-    //     this.modalInteractionService,
-    //     this.angularLocation,
-    //     // event.url,
-    //     event.navigationTrigger === 'popstate'
-    //   );
-    // }
-    // private onAngularRouterFinished(cancelled: boolean) {
-    //   const session = this._navigationSessionModel.value;
-    //   if (session.backClickedDuringCanDeactivateInteraction) {
-    //     // we swallow this finished event but keep the session alive as we're going to
-    //     // get another route started event, which will trigger anohter canDeactivate dialog
-    //     // if we start a new session.
-    //     // session.resetInteractionSession()
-    //   } else {
-    //     if (!cancelled) {
-    //       const visits = session.getVisits();
-    //       visits.forEach(v => this.placeHistory.add(v));
-    //       // Update visits before we end the navigation session.  This allows the placeOutets to
-    //       // ignore visit changes that occur while the navigation is in progress
-    //       this._activeVisits.value = visits;
-    //     } else {
-    //       // TODO: move this to the navigation session
-    //       // Angular doesn't preserve the url when a guard cancels the back button.
-    //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-    //       if (session.isPopState) {
-    //         console.log('cancelled during popstate');
-    //         // this.angularLocation.go(session.previousUrl);
-    //       }
-    //     }
-    //     session.dispose();
-    //     this._navigationSessionModel.value = null;
-    //   }
-    // }
-    // private onAngularRouterStarted(event: NavigationStart) {
-    //   if (!this.navigationSession) {
-    //     // We been activated by an external route rather than placeRouter.go(visit)
-    //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-    //   }
-    //   this.firstRoute = false;
-    // }
-    //
-    // private createExternalNavigationSession(event: NavigationStart) {
-    //   return new NavigationSession.Active(
-    //     this.modalInteractionService,
-    //     this.angularLocation,
-    //     // event.url,
-    //     event.navigationTrigger === 'popstate'
-    //   );
-    // }
-    // private onAngularRouterFinished(cancelled: boolean) {
-    //   const session = this._navigationSessionModel.value;
-    //   if (session.backClickedDuringCanDeactivateInteraction) {
-    //     // we swallow this finished event but keep the session alive as we're going to
-    //     // get another route started event, which will trigger anohter canDeactivate dialog
-    //     // if we start a new session.
-    //     // session.resetInteractionSession()
-    //   } else {
-    //     if (!cancelled) {
-    //       const visits = session.getVisits();
-    //       visits.forEach(v => this.placeHistory.add(v));
-    //       // Update visits before we end the navigation session.  This allows the placeOutets to
-    //       // ignore visit changes that occur while the navigation is in progress
-    //       this._activeVisits.value = visits;
-    //     } else {
-    //       // TODO: move this to the navigation session
-    //       // Angular doesn't preserve the url when a guard cancels the back button.
-    //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-    //       if (session.isPopState) {
-    //         console.log('cancelled during popstate');
-    //         // this.angularLocation.go(session.previousUrl);
-    //       }
-    //     }
-    //     session.dispose();
-    //     this._navigationSessionModel.value = null;
-    //   }
-    // }
     /**
      * @param {?} activatedRoute
      * @return {?}
      */
-    PlaceRouter.prototype.extractChildPath = 
-    // private onAngularRouterStarted(event: NavigationStart) {
-    //   if (!this.navigationSession) {
-    //     // We been activated by an external route rather than placeRouter.go(visit)
-    //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-    //   }
-    //   this.firstRoute = false;
-    // }
-    //
-    // private createExternalNavigationSession(event: NavigationStart) {
-    //   return new NavigationSession.Active(
-    //     this.modalInteractionService,
-    //     this.angularLocation,
-    //     // event.url,
-    //     event.navigationTrigger === 'popstate'
-    //   );
-    // }
-    // private onAngularRouterFinished(cancelled: boolean) {
-    //   const session = this._navigationSessionModel.value;
-    //   if (session.backClickedDuringCanDeactivateInteraction) {
-    //     // we swallow this finished event but keep the session alive as we're going to
-    //     // get another route started event, which will trigger anohter canDeactivate dialog
-    //     // if we start a new session.
-    //     // session.resetInteractionSession()
-    //   } else {
-    //     if (!cancelled) {
-    //       const visits = session.getVisits();
-    //       visits.forEach(v => this.placeHistory.add(v));
-    //       // Update visits before we end the navigation session.  This allows the placeOutets to
-    //       // ignore visit changes that occur while the navigation is in progress
-    //       this._activeVisits.value = visits;
-    //     } else {
-    //       // TODO: move this to the navigation session
-    //       // Angular doesn't preserve the url when a guard cancels the back button.
-    //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-    //       if (session.isPopState) {
-    //         console.log('cancelled during popstate');
-    //         // this.angularLocation.go(session.previousUrl);
-    //       }
-    //     }
-    //     session.dispose();
-    //     this._navigationSessionModel.value = null;
-    //   }
-    // }
-    /**
+    PlaceRouter.prototype.extractChildPath = /**
      * @param {?} activatedRoute
      * @return {?}
      */
@@ -5443,7 +5301,7 @@ if (false) {
                         ,
                             _a)
                     }], {
-                    replaceUrl: false,
+                    replaceUrl: false
                 });
             }
         };
@@ -7654,5 +7512,5 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 
-export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractActivity, AbstractInputComponent, AbstractPlaceGuard, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionContext, DialogInteractionService, Dimension, DirectivesModule, DisposableComponent, EmptyStateComponent, FocusBindingDirective, Formatter, InplaceInteractionContextComponent, InteractionContext, InteractionContextBase, InteractionGuard, InteractionModule, InteractionOutletComponent, LEFT_RIGHT_PLACE_ANIMATION, ListPlaceNavComponent, ModalInteractionService, NavigationSession, NoopAuthGuard, NoopComponent, NumberInputComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, UrlSnapshot, Visit, VisitParameter, VisitParameterList, VisitSanitiser, leftRightPlaceAnimation, slideDownAndUpAnimation, DirectivesModule as ɵa, CommandDirective as ɵb, ActivityContainerComponent as ɵba, InteractionContextBase as ɵbb, InteractionContext as ɵbc, ActivityOutletComponent as ɵbd, ConfirmationDialogComponent as ɵbe, AbstractActivity as ɵbf, ACTIVITY_DATA as ɵbg, Activity as ɵbh, ConfirmThenDialogComponent as ɵbj, AlertDialogComponent as ɵbk, InteractionOutletComponent as ɵbm, InplaceInteractionContextComponent as ɵbn, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbo, DialogInteractionService as ɵbp, 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, ModalInteractionService as ɵv, TabbedPlaceNavigationComponent as ɵw, AbstractPlaceNavigationComponent as ɵx, ListPlaceNavComponent as ɵy, InteractionModule as ɵz };
+export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractActivity, AbstractInputComponent, AbstractPlaceGuard, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionContext, DialogInteractionService, Dimension, DirectivesModule, DisposableComponent, EmptyStateComponent, FocusBindingDirective, Formatter, InplaceInteractionContextComponent, InteractionContext, InteractionContextBase, InteractionGuard, InteractionModule, InteractionOutletComponent, LEFT_RIGHT_PLACE_ANIMATION, ListPlaceNavComponent, ModalInteractionService, NavigationState, NoopAuthGuard, NoopComponent, NumberInputComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, UrlSnapshot, Visit, VisitParameter, VisitParameterList, VisitSanitiser, leftRightPlaceAnimation, slideDownAndUpAnimation, DirectivesModule as ɵa, CommandDirective as ɵb, ActivityContainerComponent as ɵba, InteractionContextBase as ɵbb, InteractionContext as ɵbc, ActivityOutletComponent as ɵbd, ConfirmationDialogComponent as ɵbe, AbstractActivity as ɵbf, ACTIVITY_DATA as ɵbg, Activity as ɵbh, ConfirmThenDialogComponent as ɵbj, AlertDialogComponent as ɵbk, InteractionOutletComponent as ɵbm, InplaceInteractionContextComponent as ɵbn, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbo, DialogInteractionService as ɵbp, 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, ModalInteractionService as ɵv, TabbedPlaceNavigationComponent as ɵw, AbstractPlaceNavigationComponent as ɵx, ListPlaceNavComponent as ɵy, InteractionModule as ɵz };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map