@tanstack/react-router 1.45.4 → 1.45.5

package/src/router.ts

@@ -1147,22 +1147,13 @@ export class Router<
       } = {},
       matches?: Array<MakeRouteMatch<TRouteTree>>,
     ): ParsedLocation => {
-      // if the router is loading the previous location is what
-      // we should use because the old matches are still around
-      // and the latest location has already been updated.
-      // If the router is not loading we should always use the
-      // latest location because resolvedLocation can lag behind
-      // and the new matches could already render
-      const currentLocation = this.state.isLoading
-        ? this.state.resolvedLocation
-        : this.latestLocation
-
-      const location = dest._fromLocation ?? currentLocation
-
-      let fromPath = location.pathname
-      let fromSearch = dest.fromSearch || location.search
-
-      const fromMatches = this.matchRoutes(location.pathname, fromSearch)
+      const fromMatches =
+        dest._fromLocation != null
+          ? this.matchRoutes(
+              dest._fromLocation.pathname,
+              dest.fromSearch || dest._fromLocation.search,
+            )
+          : this.state.matches
 
       const fromMatch =
         dest.from != null
@@ -1175,14 +1166,14 @@ export class Router<
             )
           : undefined
 
-      fromPath = fromMatch?.pathname || fromPath
+      const fromPath = fromMatch?.pathname || this.latestLocation.pathname
 
       invariant(
         dest.from == null || fromMatch != null,
         'Could not find match for from: ' + dest.from,
       )
 
-      fromSearch = last(fromMatches)?.search || this.latestLocation.search
+      const fromSearch = last(fromMatches)?.search || this.latestLocation.search
 
       const stayingMatches = matches?.filter((d) =>
         fromMatches.find((e) => e.routeId === d.routeId),