@coolon/angular-ui-powerups 0.0.107 → 0.0.109

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

@@ -4,10 +4,10 @@ import { FormsModule } from '@angular/forms';
 import { MatInputModule, MatFormFieldModule, MatSelectModule, MatButtonModule, MatDialogModule, MatTabsModule as MatTabsModule$1, MatProgressSpinnerModule, MatDialog } from '@angular/material';
 import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Trace, Guard, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Guard, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { __decorate, __metadata, __awaiter } from 'tslib';
 import { PortalModule } from '@angular/cdk/portal';
-import { RouterModule, NavigationStart, NavigationCancel, NavigationError, NavigationEnd, UrlSegment, Router, UrlSerializer } from '@angular/router';
+import { RouterModule, UrlSegment, NavigationStart, NavigationEnd, NavigationError, NavigationCancel, Router, UrlSerializer } from '@angular/router';
 import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
@@ -3542,6 +3542,7 @@ if (false) {
         onRouterStarted(event) {
             return new InteractionTransition(this.context, event.url);
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3550,12 +3551,6 @@ if (false) {
             return new InteractionPopStateTransition(this.context, event.url);
         }
     }
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationStart]),
-        __metadata("design:returntype", NavigationState)
-    ], IdleDuringInteraction.prototype, "onPopState", null);
     NavigationState.IdleDuringInteraction = IdleDuringInteraction;
     if (false) {
         /** @type {?} */
@@ -3595,6 +3590,7 @@ if (false) {
             super(...arguments);
             this.isPopState = false;
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3610,6 +3606,7 @@ if (false) {
                 return new Idle(this.context);
             }
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3618,6 +3615,7 @@ if (false) {
             // navigation was aborted.
             return new IdleDuringInteraction(this.context, this.startingUrl);
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3631,24 +3629,6 @@ if (false) {
             }
         }
     }
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationCancel]),
-        __metadata("design:returntype", NavigationState)
-    ], InteractionTransition.prototype, "onRouterCancelled", null);
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationError]),
-        __metadata("design:returntype", NavigationState)
-    ], InteractionTransition.prototype, "onRouterError", null);
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationEnd]),
-        __metadata("design:returntype", NavigationState)
-    ], InteractionTransition.prototype, "onRouterEnd", null);
     NavigationState.InteractionTransition = InteractionTransition;
     if (false) {
         /** @type {?} */
@@ -3663,6 +3643,7 @@ if (false) {
             super(...arguments);
             this.isPopState = true;
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3678,6 +3659,7 @@ if (false) {
                 return new Idle(this.context);
             }
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
@@ -3691,18 +3673,6 @@ if (false) {
             }
         }
     }
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationCancel]),
-        __metadata("design:returntype", NavigationState)
-    ], InteractionPopStateTransition.prototype, "onRouterCancelled", null);
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationEnd]),
-        __metadata("design:returntype", NavigationState)
-    ], InteractionPopStateTransition.prototype, "onRouterEnd", null);
     NavigationState.InteractionPopStateTransition = InteractionPopStateTransition;
     if (false) {
         /** @type {?} */
@@ -3736,16 +3706,21 @@ if (false) {
         onRouterStarted(event) {
             return this.ignore(event);
         }
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
         onRouterCancelled(event) {
             // Depending on the state of the router and what was done we get a different
-            // sequence of events.  I.e.  If they just clicked a link we'll get a cancel
-            // with the locationChangeTriggerUrl as the final event. However the user
-            // started the initial navigation with a pop state then we'll get one of
-            // those with the locationChangeTriggerUrl but no cancel event with it.
+            // sequence of events.
+            // If the navigation change was triggered by clicking a link we'll get a cancel with the locationChangeTriggerUrl as the final event.
+            // If the navigation change was triggered with a pop state then we'll get an onPopState with the locationChangeTriggerUrl but no cancel event with it.
+            if (this.gotPopStateWithLeavingUrl && this.interactionService.isActive()) {
+                /** @type {?} */
+                const interactionIds = this.interactionService.activeInteractionContextIds.value;
+                this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
+            }
             return this.gotPopStateWithLeavingUrl || this.locationChangeTriggerUrl === event.url ? this.createIdleState() : this.ignore(event);
         }
         /**
@@ -3799,12 +3774,6 @@ if (false) {
             return `${this.constructor.name}(isIdl: ${this.idle}, startingUrl: ${this.startingUrl}, locationChangeTriggerUrl:${this.locationChangeTriggerUrl})`;
         }
     }
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [NavigationCancel]),
-        __metadata("design:returntype", NavigationState)
-    ], CancelledDuringNavigationInteraction.prototype, "onRouterCancelled", null);
     NavigationState.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
     if (false) {
         /** @type {?} */
@@ -4398,6 +4367,7 @@ class PlaceRouter extends GarbageCollector {
     hasActiveInteractionIds(url) {
         return this.getActiveInteractionIdsFromUrl(url).length > 0;
     }
+    // @Trace()
     /**
      * @param {?} urlSnapshot
      * @param {?=} navigationExtras
@@ -4473,12 +4443,6 @@ PlaceRouter.ctorParameters = () => [
     { type: InteractionService }
 ];
 /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(UrlSerializer), ɵɵinject(Location), ɵɵinject(PlaceHistory), ɵɵinject(InteractionService)); }, token: PlaceRouter, providedIn: "root" });
-__decorate([
-    Trace(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [UrlSnapshot, Object]),
-    __metadata("design:returntype", Promise)
-], PlaceRouter.prototype, "navigateByUrl", null);
 if (false) {
     /**
      * @type {?}