@coolon/angular-ui-powerups 0.0.81 → 0.0.84

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

@@ -1447,8 +1447,8 @@
         AlertDialogComponent.decorators = [
             { type: core.Component, args: [{
                         selector: 'aup-alert-dialog',
-                        template: "<h3 matDialogTitle *ngIf=\"alert.title\">{{alert.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of alert.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-raised-button color=\"primary\" (click)=\"done()\" data-cy=\"close-button\">{{alert.ok()}}</button>\n</p>\n",
-                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
+                        template: "<h3 matDialogTitle *ngIf=\"alert.title\">{{alert.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of alert.content()\">{{line}}</p>\n</div>\n<div matDialogActions>\n  <button mat-raised-button color=\"primary\" (click)=\"done()\" data-cy=\"close-button\">{{alert.ok()}}</button>\n</div>\n",
+                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-content{margin:0;padding:0}.mat-dialog-actions{justify-content:flex-end}"]
                     }] }
         ];
         /** @nocollapse */
@@ -1528,8 +1528,8 @@
         ConfirmThenDialogComponent.decorators = [
             { type: core.Component, args: [{
                         selector: 'aup-confirmation-dialog',
-                        template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"onConfirm()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</p>\n\n",
-                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
+                        template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<div matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"onConfirm()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</div>\n\n",
+                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-content{margin:0;padding:0}.mat-dialog-actions{justify-content:flex-end}"]
                     }] }
         ];
         /** @nocollapse */
@@ -1594,8 +1594,8 @@
         ConfirmationDialogComponent.decorators = [
             { type: core.Component, args: [{
                         selector: 'aup-confirmation-dialog',
-                        template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</p>\n\n",
-                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
+                        template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<div matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</div>\n\n",
+                        styles: [":host{display:block;padding:var(--aup-default-padding)}.mat-dialog-content{margin:0;padding:0}.mat-dialog-actions{justify-content:flex-end}"]
                     }] }
         ];
         /** @nocollapse */
@@ -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) {
@@ -4463,13 +4467,17 @@
             _this.animate = true;
             _this.placeChanged = new core.EventEmitter();
             _this._activePlace = new pectin.MutableValueModel();
-            _this._placeVisit = new pectin.MutableValueModel();
-            _this._inOutletUpdate = new pectin.Guard();
+            _this._activePlaceVisitModel = new pectin.DelegatingValueModel();
+            _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((/**
@@ -4500,26 +4508,17 @@
                     _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) {
-                if (visit) { // can be null while the place and index sync up
-                    inRouteVisitUpdate.whileTrue((/**
-                     * @return {?}
-                     */
-                    function () {
-                        _this._placeVisit.value = visit;
-                    }));
-                }
-            }));
+            function () { return _this.pushRouteChangesToVisit(); }), { unless: _this._inOutletUpdate });
             // Handle component based changes
-            when.valueOf(_this._placeVisit).changes((/**
+            when.valueOf(_this._activePlaceVisitModel).changes((/**
              * @param {?} next
              * @param {?} previous
              * @return {?}
@@ -4527,7 +4526,7 @@
             function (next, previous) {
                 _this.pushVisitChangesToRoute(next, previous);
             }), {
-                unless: inRouteVisitUpdate
+                unless: _this.placeRouter.navigationSessionActive
             });
             chain(_this._activePlace)
                 .postponeWhile(placeRouter.navigationSessionActive)
@@ -4582,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
@@ -4629,7 +4653,7 @@
          */
         function (routerOutlet, place) {
             var _this = this;
-            this._inOutletUpdate.whileTrue((/**
+            this._inOutletActivation.whileTrue((/**
              * @return {?}
              */
             function () {
@@ -4637,7 +4661,10 @@
                     _this._activePlace.value = place;
                     _this._activatedRouteModel.value = routerOutlet.activatedRoute;
                     _this._placeDefinition.value = place.placeDefinition;
-                    place.initialiseBindings(_this._placeVisit);
+                    /** @type {?} */
+                    var visitModel = new pectin.MutableValueModel();
+                    _this._activePlaceVisitModel.setDelegate(visitModel);
+                    place.initialiseBindings(visitModel);
                 }
                 catch (error) {
                     console.error(error);
@@ -4649,26 +4676,22 @@
             }
         };
         /**
-         * @param {?} routerOutlet
-         * @param {?} $event
          * @return {?}
          */
         PlaceOutletComponent.prototype.onOutletDeactivated = /**
-         * @param {?} routerOutlet
-         * @param {?} $event
          * @return {?}
          */
-        function (routerOutlet, $event) {
+        function () {
             var _this = this;
-            this._inOutletUpdate.whileTrue((/**
+            this._inOutletDeactivation.whileTrue((/**
              * @return {?}
              */
             function () {
-                _this._previousPlace = _this._activePlace.value;
                 _this.isOnInitialPlace = false;
                 _this._activePlace.value = null;
                 _this._activatedRouteModel.value = null;
                 _this._placeDefinition.value = null;
+                _this._activePlaceVisitModel.setDelegate(null);
             }));
         };
         /**
@@ -4687,10 +4710,6 @@
          * @return {?}
          */
         function () {
-            console.log({ activePlace: this._activePlace.value });
-            if (this._previousPlace) {
-                this._previousPlace.onPlaceDestroyed();
-            }
             if (this._activePlace.value) {
                 this._activePlace.value.onPlaceReady();
             }
@@ -4698,7 +4717,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(routerOutlet, $event)\">\n  </router-outlet>\n</div>\n\n",
+                        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",
                         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}"]
                     }] }
@@ -4731,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),
@@ -4740,7 +4765,7 @@
         __decorate([
             pectin.Trace(),
             __metadata("design:type", Function),
-            __metadata("design:paramtypes", [router.RouterOutlet, Object]),
+            __metadata("design:paramtypes", []),
             __metadata("design:returntype", void 0)
         ], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
         __decorate([
@@ -4777,12 +4802,27 @@
          * @type {?}
          * @private
          */
-        PlaceOutletComponent.prototype._placeVisit;
+        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
@@ -4809,7 +4849,7 @@
          * @type {?}
          * @private
          */
-        PlaceOutletComponent.prototype._previousPlace;
+        PlaceOutletComponent.prototype.routerVisit;
         /**
          * @type {?}
          * @private
@@ -5026,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() {
         }
@@ -5059,7 +5098,7 @@
                             ListPlaceNavComponent
                         ],
                         providers: [
-                            { provide: AUP_PLACE_CONFIG, useValue: ɵ0 }
+                        // {provide: AUP_PLACE_CONFIG, useValue: {animationDuration: "2000ms"}}
                         ]
                     },] }
         ];