@coolon/angular-ui-powerups 0.0.83 → 0.0.84

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -4254,16 +4254,12 @@
                 [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 {?}
@@ -4280,15 +4276,11 @@
             }
             this.firstRoute = false;
         };
-        // @Trace()
-        // @Trace()
         /**
          * @private
          * @return {?}
          */
-        PlaceRouter.prototype.onAngularRouterFinished = 
-        // @Trace()
-        /**
+        PlaceRouter.prototype.onAngularRouterFinished = /**
          * @private
          * @return {?}
          */
@@ -4343,6 +4335,18 @@
             __metadata("design:paramtypes", [Visit, Object]),
             __metadata("design:returntype", Promise)
         ], PlaceRouter.prototype, "navigate", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [router.NavigationStart]),
+            __metadata("design:returntype", void 0)
+        ], PlaceRouter.prototype, "onAngularRouterStarted", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", void 0)
+        ], PlaceRouter.prototype, "onAngularRouterFinished", null);
         return PlaceRouter;
     }(pectin.GarbageCollector));
     if (false) {
@@ -4464,13 +4468,16 @@
             _this.placeChanged = new core.EventEmitter();
             _this._activePlace = new pectin.MutableValueModel();
             _this._activePlaceVisitModel = new pectin.DelegatingValueModel();
-            _this._inOutletUpdate = new pectin.Guard();
+            _this._inOutletActivation = new pectin.Guard();
+            _this._inOutletDeactivation = new pectin.Guard();
+            _this._inRouteVisitUpdate = new pectin.Guard();
             _this._activatedRouteModel = new pectin.MutableValueModel();
             _this._placeDefinition = new pectin.MutableValueModel();
             _this.isOnInitialPlace = true;
             var _a = pectin.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 pectin.MutableValueModel(parentOutlet);
             _this._activePlaceVisitModel.setDelegate(new pectin.MutableValueModel());
+            _this._inOutletUpdate = valueOf.any(_this._inOutletDeactivation, _this._inOutletActivation).areTruthy();
             /** @type {?} */
             var defaultPlaceAnimationOrder = chain(_this.parentOutletModel)
                 .pullValueModel((/**
@@ -4501,25 +4508,15 @@
                     _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 pectin.Guard();
-            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
@@ -4529,7 +4526,7 @@
             function (next, previous) {
                 _this.pushVisitChangesToRoute(next, previous);
             }), {
-                unless: valueOf.any(_this._inOutletUpdate, inRouteVisitUpdate).areTruthy()
+                unless: _this.placeRouter.navigationSessionActive
             });
             chain(_this._activePlace)
                 .postponeWhile(placeRouter.navigationSessionActive)
@@ -4584,6 +4581,31 @@
             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
@@ -4631,7 +4653,7 @@
          */
         function (routerOutlet, place) {
             var _this = this;
-            this._inOutletUpdate.whileTrue((/**
+            this._inOutletActivation.whileTrue((/**
              * @return {?}
              */
             function () {
@@ -4661,15 +4683,15 @@
          */
         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);
             }));
         };
         /**
@@ -4728,6 +4750,12 @@
             __metadata("design:paramtypes", [Visit]),
             __metadata("design:returntype", void 0)
         ], PlaceOutletComponent.prototype, "navigate", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", void 0)
+        ], PlaceOutletComponent.prototype, "pushRouteChangesToVisit", null);
         __decorate([
             pectin.Trace(),
             __metadata("design:type", Function),
@@ -4775,11 +4803,26 @@
          * @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
@@ -4802,6 +4845,11 @@
          * @private
          */
         PlaceOutletComponent.prototype.isOnInitialPlace;
+        /**
+         * @type {?}
+         * @private
+         */
+        PlaceOutletComponent.prototype.routerVisit;
         /**
          * @type {?}
          * @private
@@ -5018,7 +5066,6 @@
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
-    var ɵ0 = { animationDuration: "2000ms" };
     var PlaceModule = /** @class */ (function () {
         function PlaceModule() {
         }
@@ -5051,7 +5098,7 @@
                             ListPlaceNavComponent
                         ],
                         providers: [
-                            { provide: AUP_PLACE_CONFIG, useValue: ɵ0 }
+                        // {provide: AUP_PLACE_CONFIG, useValue: {animationDuration: "2000ms"}}
                         ]
                     },] }
         ];