@tanstack/router-core 1.157.8 → 1.157.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.157.8",
+  "version": "1.157.10",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/router.ts

@@ -1805,6 +1805,7 @@ export class RouterCore<
       const interpolatedNextTo = interpolatePath({
         path: nextTo,
         params: nextParams,
+        decoder: this.pathParamsDecoder,
         server: this.isServer,
       }).interpolatedPath
 
@@ -1820,24 +1821,18 @@ export class RouterCore<
           destMatchResult.routeParams['**']
         : trimPathRight(interpolatedNextTo)
 
-      let globalNotFoundRouteId: string | undefined
-      if (isGlobalNotFound) {
-        if (this.options.notFoundRoute) {
-          destRoutes = [...destRoutes, this.options.notFoundRoute]
-        } else {
-          globalNotFoundRouteId = findGlobalNotFoundRouteId(
-            this.options.notFoundMode,
-            destRoutes,
-          )
-        }
+      if (isGlobalNotFound && this.options.notFoundRoute) {
+        destRoutes = [...destRoutes, this.options.notFoundRoute]
       }
 
       // If there are any params, we need to stringify them
+      let changedParams = false
       if (Object.keys(nextParams).length > 0) {
         for (const route of destRoutes) {
           const fn =
             route.options.params?.stringify ?? route.options.stringifyParams
           if (fn) {
+            changedParams = true
             Object.assign(nextParams, fn(nextParams))
           }
         }
@@ -1848,12 +1843,14 @@ export class RouterCore<
           // This preserves the original parameter syntax including optional parameters
           nextTo
         : decodePath(
-            interpolatePath({
-              path: nextTo,
-              params: nextParams,
-              decoder: this.pathParamsDecoder,
-              server: this.isServer,
-            }).interpolatedPath,
+            !changedParams
+              ? interpolatedNextTo
+              : interpolatePath({
+                  path: nextTo,
+                  params: nextParams,
+                  decoder: this.pathParamsDecoder,
+                  server: this.isServer,
+                }).interpolatedPath,
           )
 
       // Resolve the next search