@tanstack/react-router 1.45.4 → 1.45.5

package/dist/cjs/router.cjs

@@ -394,11 +394,10 @@ class Router {
     this.buildLocation = (opts) => {
       const build = (dest = {}, matches) => {
         var _a, _b, _c;
-        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 ? fromMatches.find(
           (d) => path.matchPathname(this.basepath, path.trimPathRight(d.pathname), {
             to: dest.from,
@@ -406,12 +405,12 @@ class Router {
             fuzzy: false
           })
         ) : void 0;
-        fromPath = (fromMatch == null ? void 0 : fromMatch.pathname) || fromPath;
+        const fromPath = (fromMatch == null ? void 0 : fromMatch.pathname) || this.latestLocation.pathname;
         invariant(
           dest.from == null || fromMatch != null,
           "Could not find match for from: " + dest.from
         );
-        fromSearch = ((_a = utils.last(fromMatches)) == null ? void 0 : _a.search) || this.latestLocation.search;
+        const fromSearch = ((_a = utils.last(fromMatches)) == null ? void 0 : _a.search) || this.latestLocation.search;
         const stayingMatches = matches == null ? void 0 : matches.filter(
           (d) => fromMatches.find((e) => e.routeId === d.routeId)
         );