@coolon/angular-ui-powerups 0.0.119 → 0.0.120

package/esm5/lib/place/place-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router,\n  UrlSerializer\n} from '@angular/router';\nimport {\n  assert,\n  Constructable,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  lang,\n  ListModel,\n  Logger,\n  MutableListModel,\n  MutableStream,\n  MutableValueModel,\n  Trace,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { NavigationState } from './guards/navigation-state';\nimport { PlaceHistory } from './place-history';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private readonly _navigationStateModel = new MutableValueModel<NavigationState>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationInProgress: ValueModel<boolean>;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n  private _navigationSessionContext: NavigationState.Context;\n  private _navigationStateTypeModel: ValueModelChain<Constructable<NavigationState>>;\n\n  constructor(private readonly router: Router,\n              private readonly urlSerializer: UrlSerializer,\n              private readonly angularLocation: Location,\n              private readonly placeHistory: PlaceHistory,\n              private readonly interactionService: InteractionService) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n    this.navigationInProgress = chain(this.navigationStateModel).pluck('isTransitional');\n    this._navigationSessionContext = new NavigationState.Context(this, this.interactionService, session => {\n      this.processNavigationSuccess(session);\n    });\n    this._navigationStateModel.value = new NavigationState.Idle(this._navigationSessionContext);\n    this._navigationStateTypeModel = chain(this._navigationStateModel).map(state => state.constructor as Constructable<NavigationState>);\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        if (event.navigationTrigger === 'popstate') {\n          this.runStateTransition(state => state.onPopState(event));\n        } else {\n          this.runStateTransition(state => state.onRouterStarted(event));\n        }\n      }\n      if (event instanceof NavigationEnd) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterEnd(event));\n      }\n      if (event instanceof NavigationError) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterError(event));\n      }\n      if (event instanceof NavigationCancel) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterCancelled(event));\n      }\n    });\n\n    // Push dialog state to the url so we can capture the back button.\n    when.listOf(this.interactionService.activeInteractionContextIds).changes((ids, previous) => {\n      this.syncInteractionIdsWithRouter(ids, previous);\n    }, { unless: this.navigationInProgress }); // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.\n\n    const urlChanges = new MutableStream<{ url: string, state: NavigationState }>();\n\n    // The angular router doesn't always fire router events when the back button is pushed while a navigation\n    // session is in progress.  Sometimes we only know about it from the url change.\n    // IMPORTANT ORDER DEPENDENCY\n    // This only works because we're notified of the change after the router has started reacting to it.  This\n    // we can can use our navigationState to determine things.\n    angularLocation.onUrlChange(url => {\n      const navigationState = this._navigationStateModel.value;\n      console.log(`URLChange -> ${url}`, { state: navigationState });\n      urlChanges.publish({ url, state: navigationState });\n\n      // The url has changed while we're in a transitional state\n      if (navigationState.isTransitional) {\n        const navigationInteraction = this.navigationState.interactionContext;\n        if (navigationInteraction && navigationInteraction.isActive()) {\n          this.runStateTransition(state => state.onBackClickedDuringNavigationInteraction(url));\n        }\n      }\n    });\n  }\n\n  private processNavigationSuccess(session: NavigationState) {\n    // We need to update the visits before the session finishes.  This allows the placeOutets to ignore visit\n    // changes that occur while routerNavigationActive is true.\n    assert.isTruthy(this.navigationInProgress.value);\n    const visits = session.getVisits();\n    visits.forEach(v => this.placeHistory.add(v));\n    this._activeVisits.value = visits;\n  }\n\n  get navigationState(): NavigationState {\n    return this._navigationStateModel.value;\n  }\n\n  get navigationStateModel(): ValueModel<NavigationState> {\n    return this._navigationStateModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  async navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.router.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.parseUrl(this.router.routerState.snapshot.url).updateVisitSegments(next);\n        console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    this.runStateTransition(current => {\n      const session = this.navigationState.onPlaceNavigationStart(visit, this.getCurrentRouterUrl());\n      session.storeVisit(visit);\n      return session;\n    });\n    try {\n      await runNavigationCommands(this.router);\n    } finally {\n      // Router has finished (since there was no router change required) so we\n      // need to end the navigation session.\n      if (this.navigationState.isTransitional && !this.router.getCurrentNavigation()) {\n        this.runStateTransition(session => session.onRouterEnd(new NavigationEnd(-1, '', '')));\n      }\n    }\n  }\n\n  // @Trace()\n  protected runStateTransition(transition: (navigationSession: NavigationState) => NavigationState) {\n    const previous = this._navigationStateModel.value;\n    const next = transition(this.navigationState);\n    this._navigationStateModel.value = next;\n    if (next !== previous) {\n      previous.dispose();\n      Logger.get(this).info(`Router State Transition: ${previous.toString()} -> ${next.toString()}`);\n    }\n  }\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n  extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n\n  parseUrl(url: string): UrlSnapshot {\n    return new UrlSnapshot(this.urlSerializer, url);\n  }\n\n  resetBrowserLocation(url: string) {\n    this.angularLocation.go(url);\n  }\n\n  createUrlSnapshot(...visits: Visit[]): UrlSnapshot {\n    const bits = [];\n    visits.forEach(v => {\n      bits.push(this.parseUrl(`${v.placeDefinition.path}`).updateVisitSegments(v).url);\n    });\n    return this.parseUrl(bits.join(''));\n  }\n\n  getCurrentRouterUrl(): string {\n    return this.router.routerState ? this.router.routerState.snapshot.url : null;\n  }\n\n  getCurrentRouteSnapshot(): UrlSnapshot {\n    return this.parseUrl(this.getCurrentRouterUrl());\n  }\n\n  getActiveInteractionIdsFromUrl(url: string): string[] {\n    return this.parseUrl(url).getInteractionIds();\n  }\n\n\n  // @Trace()\n  hasActiveInteractionIds(url: string) {\n    return this.getActiveInteractionIdsFromUrl(url).length > 0;\n  }\n\n  // @Trace()\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras): Promise<boolean> {\n    return this.router.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  // TODO: Should this be moved to the navigation states?\n  syncInteractionIdsWithRouter(currentIds: string[], previous: string[]) {\n    assert.isFalsey(this.navigationInProgress.value); // Updating interaction routes during an existing navigation breaks all the things.\n    console.log({\n      startingActivity: currentIds.length > previous.length,\n      wasBackButton: this.navigationState.isPopState\n    });\n\n    if (_.isEqual(currentIds, previous)) {\n      console.log('activity ids were the same, skipping');\n    } else {\n      // OMG, this is nuts.\n      const addingActivity = currentIds.length > previous.length;\n      const isFirstActivity = addingActivity && previous.length < 1;\n      const removingLastActivity = currentIds.length < 1;\n      if (addingActivity) {// we're starting a new activity, push the change to the history and update the url\n        console.log('adding activity');\n        this.navigateByUrl(this.getCurrentRouteSnapshot().updateInteractionIds(currentIds), {\n          replaceUrl: !isFirstActivity // we don't let the history pile up\n        });\n      } else {\n        const urlSnapshot = this.getCurrentRouteSnapshot().updateInteractionIds(currentIds);\n        if (removingLastActivity) {\n          this.navigateByUrl(urlSnapshot, {\n            replaceUrl: true\n          }).then(() => {\n            // for some reason we need to pop the last history off the stack when leaving the\n            // active activity state.\n            this.angularLocation.back();\n          });\n        } else {\n          this.navigateByUrl(urlSnapshot, {\n            replaceUrl: true\n          });\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router,\n  UrlSerializer\n} from '@angular/router';\nimport {\n  assert,\n  Constructable,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  lang,\n  ListModel,\n  Logger,\n  MutableListModel,\n  MutableStream,\n  MutableValueModel,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { NavigationState } from './guards/navigation-state';\nimport { PlaceHistory } from './place-history';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private readonly _navigationStateModel = new MutableValueModel<NavigationState>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationInProgress: ValueModel<boolean>;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n  private _navigationSessionContext: NavigationState.Context;\n  private _navigationStateTypeModel: ValueModelChain<Constructable<NavigationState>>;\n\n  constructor(private readonly router: Router,\n              private readonly urlSerializer: UrlSerializer,\n              private readonly angularLocation: Location,\n              private readonly placeHistory: PlaceHistory,\n              private readonly interactionService: InteractionService) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n    this.navigationInProgress = chain(this.navigationStateModel).pluck('isTransitional');\n    this._navigationSessionContext = new NavigationState.Context(this, this.interactionService, session => {\n      this.processNavigationSuccess(session);\n    });\n    this._navigationStateModel.value = new NavigationState.Idle(this._navigationSessionContext);\n    this._navigationStateTypeModel = chain(this._navigationStateModel).map(state => state.constructor as Constructable<NavigationState>);\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        if (event.navigationTrigger === 'popstate') {\n          this.runStateTransition(state => state.onPopState(event));\n        } else {\n          this.runStateTransition(state => state.onRouterStarted(event));\n        }\n      }\n      if (event instanceof NavigationEnd) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterEnd(event));\n      }\n      if (event instanceof NavigationError) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterError(event));\n      }\n      if (event instanceof NavigationCancel) {\n        console.log(event);\n        this.runStateTransition(state => state.onRouterCancelled(event));\n      }\n    });\n\n    // Push dialog state to the url so we can capture the back button.\n    when.listOf(this.interactionService.activeInteractionContextIds).changes((ids, previous) => {\n      this.syncInteractionIdsWithRouter(ids, previous);\n    }, { unless: this.navigationInProgress }); // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.\n\n    const urlChanges = new MutableStream<{ url: string, state: NavigationState }>();\n\n    // The angular router doesn't always fire router events when the back button is pushed while a navigation\n    // session is in progress.  Sometimes we only know about it from the url change.\n    // IMPORTANT ORDER DEPENDENCY\n    // This only works because we're notified of the change after the router has started reacting to it.  This\n    // we can can use our navigationState to determine things.\n    angularLocation.onUrlChange(url => {\n      const navigationState = this._navigationStateModel.value;\n      console.log(`URLChange -> ${url}`, { state: navigationState });\n      urlChanges.publish({ url, state: navigationState });\n\n      // The url has changed while we're in a transitional state\n      if (navigationState.isTransitional) {\n        const navigationInteraction = this.navigationState.interactionContext;\n        if (navigationInteraction && navigationInteraction.isActive()) {\n          this.runStateTransition(state => state.onBackClickedDuringNavigationInteraction(url));\n        }\n      }\n    });\n  }\n\n  private processNavigationSuccess(session: NavigationState) {\n    // We need to update the visits before the session finishes.  This allows the placeOutets to ignore visit\n    // changes that occur while routerNavigationActive is true.\n    assert.isTruthy(this.navigationInProgress.value);\n    const visits = session.getVisits();\n    visits.forEach(v => this.placeHistory.add(v));\n    this._activeVisits.value = visits;\n  }\n\n  get navigationState(): NavigationState {\n    return this._navigationStateModel.value;\n  }\n\n  get navigationStateModel(): ValueModel<NavigationState> {\n    return this._navigationStateModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  async navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.router.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.parseUrl(this.router.routerState.snapshot.url).updateVisitSegments(next);\n        console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    this.runStateTransition(current => {\n      const session = this.navigationState.onPlaceNavigationStart(visit, this.getCurrentRouterUrl());\n      session.storeVisit(visit);\n      return session;\n    });\n    try {\n      await runNavigationCommands(this.router);\n    } finally {\n      // Router has finished (since there was no router change required) so we\n      // need to end the navigation session.\n      if (this.navigationState.isTransitional && !this.router.getCurrentNavigation()) {\n        this.runStateTransition(session => session.onRouterEnd(new NavigationEnd(-1, '', '')));\n      }\n    }\n  }\n\n  // @Trace()\n  protected runStateTransition(transition: (navigationSession: NavigationState) => NavigationState) {\n    const previous = this._navigationStateModel.value;\n    const next = transition(this.navigationState);\n    this._navigationStateModel.value = next;\n    if (next !== previous) {\n      previous.dispose();\n      Logger.get(this).info(`Router State Transition: ${previous.toString()} -> ${next.toString()}`);\n    }\n  }\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n  extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n\n  parseUrl(url: string): UrlSnapshot {\n    return new UrlSnapshot(this.urlSerializer, url);\n  }\n\n  resetBrowserLocation(url: string, options: { replaceCurrent: boolean }) {\n    options.replaceCurrent ? this.angularLocation.replaceState(url) : this.angularLocation.go(url);\n  }\n\n  forward() {\n    this.angularLocation.forward();\n  }\n\n  createUrlSnapshot(...visits: Visit[]): UrlSnapshot {\n    const bits = [];\n    visits.forEach(v => {\n      bits.push(this.parseUrl(`${v.placeDefinition.path}`).updateVisitSegments(v).url);\n    });\n    return this.parseUrl(bits.join(''));\n  }\n\n  getCurrentRouterUrl(): string {\n    return this.router.routerState ? this.router.routerState.snapshot.url : null;\n  }\n\n  getCurrentRouteSnapshot(): UrlSnapshot {\n    return this.parseUrl(this.getCurrentRouterUrl());\n  }\n\n  getActiveInteractionIdsFromUrl(url: string): string[] {\n    return this.parseUrl(url).getInteractionIds();\n  }\n\n\n  // @Trace()\n  hasActiveInteractionIds(url: string) {\n    return this.getActiveInteractionIdsFromUrl(url).length > 0;\n  }\n\n  // @Trace()\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras): Promise<boolean> {\n    return this.router.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  // TODO: Should this be moved to the navigation states?\n  syncInteractionIdsWithRouter(currentIds: string[], previous: string[]) {\n    assert.isFalsey(this.navigationInProgress.value); // Updating interaction routes during an existing navigation breaks all the things.\n    console.log({\n      startingActivity: currentIds.length > previous.length,\n      wasBackButton: this.navigationState.isPopState\n    });\n\n    if (_.isEqual(currentIds, previous)) {\n      console.log('activity ids were the same, skipping');\n    } else {\n      // OMG, this is nuts.\n      const addingActivity = currentIds.length > previous.length;\n      const isFirstActivity = addingActivity && previous.length < 1;\n      const removingLastActivity = currentIds.length < 1;\n      if (addingActivity) {// we're starting a new activity, push the change to the history and update the url\n        console.log('adding activity');\n        this.navigateByUrl(this.getCurrentRouteSnapshot().updateInteractionIds(currentIds), {\n          replaceUrl: !isFirstActivity // we don't let the history pile up\n        });\n      } else {\n        const urlSnapshot = this.getCurrentRouteSnapshot().updateInteractionIds(currentIds);\n        if (removingLastActivity) {\n          this.navigateByUrl(urlSnapshot, {\n            replaceUrl: true\n          }).then(() => {\n            // for some reason we need to pop the last history off the stack when leaving the\n            // active activity state.\n            this.angularLocation.back();\n          });\n        } else {\n          this.navigateByUrl(urlSnapshot, {\n            replaceUrl: true\n          });\n        }\n      }\n    }\n  }\n}\n"]}

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

@@ -3220,13 +3220,13 @@ class NavigationState extends GarbageCollector {
             new NavigationState.IdleDuringInteraction(this.context, this.currentRouterUrl()) :
             new NavigationState.Idle(this.context);
     }
-    //
     /**
      * @param {?} url
+     * @param {?=} options
      * @return {?}
      */
-    resetBrowserLocation(url) {
-        this.placeRouter.resetBrowserLocation(url);
+    resetBrowserLocation(url, options = { replaceCurrent: false }) {
+        this.placeRouter.resetBrowserLocation(url, options);
     }
     /**
      * @param {?} event
@@ -3258,6 +3258,20 @@ class NavigationState extends GarbageCollector {
             return `${p}: ${this[p]}`;
         })).join(', ');
     }
+    /**
+     * @protected
+     * @param {?} url
+     * @return {?}
+     */
+    replaceBuggeredUrlAfterAngularRouterCancelled(url) {
+        // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+        // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+        // it before the cancel event fired.
+        // So we need to:
+        // - replace the just inserted url with the one that used to be there.
+        // - push our actual url back onto the top of the stack.
+        this.resetBrowserLocation(url, { replaceCurrent: true });
+    }
 }
 if (false) {
     /**
@@ -3536,11 +3550,11 @@ if (false) {
          * @return {?}
          */
         onRouterCancelled(event) {
+            this.replaceBuggeredUrlAfterAngularRouterCancelled(this.poppedHistoryUrl);
             // Angular doesn't preserve the url when a guard cancels the back button.
             // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
             Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-            this.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-            this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
+            this.resetBrowserLocation(this.startingUrl);
             return new Idle(this.context);
         }
         /**
@@ -3548,15 +3562,18 @@ if (false) {
          * @return {?}
          */
         onRouterError(event) {
-            // navigation was aborted.
-            if (this.currentRouterUrl() !== this.startingUrl) {
-                // Angular doesn't preserve the url when a guard cancels the back button.
-                // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-                Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-                this.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-                this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-            }
-            return new Idle(this.context);
+            // // navigation was aborted.
+            // if (this.currentRouterUrl() !== this.startingUrl) {
+            //   // Angular doesn't preserve the url when a guard cancels the back button.
+            //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+            //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
+            //   this.restoreHistory([
+            //     this.poppedHistoryUrl,
+            //     this.startingUrl
+            //   ]);
+            // }
+            // return new Idle(this.context);
+            return this.illegalTransition("when do I get this???");
         }
         /**
          * @param {?} locationTriggerUrl
@@ -3668,6 +3685,7 @@ if (false) {
          * @return {?}
          */
         onRouterCancelled(event) {
+            // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
             if (this.context.interactionService.isActive()) {
                 /** @type {?} */
                 const interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -3760,6 +3778,7 @@ if (false) {
                 this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
             }
             else {
+                // this.replaceBuggeredUrlAfterAngularRouterCancells(this.start)
                 this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
             }
             return this.createIdleState();
@@ -3834,6 +3853,7 @@ if (false) {
          * @return {?}
          */
         onRouterCancelled(event) {
+            // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
             if (this.interactionService.isActive()) {
                 /** @type {?} */
                 const interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -3861,7 +3881,7 @@ if (false) {
          * @return {?}
          */
         createNavigationInteractionCancelledState(newUrl) {
-            return this.illegalTransition("Leaving interaction after pop-state should't block so should never see a back button click");
+            return this.illegalTransition('Leaving interaction after pop-state should\'t block so should never see a back button click');
         }
     }
     NavigationState.LeavingInteractionAfterPopStateTransition = LeavingInteractionAfterPopStateTransition;
@@ -3871,74 +3891,6 @@ if (false) {
         /** @type {?} */
         LeavingInteractionAfterPopStateTransition.prototype.poppedHistoryUrl;
     }
-    // See LeavingInteractionAfterPopStateTransition.createNavigationInteractionCancelledState(...) above.
-    //
-    // export class LeavingInteractionAfterPopStateCancelled extends NavigationState {
-    //
-    //   readonly isPopState = false;
-    //   firstCancelHandled = false;
-    //   popStateHandled = false;
-    //   popStateEventUrl: string;
-    //   debugPropertyKeys = ['idle', 'startingUrl', 'poppedHistoryUrl', 'locationChangeTriggerUrl', 'popStateEventUrl', 'firstCancelHandled', 'popStateHandled'];
-    //
-    //   constructor(context: Context,
-    //               readonly startingUrl: string,
-    //               readonly locationChangeTriggerUrl: string,
-    //               readonly poppedHistoryUrl: string) {
-    //     super(context);
-    //   }
-    //
-    //   get isTransitional() {
-    //     return true;
-    //   }
-    //
-    //   onRouterStarted(event: NavigationStart): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterCancelled(event: NavigationCancel): NavigationState {
-    //
-    //     // if (this.firstCancelHandled && this.popStateHandled) {
-    //     //   // Angular doesn't preserve the url when a guard cancels the back button.
-    //     //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //     //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-    //     //   this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
-    //     //   this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
-    //     //   if (this.interactionService.isActive()) {
-    //     //     const interactionIds = this.interactionService.activeInteractionContextIds.value;
-    //     //     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
-    //     //   } else {
-    //     //     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-    //     //   }
-    //     //   return this.createIdleState();
-    //     // } else {
-    //     //   this.firstCancelHandled = true;
-    //     return this.ignore(event);
-    //     // }
-    //   }
-    //
-    //
-    //   onRouterEnd(event: NavigationEnd): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterError(event: NavigationError): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onPopState(event: NavigationStart): NavigationState {
-    //     // this.popStateHandled = true;
-    //     // this.popStateEventUrl = event.url;
-    //     return this.ignore(event);
-    //   }
-    //
-    //   async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {
-    //     return false;
-    //   }
-    // }
     /**
      * This state handles the scenario where a link navigation triggered an interaction and the user clicked back a to cancel it.
      * The routing event sequence is different depending on the link that was clicked.
@@ -4038,7 +3990,7 @@ if (false) {
          */
         finaliseRouting() {
             Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-            this.resetBrowserLocation(this.clickedLinkUrl); // put the back click one back in.
+            this.replaceBuggeredUrlAfterAngularRouterCancelled(this.clickedLinkUrl); // put the back click one back in.
             if (this.interactionService.isActive()) {
                 /** @type {?} */
                 const interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -4130,7 +4082,13 @@ if (false) {
                 // Angular doesn't preserve the url when a guard cancels the back button.
                 // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
                 Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-                // this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
+                // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+                // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+                // it before the cancel event fired.
+                // So we need to:
+                // - replace the just inserted url with the one that used to be there.
+                // - push our actual url back onto the top of the stack.
+                this.replaceBuggeredUrlAfterAngularRouterCancelled(this.locationChangeTriggerUrl);
                 this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
                 if (this.interactionService.isActive()) {
                     /** @type {?} */
@@ -4730,10 +4688,17 @@ class PlaceRouter extends GarbageCollector {
     }
     /**
      * @param {?} url
+     * @param {?} options
+     * @return {?}
+     */
+    resetBrowserLocation(url, options) {
+        options.replaceCurrent ? this.angularLocation.replaceState(url) : this.angularLocation.go(url);
+    }
+    /**
      * @return {?}
      */
-    resetBrowserLocation(url) {
-        this.angularLocation.go(url);
+    forward() {
+        this.angularLocation.forward();
     }
     /**
      * @param {...?} visits