@coolon/angular-ui-powerups 0.0.83 → 0.0.84

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

@@ -4070,16 +4070,12 @@ var PlaceRouter = /** @class */ (function (_super) {
             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
             [def.getFormattedRouteParameters(visit)];
     };
-    // @Trace()
-    // @Trace()
     /**
      * @private
      * @param {?} event
      * @return {?}
      */
-    PlaceRouter.prototype.onAngularRouterStarted = 
-    // @Trace()
-    /**
+    PlaceRouter.prototype.onAngularRouterStarted = /**
      * @private
      * @param {?} event
      * @return {?}
@@ -4096,15 +4092,11 @@ var PlaceRouter = /** @class */ (function (_super) {
         }
         this.firstRoute = false;
     };
-    // @Trace()
-    // @Trace()
     /**
      * @private
      * @return {?}
      */
-    PlaceRouter.prototype.onAngularRouterFinished = 
-    // @Trace()
-    /**
+    PlaceRouter.prototype.onAngularRouterFinished = /**
      * @private
      * @return {?}
      */
@@ -4159,6 +4151,18 @@ var PlaceRouter = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Visit, Object]),
         __metadata("design:returntype", Promise)
     ], PlaceRouter.prototype, "navigate", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [NavigationStart]),
+        __metadata("design:returntype", void 0)
+    ], PlaceRouter.prototype, "onAngularRouterStarted", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], PlaceRouter.prototype, "onAngularRouterFinished", null);
     return PlaceRouter;
 }(GarbageCollector));
 if (false) {
@@ -4280,13 +4284,16 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         _this.placeChanged = new EventEmitter();
         _this._activePlace = new MutableValueModel();
         _this._activePlaceVisitModel = new DelegatingValueModel();
-        _this._inOutletUpdate = new Guard$1();
+        _this._inOutletActivation = new Guard$1();
+        _this._inOutletDeactivation = new Guard$1();
+        _this._inRouteVisitUpdate = new Guard$1();
         _this._activatedRouteModel = new MutableValueModel();
         _this._placeDefinition = new MutableValueModel();
         _this.isOnInitialPlace = true;
         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.parentOutletModel = new MutableValueModel(parentOutlet);
         _this._activePlaceVisitModel.setDelegate(new MutableValueModel());
+        _this._inOutletUpdate = valueOf.any(_this._inOutletDeactivation, _this._inOutletActivation).areTruthy();
         /** @type {?} */
         var defaultPlaceAnimationOrder = chain(_this.parentOutletModel)
             .pullValueModel((/**
@@ -4317,25 +4324,15 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
                 _this.animate ? Math.max(order, 0) : 0;
         }));
         // Push incoming changes into the component
-        /** @type {?} */
-        var routeVisit = chain(_this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);
-        /** @type {?} */
-        var inRouteVisitUpdate = new Guard$1();
-        when.valueOf(routeVisit).changes((/**
-         * @param {?} visit
+        _this.routerVisit = chain(_this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);
+        // Our router visit will change when our active is nullified during deactivation, which will push a null visit
+        // the the deactivated component, which will nuke it's view before the animations have finished.
+        // The visit will alway updated after the router session is finsised (when the new visits are registered) so
+        // we can safely ignore it during outlet changes as these always happen before the router session ends.
+        when.valueOf(_this.routerVisit).changes((/**
          * @return {?}
          */
-        function (visit) {
-            console.log("### Route visit changed");
-            if (visit) { // can be null while the place and index sync up
-                inRouteVisitUpdate.whileTrue((/**
-                 * @return {?}
-                 */
-                function () {
-                    _this._activePlaceVisitModel.value = visit;
-                }));
-            }
-        }));
+        function () { return _this.pushRouteChangesToVisit(); }), { unless: _this._inOutletUpdate });
         // Handle component based changes
         when.valueOf(_this._activePlaceVisitModel).changes((/**
          * @param {?} next
@@ -4345,7 +4342,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         function (next, previous) {
             _this.pushVisitChangesToRoute(next, previous);
         }), {
-            unless: valueOf.any(_this._inOutletUpdate, inRouteVisitUpdate).areTruthy()
+            unless: _this.placeRouter.navigationSessionActive
         });
         chain(_this._activePlace)
             .postponeWhile(placeRouter.navigationSessionActive)
@@ -4400,6 +4397,31 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    /**
+     * @return {?}
+     */
+    PlaceOutletComponent.prototype.pushRouteChangesToVisit = /**
+     * @return {?}
+     */
+    function () {
+        var _this = this;
+        /** @type {?} */
+        var visit = this.routerVisit.value;
+        console.log({
+            visit: visit,
+            place: visit ? visit.placeDefinition.component : null,
+            inOutletActivation: this._inOutletActivation.value,
+            inRoutingSession: this.placeRouter.navigationSessionActive.value,
+        });
+        if (visit) { // can be null while the place and index sync up
+            this._inRouteVisitUpdate.whileTrue((/**
+             * @return {?}
+             */
+            function () {
+                _this._activePlaceVisitModel.value = visit;
+            }));
+        }
+    };
     /**
      * @param {?} next
      * @param {?} previous
@@ -4447,7 +4469,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      */
     function (routerOutlet, place) {
         var _this = this;
-        this._inOutletUpdate.whileTrue((/**
+        this._inOutletActivation.whileTrue((/**
          * @return {?}
          */
         function () {
@@ -4477,15 +4499,15 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      */
     function () {
         var _this = this;
-        this._inOutletUpdate.whileTrue((/**
+        this._inOutletDeactivation.whileTrue((/**
          * @return {?}
          */
         function () {
-            _this._activePlaceVisitModel.setDelegate(null);
             _this.isOnInitialPlace = false;
             _this._activePlace.value = null;
             _this._activatedRouteModel.value = null;
             _this._placeDefinition.value = null;
+            _this._activePlaceVisitModel.setDelegate(null);
         }));
     };
     /**
@@ -4544,6 +4566,12 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Visit]),
         __metadata("design:returntype", void 0)
     ], PlaceOutletComponent.prototype, "navigate", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], PlaceOutletComponent.prototype, "pushRouteChangesToVisit", null);
     __decorate([
         Trace(),
         __metadata("design:type", Function),
@@ -4591,11 +4619,26 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype._activePlaceVisitModel;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceOutletComponent.prototype._inOutletActivation;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceOutletComponent.prototype._inOutletDeactivation;
     /**
      * @type {?}
      * @private
      */
     PlaceOutletComponent.prototype._inOutletUpdate;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceOutletComponent.prototype._inRouteVisitUpdate;
     /**
      * @type {?}
      * @private
@@ -4618,6 +4661,11 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype.isOnInitialPlace;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceOutletComponent.prototype.routerVisit;
     /**
      * @type {?}
      * @private
@@ -4834,7 +4882,6 @@ var TabbedPlaceNavigationComponent = /** @class */ (function (_super) {
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-var ɵ0 = { animationDuration: "2000ms" };
 var PlaceModule = /** @class */ (function () {
     function PlaceModule() {
     }
@@ -4867,7 +4914,7 @@ var PlaceModule = /** @class */ (function () {
                         ListPlaceNavComponent
                     ],
                     providers: [
-                        { provide: AUP_PLACE_CONFIG, useValue: ɵ0 }
+                    // {provide: AUP_PLACE_CONFIG, useValue: {animationDuration: "2000ms"}}
                     ]
                 },] }
     ];