@tanstack/react-router 1.51.6 → 1.51.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.51.6",
+  "version": "1.51.8",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "@tanstack/react-store": "^0.5.5",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.51.6"
+    "@tanstack/history": "1.51.7"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.4.8",

package/src/Matches.tsx

@@ -4,14 +4,10 @@ import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'
 import { Transitioner } from './Transitioner'
-import {
-  type AnyRoute,
-  type ReactNode,
-  type StaticDataRouteOption,
-} from './route'
 import { matchContext } from './matchContext'
 import { Match } from './Match'
 import { SafeFragment } from './SafeFragment'
+import type { AnyRoute, ReactNode, StaticDataRouteOption } from './route'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { ResolveRelativePath, ToOptions } from './link'
 import type {

package/src/qss.ts

@@ -68,6 +68,7 @@ export function decode(str: any, pfx?: string) {
     const equalIndex = tmp.indexOf('=')
     if (equalIndex !== -1) {
       k = tmp.slice(0, equalIndex)
+      k = decodeURIComponent(k)
       const value = tmp.slice(equalIndex + 1)
       if (out[k] !== void 0) {
         // @ts-expect-error
@@ -77,6 +78,7 @@ export function decode(str: any, pfx?: string) {
       }
     } else {
       k = tmp
+      k = decodeURIComponent(k)
       out[k] = ''
     }
   }

package/src/router.ts

@@ -492,7 +492,6 @@ export interface BuildNextOptions {
     unmaskOnReload?: boolean
   }
   from?: string
-  fromSearch?: unknown
   _fromLocation?: ParsedLocation
 }
 
@@ -1304,13 +1303,9 @@ export class Router<
       } = {},
       matches?: Array<MakeRouteMatch<TRouteTree>>,
     ): ParsedLocation => {
-      const fromMatches =
-        dest._fromLocation != null
-          ? this.matchRoutes({
-              ...dest._fromLocation,
-              search: dest.fromSearch || dest._fromLocation.search,
-            })
-          : this.state.matches
+      const fromMatches = dest._fromLocation
+        ? this.matchRoutes(dest._fromLocation)
+        : this.state.matches
 
       const fromMatch =
         dest.from != null
@@ -1330,7 +1325,9 @@ export class Router<
         'Could not find match for from: ' + dest.from,
       )
 
-      const fromSearch = last(fromMatches)?.search || this.latestLocation.search
+      const fromSearch = this.state.pendingMatches
+        ? last(this.state.pendingMatches)?.search
+        : last(fromMatches)?.search || this.latestLocation.search
 
       const stayingMatches = matches?.filter((d) =>
         fromMatches.find((e) => e.routeId === d.routeId),