From 5f742fe8e1c98455f9b8ca9fad8b7ed6bd2b105e Mon Sep 17 00:00:00 2001
From: Andrew Scott <atscott@google.com>
Date: Tue, 12 Sep 2023 12:18:34 -0700
Subject: [PATCH] fixup! refactor(router): Remove internal state tracking for
 browserUrlTree

---
 packages/router/src/navigation_transition.ts | 54 ++++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/packages/router/src/navigation_transition.ts b/packages/router/src/navigation_transition.ts
index 63abe8d86cbcf4..aae002571cc835 100644
--- a/packages/router/src/navigation_transition.ts
+++ b/packages/router/src/navigation_transition.ts
@@ -393,28 +393,8 @@ export class NavigationTransitions {
                            };
                          }),
                          switchMap(t => {
-                           // TODO(atscott): The serializer should really be used instead of
-                           // `UrlTree.toString()`. Custom serializers are often written to handle
-                           // things better than the default one (objects, for example will be
-                           // [Object object] with the custom serializer and be "the same" when they
-                           // aren't).
-
-                           // We're navigating to somewhere that is not what the Router is
-                           // currently set to.
-                           const updatingInternalState =
-                               t.extractedUrl.toString() !== t.currentUrlTree.toString();
-
-                           // We're updating the browser URL to something new (navigation is going
-                           // to somewhere not displayed in the URL bar and we will update the URL
-                           // bar if navigation succeeds)
-                           const extractedBrowserUrl = this.urlHandlingStrategy.extract(
-                               this.urlSerializer.parse(this.location.path(true)));
-                           const updatingBrowserUrl =
-                               extractedBrowserUrl.toString() !== t.extractedUrl.toString() &&
-                               !t.extras.skipLocationChange;
-
-                           const urlTransition =
-                               !router.navigated || updatingBrowserUrl || updatingInternalState;
+                           const urlTransition = !router.navigated ||
+                               this.isUpdatingInternalState() || this.isUpdatedBrowserUrl();
 
                            const onSameUrlNavigation =
                                t.extras.onSameUrlNavigation ?? router.onSameUrlNavigation;
@@ -739,6 +719,36 @@ export class NavigationTransitions {
     this.events.next(navCancel);
     t.resolve(false);
   }
+
+  /**
+   * @returns Whether we're navigating to somewhere that is not what the Router is
+   * currently set to.
+   */
+  private isUpdatingInternalState() {
+    // TODO(atscott): The serializer should likely be used instead of
+    // `UrlTree.toString()`. Custom serializers are often written to handle
+    // things better than the default one (objects, for example will be
+    // [Object object] with the custom serializer and be "the same" when they
+    // aren't).
+    // (Same for isUpdatedBrowserUrl)
+    return this.currentTransition?.extractedUrl.toString() !==
+        this.currentTransition?.currentUrlTree.toString();
+  }
+
+  /**
+   * @returns Whether we're updating the browser URL to something new (navigation is going
+   * to somewhere not displayed in the URL bar and we will update the URL
+   * bar if navigation succeeds).
+   */
+  private isUpdatedBrowserUrl() {
+    // The extracted URL is the part of the URL that this application cares about. `extract` may
+    // return only part of the browser URL and that part may have not changed even if some other
+    // portion of the URL did.
+    const extractedBrowserUrl =
+        this.urlHandlingStrategy.extract(this.urlSerializer.parse(this.location.path(true)));
+    return extractedBrowserUrl.toString() !== this.currentTransition?.extractedUrl.toString() &&
+        !this.currentTransition?.extras.skipLocationChange;
+  }
 }
 
 export function isBrowserTriggeredNavigation(source: NavigationTrigger) {