@coolon/angular-ui-powerups 0.0.83 → 0.0.85

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;
+            _this.initialPlaceIndex = null;
             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((/**
@@ -4489,37 +4496,31 @@
             function (p) { return (/** @type {?} */ (p.constructor)); }));
             _this.placeAnimationOrder = chain(_this.customPlaceAnimationOrderModel)
                 .otherwise(defaultPlaceAnimationOrder)
-                .indexOf(activatePlaceType)
-                .map((/**
-             * @param {?} order
+                .reduce((/**
+             * @param {?} placesInOrder
              * @return {?}
              */
-            function (order) {
-                // we get -1 on the first load which triggers an animation to the first page, so alway pin it to 0
-                // if we're animating.
-                return _this.isOnInitialPlace ? 0 :
-                    _this.animate ? Math.max(order, 0) : 0;
-            }));
+            function (placesInOrder) {
+                /** @type {?} */
+                var placeIndex = 0;
+                if (activatePlaceType.value) {
+                    placeIndex = placesInOrder.indexOf(activatePlaceType.value);
+                    if (___default.isNil(_this.initialPlaceIndex)) {
+                        _this.initialPlaceIndex = placeIndex;
+                    }
+                }
+                return ___default.isNil(_this.initialPlaceIndex) ? 0 : placeIndex - _this.initialPlaceIndex;
+            }), { dependsOn: activatePlaceType });
             // 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 +4530,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)
@@ -4550,6 +4551,19 @@
          */
         function () {
         };
+        // @Trace()
+        // @Trace()
+        /**
+         * @return {?}
+         */
+        PlaceOutletComponent.prototype.getAnimationOrder = 
+        // @Trace()
+        /**
+         * @return {?}
+         */
+        function () {
+            return this.placeAnimationOrder.value;
+        };
         Object.defineProperty(PlaceOutletComponent.prototype, "animationDuration", {
             get: /**
              * @return {?}
@@ -4560,16 +4574,20 @@
             enumerable: true,
             configurable: true
         });
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} visit
          * @return {?}
          */
-        PlaceOutletComponent.prototype.navigate = /**
+        PlaceOutletComponent.prototype.navigate = 
+        // @Trace()
+        /**
          * @param {?} visit
          * @return {?}
          */
         function (visit) {
-            console.log({ activatedRoute: this._activatedRouteModel.value });
+            // console.log({ activatedRoute: this._activatedRouteModel.value });
             this.placeRouter.navigate(visit, {
                 relativeTo: this.parentOutlet ? this.parentOutlet.activatedRouteModel.value : null
             });
@@ -4584,6 +4602,35 @@
             enumerable: true,
             configurable: true
         });
+        // @Trace()
+        // @Trace()
+        /**
+         * @return {?}
+         */
+        PlaceOutletComponent.prototype.pushRouteChangesToVisit = 
+        // @Trace()
+        /**
+         * @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
@@ -4619,19 +4666,23 @@
             enumerable: true,
             configurable: true
         });
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} routerOutlet
          * @param {?} place
          * @return {?}
          */
-        PlaceOutletComponent.prototype.onOutletActivated = /**
+        PlaceOutletComponent.prototype.onOutletActivated = 
+        // @Trace()
+        /**
          * @param {?} routerOutlet
          * @param {?} place
          * @return {?}
          */
         function (routerOutlet, place) {
             var _this = this;
-            this._inOutletUpdate.whileTrue((/**
+            this._inOutletActivation.whileTrue((/**
              * @return {?}
              */
             function () {
@@ -4653,38 +4704,49 @@
                 this.animationDone();
             }
         };
+        // @Trace()
+        // @Trace()
         /**
          * @return {?}
          */
-        PlaceOutletComponent.prototype.onOutletDeactivated = /**
+        PlaceOutletComponent.prototype.onOutletDeactivated = 
+        // @Trace()
+        /**
          * @return {?}
          */
         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);
             }));
         };
+        // @Trace()
+        // @Trace()
         /**
          * @return {?}
          */
-        PlaceOutletComponent.prototype.animationStarted = /**
+        PlaceOutletComponent.prototype.animationStarted = 
+        // @Trace()
+        /**
          * @return {?}
          */
         function () {
             console.log({ activePlace: this._activePlace.value });
         };
+        // @Trace()
+        // @Trace()
         /**
          * @return {?}
          */
-        PlaceOutletComponent.prototype.animationDone = /**
+        PlaceOutletComponent.prototype.animationDone = 
+        // @Trace()
+        /**
          * @return {?}
          */
         function () {
@@ -4695,7 +4757,7 @@
         PlaceOutletComponent.decorators = [
             { type: core.Component, args: [{
                         selector: 'aup-place-outlet',
-                        template: "<div class=\"router-outlet-container\"\n     [@routeAnimations]=\"{value: placeAnimationOrder.value, params:{duration: animationDuration}}\"\n     (@routeAnimations.start)=\"animationStarted()\"\n     (@routeAnimations.done)=\"animationDone()\"\n>\n  <router-outlet #routerOutlet=\"outlet\"\n                 (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                 (deactivate)=\"onOutletDeactivated()\">\n  </router-outlet>\n</div>\n\n",
+                        template: "<div class=\"router-outlet-container\"\n     [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n     (@routeAnimations.start)=\"animationStarted()\"\n     (@routeAnimations.done)=\"animationDone()\"\n>\n  <router-outlet #routerOutlet=\"outlet\"\n                 (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                 (deactivate)=\"onOutletDeactivated()\">\n  </router-outlet>\n</div>\n\n",
                         animations: [LEFT_RIGHT_PLACE_ANIMATION],
                         styles: [":host{display:flex;flex-direction:column;min-height:0;overflow-x:hidden}.router-outlet-container{flex:1;display:block;position:relative;min-height:0}router-outlet{display:none}"]
                     }] }
@@ -4722,36 +4784,6 @@
             pectin.StoreInListModel('customPlaceAnimationOrderModel'),
             __metadata("design:type", Array)
         ], PlaceOutletComponent.prototype, "customPlaceAnimationOrder", void 0);
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Visit]),
-            __metadata("design:returntype", void 0)
-        ], PlaceOutletComponent.prototype, "navigate", null);
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", [router.RouterOutlet, exports.PlaceComponent]),
-            __metadata("design:returntype", void 0)
-        ], PlaceOutletComponent.prototype, "onOutletActivated", null);
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", []),
-            __metadata("design:returntype", void 0)
-        ], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", []),
-            __metadata("design:returntype", void 0)
-        ], PlaceOutletComponent.prototype, "animationStarted", null);
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", []),
-            __metadata("design:returntype", void 0)
-        ], PlaceOutletComponent.prototype, "animationDone", null);
         return PlaceOutletComponent;
     }(DisposableComponent));
     if (false) {
@@ -4775,11 +4807,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
@@ -4801,7 +4848,12 @@
          * @type {?}
          * @private
          */
-        PlaceOutletComponent.prototype.isOnInitialPlace;
+        PlaceOutletComponent.prototype.initialPlaceIndex;
+        /**
+         * @type {?}
+         * @private
+         */
+        PlaceOutletComponent.prototype.routerVisit;
         /**
          * @type {?}
          * @private
@@ -5018,7 +5070,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 +5102,7 @@
                             ListPlaceNavComponent
                         ],
                         providers: [
-                            { provide: AUP_PLACE_CONFIG, useValue: ɵ0 }
+                        // {provide: AUP_PLACE_CONFIG, useValue: {animationDuration: "2000ms"}}
                         ]
                     },] }
         ];