@coolon/angular-ui-powerups 0.0.81 → 0.0.84

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

@@ -1043,8 +1043,8 @@ class AlertDialogComponent extends AbstractActivity {
 AlertDialogComponent.decorators = [
     { type: 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 */
@@ -1111,8 +1111,8 @@ class ConfirmThenDialogComponent extends AbstractActivity {
 ConfirmThenDialogComponent.decorators = [
     { type: 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 */
@@ -1171,8 +1171,8 @@ class ConfirmationDialogComponent extends AbstractActivity {
 ConfirmationDialogComponent.decorators = [
     { type: 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 */
@@ -3242,7 +3242,6 @@ class PlaceRouter extends GarbageCollector {
             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
             [def.getFormattedRouteParameters(visit)];
     }
-    // @Trace()
     /**
      * @private
      * @param {?} event
@@ -3260,7 +3259,6 @@ class PlaceRouter extends GarbageCollector {
         }
         this.firstRoute = false;
     }
-    // @Trace()
     /**
      * @private
      * @return {?}
@@ -3312,6 +3310,18 @@ __decorate([
     __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);
 if (false) {
     /**
      * @type {?}
@@ -3435,13 +3445,17 @@ class PlaceOutletComponent extends DisposableComponent {
         this.animate = true;
         this.placeChanged = new EventEmitter();
         this._activePlace = new MutableValueModel();
-        this._placeVisit = new MutableValueModel();
-        this._inOutletUpdate = new Guard$1();
+        this._activePlaceVisitModel = new DelegatingValueModel();
+        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;
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.parentOutletModel = new MutableValueModel(parentOutlet);
+        this._activePlaceVisitModel.setDelegate(new MutableValueModel());
+        this._inOutletUpdate = valueOf.any(this._inOutletDeactivation, this._inOutletActivation).areTruthy();
         /** @type {?} */
         const defaultPlaceAnimationOrder = chain(this.parentOutletModel)
             .pullValueModel((/**
@@ -3472,26 +3486,17 @@ class PlaceOutletComponent extends DisposableComponent {
                 this.animate ? Math.max(order, 0) : 0;
         }));
         // Push incoming changes into the component
-        /** @type {?} */
-        const routeVisit = chain(this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);
-        /** @type {?} */
-        const 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 {?}
          */
-        (visit) => {
-            if (visit) { // can be null while the place and index sync up
-                inRouteVisitUpdate.whileTrue((/**
-                 * @return {?}
-                 */
-                () => {
-                    this._placeVisit.value = visit;
-                }));
-            }
-        }));
+        () => this.pushRouteChangesToVisit()), { unless: this._inOutletUpdate });
         // Handle component based changes
-        when.valueOf(this._placeVisit).changes((/**
+        when.valueOf(this._activePlaceVisitModel).changes((/**
          * @param {?} next
          * @param {?} previous
          * @return {?}
@@ -3499,7 +3504,7 @@ class PlaceOutletComponent extends DisposableComponent {
         (next, previous) => {
             this.pushVisitChangesToRoute(next, previous);
         }), {
-            unless: inRouteVisitUpdate
+            unless: this.placeRouter.navigationSessionActive
         });
         chain(this._activePlace)
             .postponeWhile(placeRouter.navigationSessionActive)
@@ -3538,6 +3543,27 @@ class PlaceOutletComponent extends DisposableComponent {
     get parentOutlet() {
         return this.parentOutletModel.value;
     }
+    /**
+     * @return {?}
+     */
+    pushRouteChangesToVisit() {
+        /** @type {?} */
+        const visit = this.routerVisit.value;
+        console.log({
+            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 {?}
+             */
+            () => {
+                this._activePlaceVisitModel.value = visit;
+            }));
+        }
+    }
     /**
      * @param {?} next
      * @param {?} previous
@@ -3566,7 +3592,7 @@ class PlaceOutletComponent extends DisposableComponent {
      * @return {?}
      */
     onOutletActivated(routerOutlet, place) {
-        this._inOutletUpdate.whileTrue((/**
+        this._inOutletActivation.whileTrue((/**
          * @return {?}
          */
         () => {
@@ -3574,7 +3600,10 @@ class PlaceOutletComponent extends DisposableComponent {
                 this._activePlace.value = place;
                 this._activatedRouteModel.value = routerOutlet.activatedRoute;
                 this._placeDefinition.value = place.placeDefinition;
-                place.initialiseBindings(this._placeVisit);
+                /** @type {?} */
+                const visitModel = new MutableValueModel();
+                this._activePlaceVisitModel.setDelegate(visitModel);
+                place.initialiseBindings(visitModel);
             }
             catch (error) {
                 console.error(error);
@@ -3586,20 +3615,18 @@ class PlaceOutletComponent extends DisposableComponent {
         }
     }
     /**
-     * @param {?} routerOutlet
-     * @param {?} $event
      * @return {?}
      */
-    onOutletDeactivated(routerOutlet, $event) {
-        this._inOutletUpdate.whileTrue((/**
+    onOutletDeactivated() {
+        this._inOutletDeactivation.whileTrue((/**
          * @return {?}
          */
         () => {
-            this._previousPlace = this._activePlace.value;
             this.isOnInitialPlace = false;
             this._activePlace.value = null;
             this._activatedRouteModel.value = null;
             this._placeDefinition.value = null;
+            this._activePlaceVisitModel.setDelegate(null);
         }));
     }
     /**
@@ -3612,10 +3639,6 @@ class PlaceOutletComponent extends DisposableComponent {
      * @return {?}
      */
     animationDone() {
-        console.log({ activePlace: this._activePlace.value });
-        if (this._previousPlace) {
-            this._previousPlace.onPlaceDestroyed();
-        }
         if (this._activePlace.value) {
             this._activePlace.value.onPlaceReady();
         }
@@ -3624,7 +3647,7 @@ class PlaceOutletComponent extends DisposableComponent {
 PlaceOutletComponent.decorators = [
     { type: 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}"]
             }] }
@@ -3657,6 +3680,12 @@ __decorate([
     __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),
@@ -3666,7 +3695,7 @@ __decorate([
 __decorate([
     Trace(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [RouterOutlet, Object]),
+    __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
 __decorate([
@@ -3701,12 +3730,27 @@ if (false) {
      * @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
@@ -3733,7 +3777,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._previousPlace;
+    PlaceOutletComponent.prototype.routerVisit;
     /**
      * @type {?}
      * @private
@@ -3922,7 +3966,6 @@ TabbedPlaceNavigationComponent.ctorParameters = () => [];
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-const ɵ0 = { animationDuration: "2000ms" };
 class PlaceModule {
 }
 PlaceModule.decorators = [
@@ -3954,7 +3997,7 @@ PlaceModule.decorators = [
                     ListPlaceNavComponent
                 ],
                 providers: [
-                    { provide: AUP_PLACE_CONFIG, useValue: ɵ0 }
+                // {provide: AUP_PLACE_CONFIG, useValue: {animationDuration: "2000ms"}}
                 ]
             },] }
 ];