@coolon/angular-ui-powerups 0.0.106 → 0.0.108

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

@@ -7,7 +7,7 @@ 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 { PortalModule } from '@angular/cdk/portal';
-import { RouterModule, NavigationStart, NavigationCancel, UrlSegment, NavigationEnd, NavigationError, Router, UrlSerializer } from '@angular/router';
+import { RouterModule, NavigationStart, NavigationCancel, NavigationError, NavigationEnd, UrlSegment, 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';
@@ -3670,7 +3670,7 @@ var PlaceComponentDeactivationHandler = /** @class */ (function () {
                 // we always return true if we accepted promise from a previous cycle of the current
                 // navigation session.
                 if (!this.canDeactivatePromise) {
-                    console.log("creating deactivate promise for -> " + this.component.constructor.name);
+                    // console.log(`creating deactivate promise for -> ${this.component.constructor.name}`);
                     this.canDeactivatePromise = this.canDeactivateComponent(currentUrl, nextState);
                 }
                 return [2 /*return*/, this.canDeactivatePromise];
@@ -3699,7 +3699,6 @@ var PlaceComponentDeactivationHandler = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log(this.navigationState.toString());
                         if (!this.navigationState.isPopState) return [3 /*break*/, 5];
                         if (!(this.isPrimaryComponent && this.interactionService.isModalActive())) return [3 /*break*/, 3];
                         routeIds = this.placeRouter.getActiveInteractionIdsFromUrl(nextState.url);
@@ -4425,11 +4424,15 @@ if (false) {
             navigationTransition.storeVisit(visit);
             return navigationTransition;
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} event
          * @return {?}
          */
-        IdleDuringInteraction.prototype.onRouterStarted = /**
+        IdleDuringInteraction.prototype.onRouterStarted = 
+        // @Trace()
+        /**
          * @param {?} event
          * @return {?}
          */
@@ -4447,12 +4450,6 @@ if (false) {
         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, "onRouterStarted", null);
         __decorate([
             Trace(),
             __metadata("design:type", Function),
@@ -4497,11 +4494,7 @@ 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 /**
-     * 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) {
+    var InteractionTransition = /** @class */ (function (_super) {
         __extends(InteractionTransition, _super);
         function InteractionTransition() {
             var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -4555,6 +4548,24 @@ 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;
@@ -4566,11 +4577,7 @@ 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 /**
-     * 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) {
+    var InteractionPopStateTransition = /** @class */ (function (_super) {
         __extends(InteractionPopStateTransition, _super);
         function InteractionPopStateTransition() {
             var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -4612,6 +4619,18 @@ 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;
@@ -4661,10 +4680,14 @@ if (false) {
          */
         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);
         };
         /**
@@ -4860,10 +4883,9 @@ if (false) {
  */
 var UrlSnapshot = /** @class */ (function () {
     // TODO: Update this accept a url Parser so it can be immutable and generate new trees on mutation using toString() are parseUrl.
-    function UrlSnapshot(urlSerializer, url, options) {
+    function UrlSnapshot(urlSerializer, url) {
         this.urlSerializer = urlSerializer;
         this.url = url;
-        this.options = options;
         this.urlTree = urlSerializer.parse(url);
     }
     /**
@@ -4891,7 +4913,7 @@ var UrlSnapshot = /** @class */ (function () {
         // do not use the return value, it's the items that were removed!
         segments.splice.apply(segments, __spread([replaceAt, visitSegments.length], visitSegments));
         urlTree.root.children.primary.segments = segments;
-        return new UrlSnapshot(this.urlSerializer, urlTree.toString(), this.options);
+        return new UrlSnapshot(this.urlSerializer, urlTree.toString());
     };
     /**
      * @private
@@ -4996,7 +5018,7 @@ var UrlSnapshot = /** @class */ (function () {
             /** @type {?} */
             var urlTree = this.urlSerializer.parse(this.url);
             urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM] = UrlSnapshot.createPathIdFor(ids);
-            return new UrlSnapshot(this.urlSerializer, urlTree.toString(), this.options);
+            return new UrlSnapshot(this.urlSerializer, urlTree.toString());
         }
     };
     // @Trace()
@@ -5015,27 +5037,7 @@ var UrlSnapshot = /** @class */ (function () {
         if (urlTree.queryParams && urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM]) {
             urlTree.queryParams = {}; //[UrlSnapshot.INTERACTION_ROUTER_OUTLET]
         }
-        return new UrlSnapshot(this.urlSerializer, urlTree.toString(), this.options);
-    };
-    /**
-     * @param {?} options
-     * @return {?}
-     */
-    UrlSnapshot.prototype.withOptions = /**
-     * @param {?} options
-     * @return {?}
-     */
-    function (options) {
-        return new UrlSnapshot(this.urlSerializer, this.url, options);
-    };
-    /**
-     * @return {?}
-     */
-    UrlSnapshot.prototype.getNavigationExtras = /**
-     * @return {?}
-     */
-    function () {
-        return this.options;
+        return new UrlSnapshot(this.urlSerializer, urlTree.toString());
     };
     return UrlSnapshot;
 }());
@@ -5046,11 +5048,6 @@ if (false) {
     UrlSnapshot.prototype.urlSerializer;
     /** @type {?} */
     UrlSnapshot.prototype.url;
-    /**
-     * @type {?}
-     * @private
-     */
-    UrlSnapshot.prototype.options;
 }
 (function (UrlSnapshot) {
     UrlSnapshot.INTERACTION_QUERY_PARAM = 'aup-interactions';
@@ -5173,7 +5170,7 @@ var PlaceRouter = /** @class */ (function (_super) {
          * @return {?}
          */
         function (ids, previous) {
-            _this.syncInteractionIdsWithRouter();
+            _this.syncInteractionIdsWithRouter(ids, previous);
         }), { unless: _this.navigationInProgress }); // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.
         // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.
         /** @type {?} */
@@ -5464,7 +5461,7 @@ var PlaceRouter = /** @class */ (function (_super) {
      * @return {?}
      */
     function (url) {
-        return new UrlSnapshot(this.urlSerializer, url, {});
+        return new UrlSnapshot(this.urlSerializer, url);
     };
     /**
      * @param {?} url
@@ -5546,47 +5543,77 @@ var PlaceRouter = /** @class */ (function (_super) {
     function (url) {
         return this.getActiveInteractionIdsFromUrl(url).length > 0;
     };
-    // @Trace()
-    // @Trace()
     /**
      * @param {?} urlSnapshot
+     * @param {?=} navigationExtras
      * @return {?}
      */
-    PlaceRouter.prototype.navigateByUrl = 
-    // @Trace()
-    /**
+    PlaceRouter.prototype.navigateByUrl = /**
      * @param {?} urlSnapshot
+     * @param {?=} navigationExtras
      * @return {?}
      */
-    function (urlSnapshot) {
-        this.router.navigateByUrl(urlSnapshot.urlTree, urlSnapshot.getNavigationExtras());
+    function (urlSnapshot, navigationExtras) {
+        return this.router.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
     };
-    // @Trace()
-    // @Trace()
+    // TODO: Should this be moved to the navigation states?
+    // TODO: Should this be moved to the navigation states?
     /**
+     * @param {?} currentIds
+     * @param {?} previous
      * @return {?}
      */
     PlaceRouter.prototype.syncInteractionIdsWithRouter = 
-    // @Trace()
+    // TODO: Should this be moved to the navigation states?
     /**
+     * @param {?} currentIds
+     * @param {?} previous
      * @return {?}
      */
-    function () {
+    function (currentIds, previous) {
+        var _this = this;
         assert.isFalsey(this.navigationInProgress.value); // Updating interaction routes during an existing navigation breaks all the things.
-        // Updating interaction routes during an existing navigation breaks all the things.
-        /** @type {?} */
-        var currentIds = this.interactionService.activeInteractionContextIds.value;
-        if (___default.isEqual(currentIds, this.getActiveInteractionIdsFromUrl(this.getCurrentRouterUrl()))) {
+        console.log({
+            startingActivity: currentIds.length > previous.length,
+            wasBackButton: this.navigationState.isPopState
+        });
+        if (___default.isEqual(currentIds, previous)) {
             console.log('activity ids were the same, skipping');
         }
         else {
-            if (currentIds.length < 1) {
-                // no more interactions to remove from history.
-                this.navigateByUrl(this.getCurrentRouteSnapshot().removeInteractionIds());
+            // OMG, this is nuts.
+            /** @type {?} */
+            var addingActivity = currentIds.length > previous.length;
+            /** @type {?} */
+            var isFirstActivity = addingActivity && previous.length < 1;
+            /** @type {?} */
+            var removingLastActivity = currentIds.length < 1;
+            if (addingActivity) { // we're starting a new activity, push the change to the history and update the url
+                console.log('adding activity');
+                this.navigateByUrl(this.getCurrentRouteSnapshot().updateInteractionIds(currentIds), {
+                    replaceUrl: !isFirstActivity // we don't let the history pile up
+                });
             }
             else {
-                // todo was or is...
-                this.navigateByUrl(this.getCurrentRouteSnapshot().updateInteractionIds(currentIds));
+                /** @type {?} */
+                var urlSnapshot = this.getCurrentRouteSnapshot().updateInteractionIds(currentIds);
+                if (removingLastActivity) {
+                    this.navigateByUrl(urlSnapshot, {
+                        replaceUrl: true
+                    }).then((/**
+                     * @return {?}
+                     */
+                    function () {
+                        // for some reason we need to pop the last history off the stack when leaving the
+                        // active activity state.
+                        _this.angularLocation.back();
+                    }));
+                }
+                else {
+                    this.navigateByUrl(urlSnapshot, {
+                        replaceUrl: true
+                    });
+                }
             }
         }
     };
@@ -5604,6 +5631,12 @@ 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) {