@coolon/angular-ui-powerups 0.0.107 → 0.0.109

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

@@ -5,9 +5,9 @@ import { MatInputModule, MatFormFieldModule, MatSelectModule, MatButtonModule, M
 import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __extends, __decorate, __metadata, __awaiter, __generator, __assign, __spread } from 'tslib';
-import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Trace, Guard, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Guard, StoreInValueModel, Command, OptionsHelper, ValueHolder } from '@coolon/pectin';
 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';
@@ -4439,23 +4439,21 @@ if (false) {
         function (event) {
             return new InteractionTransition(this.context, event.url);
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        IdleDuringInteraction.prototype.onPopState = /**
+        IdleDuringInteraction.prototype.onPopState = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
         function (event) {
             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);
         return IdleDuringInteraction;
     }(NavigationState));
     NavigationState.IdleDuringInteraction = IdleDuringInteraction;
@@ -4494,18 +4492,26 @@ if (false) {
      * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
      * happily ignore interaction contexts.
      */
-    var InteractionTransition = /** @class */ (function (_super) {
+    var /**
+     * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+     * happily ignore interaction contexts.
+     */
+    InteractionTransition = /** @class */ (function (_super) {
         __extends(InteractionTransition, _super);
         function InteractionTransition() {
             var _this = _super !== null && _super.apply(this, arguments) || this;
             _this.isPopState = false;
             return _this;
         }
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        InteractionTransition.prototype.onRouterCancelled = /**
+        InteractionTransition.prototype.onRouterCancelled = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4520,11 +4526,15 @@ if (false) {
                 return new Idle(this.context);
             }
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        InteractionTransition.prototype.onRouterError = /**
+        InteractionTransition.prototype.onRouterError = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4532,11 +4542,15 @@ if (false) {
             // navigation was aborted.
             return new IdleDuringInteraction(this.context, this.startingUrl);
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        InteractionTransition.prototype.onRouterEnd = /**
+        InteractionTransition.prototype.onRouterEnd = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4548,24 +4562,6 @@ if (false) {
                 return new Idle(this.context);
             }
         };
-        __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);
         return InteractionTransition;
     }(AbstractInteractionTransition));
     NavigationState.InteractionTransition = InteractionTransition;
@@ -4577,18 +4573,26 @@ if (false) {
      * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
      * happily ignore interaction contexts.
      */
-    var InteractionPopStateTransition = /** @class */ (function (_super) {
+    var /**
+     * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+     * happily ignore interaction contexts.
+     */
+    InteractionPopStateTransition = /** @class */ (function (_super) {
         __extends(InteractionPopStateTransition, _super);
         function InteractionPopStateTransition() {
             var _this = _super !== null && _super.apply(this, arguments) || this;
             _this.isPopState = true;
             return _this;
         }
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        InteractionPopStateTransition.prototype.onRouterCancelled = /**
+        InteractionPopStateTransition.prototype.onRouterCancelled = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4603,11 +4607,15 @@ if (false) {
                 return new Idle(this.context);
             }
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        InteractionPopStateTransition.prototype.onRouterEnd = /**
+        InteractionPopStateTransition.prototype.onRouterEnd = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4619,18 +4627,6 @@ if (false) {
                 return new Idle(this.context);
             }
         };
-        __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);
         return InteractionPopStateTransition;
     }(AbstractInteractionTransition));
     NavigationState.InteractionPopStateTransition = InteractionPopStateTransition;
@@ -4670,20 +4666,28 @@ if (false) {
         function (event) {
             return this.ignore(event);
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        CancelledDuringNavigationInteraction.prototype.onRouterCancelled = /**
+        CancelledDuringNavigationInteraction.prototype.onRouterCancelled = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
         function (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 {?} */
+                var 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);
         };
         /**
@@ -4767,12 +4771,6 @@ if (false) {
         function () {
             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);
         return CancelledDuringNavigationInteraction;
     }(NavigationState));
     NavigationState.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
@@ -5539,12 +5537,16 @@ var PlaceRouter = /** @class */ (function (_super) {
     function (url) {
         return this.getActiveInteractionIdsFromUrl(url).length > 0;
     };
+    // @Trace()
+    // @Trace()
     /**
      * @param {?} urlSnapshot
      * @param {?=} navigationExtras
      * @return {?}
      */
-    PlaceRouter.prototype.navigateByUrl = /**
+    PlaceRouter.prototype.navigateByUrl = 
+    // @Trace()
+    /**
      * @param {?} urlSnapshot
      * @param {?=} navigationExtras
      * @return {?}
@@ -5627,12 +5629,6 @@ var PlaceRouter = /** @class */ (function (_super) {
         { 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);
     return PlaceRouter;
 }(GarbageCollector));
 if (false) {