@tanstack/react-router 1.31.16 → 1.31.19

package/src/router.ts

@@ -11,6 +11,7 @@ import {
   functionalUpdate,
   last,
   pick,
+  removeLayoutSegments,
   replaceEqualDeep,
 } from './utils'
 import { getRouteMatch } from './RouterProvider'
@@ -935,12 +936,17 @@ export class Router<
         fromMatches.find((e) => e.routeId === d.routeId),
       )
 
+      const fromRouteByFromPath = stayingMatches?.find(
+        (d) => d.pathname === fromPath,
+      )
+
       let pathname = dest.to
         ? this.resolvePathWithBase(fromPath, `${dest.to}`)
         : this.resolvePathWithBase(
             fromPath,
-            stayingMatches?.find((d) => d.pathname === fromPath)?.routeId ||
-              fromPath,
+            fromRouteByFromPath
+              ? removeLayoutSegments(fromRouteByFromPath.routeId)
+              : fromPath,
           )
 
       const prevParams = { ...last(fromMatches)?.params }

package/src/utils.ts

@@ -339,3 +339,17 @@ export function createControlledPromise<T>(onResolve?: () => void) {
 
   return controlledPromise
 }
+
+/**
+ * Removes all segments from a given path that start with an underscore ('_').
+ *
+ * @param {string} routePath - The path from which to remove segments. Defaults to '/'.
+ * @returns {string} The path with all underscore-prefixed segments removed.
+ * @example
+ * removeLayoutSegments('/workspace/_auth/foo') // '/workspace/foo'
+ */
+export function removeLayoutSegments(routePath: string): string {
+  const segments = routePath.split('/')
+  const newSegments = segments.filter((segment) => !segment.startsWith('_'))
+  return newSegments.join('/')
+}