@tanstack/react-router 1.5.1 → 1.5.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.5.1"
+    "@tanstack/history": "1.5.3"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/router.ts

@@ -708,13 +708,19 @@ export class Router<
       } = {},
       matches?: AnyRouteMatch[],
     ): ParsedLocation => {
-      const from = this.latestLocation
       const fromSearch =
         (this.state.pendingMatches || this.state.matches).reverse()[0]
-          ?.search || from.search
-      let pathname = this.resolvePathWithBase(from.pathname, `${dest.to ?? ''}`)
+          ?.search || this.latestLocation.search
 
-      const fromMatches = this.matchRoutes(from.pathname, fromSearch)
+      let pathname = this.resolvePathWithBase(
+        dest.from ?? this.latestLocation.pathname,
+        `${dest.to ?? ''}`,
+      )
+
+      const fromMatches = this.matchRoutes(
+        this.latestLocation.pathname,
+        fromSearch,
+      )
       const stayingMatches = matches?.filter(
         (d) => fromMatches?.find((e) => e.routeId === d.routeId),
       )
@@ -786,21 +792,21 @@ export class Router<
 
       const hash =
         dest.hash === true
-          ? from.hash
+          ? this.latestLocation.hash
           : dest.hash
-            ? functionalUpdate(dest.hash!, from.hash)
+            ? functionalUpdate(dest.hash!, this.latestLocation.hash)
             : undefined
 
       const hashStr = hash ? `#${hash}` : ''
 
       let nextState =
         dest.state === true
-          ? from.state
+          ? this.latestLocation.state
           : dest.state
-            ? functionalUpdate(dest.state, from.state)
-            : from.state
+            ? functionalUpdate(dest.state, this.latestLocation.state)
+            : this.latestLocation.state
 
-      nextState = replaceEqualDeep(from.state, nextState)
+      nextState = replaceEqualDeep(this.latestLocation.state, nextState)
 
       return {
         pathname,