fix: Revert "fix: from was being ignored when the pathname included…

… params or a pathless route (#1703)" (#1716) This reverts commit 56a3100. # Conflicts: # packages/react-router/tests/link.test.tsx
TanStack · Jun 6, 2024 · e82984b · e82984b
1 parent 3bd1cdf
commit e82984b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1,590 deletions.
diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx
@@ -598,6 +598,7 @@ export function useLinkProps<
   // null for LinkUtils
 
   const dest = {
+    ...(options.to && { from: matchPathname }),
     ...options,
   }
 

diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts
@@ -1102,27 +1102,14 @@ export class Router<
     ): ParsedLocation => {
       let fromPath = this.latestLocation.pathname
       let fromSearch = dest.fromSearch || this.latestLocation.search
-      const looseRoutesByPath = this.routesByPath as Record<string, AnyRoute>
-
-      const fromRoute =
-        dest.from !== undefined
-          ? looseRoutesByPath[trimPathRight(dest.from)]
-          : undefined
 
       const fromMatches = this.matchRoutes(
         this.latestLocation.pathname,
         fromSearch,
       )
 
-      const fromMatch = fromMatches.find((d) => d.routeId === fromRoute?.id)
-
-      fromPath = fromMatch?.pathname || fromPath
-
-      invariant(
-        dest.from == null || fromMatch != null,
-        'Could not find match for from: ' + dest.from,
-      )
-
+      fromPath =
+        fromMatches.find((d) => d.id === dest.from)?.pathname || fromPath
       fromSearch = last(fromMatches)?.search || this.latestLocation.search
 
       const stayingMatches = matches?.filter((d) =>
@@ -1786,7 +1773,8 @@ export class Router<
                     preload: !!preload,
                     context: parentContext,
                     location,
-                    navigate: (opts: any) => this.navigate({ ...opts }),
+                    navigate: (opts: any) =>
+                      this.navigate({ ...opts, from: match.pathname }),
                     buildLocation: this.buildLocation,
                     cause: preload ? 'preload' : match.cause,
                   })) ?? ({} as any)
@@ -1839,7 +1827,8 @@ export class Router<
                   abortController: match.abortController,
                   context: match.context,
                   location,
-                  navigate: (opts) => this.navigate({ ...opts } as any),
+                  navigate: (opts) =>
+                    this.navigate({ ...opts, from: match.pathname } as any),
                   cause: preload ? 'preload' : match.cause,
                   route,
                 }

diff --git a/packages/react-router/src/useNavigate.tsx b/packages/react-router/src/useNavigate.tsx
@@ -29,6 +29,7 @@ export function useNavigate<
     (options: NavigateOptions) => {
       return router.navigate({
         ...options,
+        from: options.to ? router.state.resolvedLocation.pathname : undefined,
       })
     },
     [router],
@@ -62,6 +63,7 @@ export function Navigate<
 
   React.useEffect(() => {
     navigate({
+      from: props.to ? match.pathname : undefined,
       ...props,
     } as any)
     // eslint-disable-next-line react-hooks/exhaustive-deps