apply code rabbit suggestions

Author: nlynzaad

packages/react-router/src/link.tsx

@@ -131,6 +131,7 @@ export function useLinkProps<
       options.state,
       options.mask,
       options.unsafeRelative,
+      getFrom,
     ],
   )
 
@@ -220,6 +221,7 @@ export function useLinkProps<
       options.replace,
       options.resetScroll,
       options.viewTransition,
+      getFrom
     ],
   )
 

packages/react-router/src/useNavigate.tsx

@@ -42,7 +42,7 @@ export function useNavigate<
       })
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [_defaultOpts?.from, router.navigate, router.latestLocation],
+    [_defaultOpts?.from, router.navigate, router.latestLocation, matchIndex],
   ) as UseNavigateResult<TDefaultFrom>
 }
 

packages/react-router/tests/link.test.tsx

@@ -5682,7 +5682,7 @@ describe('relative links to current route', () => {
 
       await act(() => fireEvent.click(secondPostButton))
 
-      // expect(await screen.findByTestId('post-id2')).toBeInTheDocument()
+      expect(await screen.findByTestId('post-id2')).toBeInTheDocument()
       expect(window.location.pathname).toEqual(`/posts/id2${tail}`)
     },
   )
@@ -5934,7 +5934,7 @@ describe('relative links to from route', () => {
       expect(
         await screen.findByTestId('post-detail-index-heading'),
       ).toBeInTheDocument()
-      expect(screen.queryByTestId("'post-info-heading")).not.toBeInTheDocument()
+      expect(screen.queryByTestId('post-info-heading')).not.toBeInTheDocument()
       expect(window.location.pathname).toEqual(`/posts/1${tail}`)
 
       const postNotesButton = await screen.findByTestId('post-notes-link')
@@ -5956,10 +5956,10 @@ describe('relative links to from route', () => {
         await screen.findByTestId('posts-index-heading'),
       ).toBeInTheDocument()
       expect(
-        screen.queryByTestId("'post-notes-heading"),
+        screen.queryByTestId('post-notes-heading'),
       ).not.toBeInTheDocument()
       expect(
-        screen.queryByTestId("'post-detail-index-heading"),
+        screen.queryByTestId('post-detail-index-heading'),
       ).not.toBeInTheDocument()
       expect(window.location.pathname).toEqual(`/posts${tail}`)
 

packages/react-router/tests/useNavigate.test.tsx

@@ -1623,7 +1623,7 @@ describe('relative navigate to current route', () => {
       })
 
       const PostsComponent = () => {
-        const navigate = postsRoute.useNavigate()
+        const navigate = useNavigate()
         return (
           <>
             <h1 data-testid="posts-index-heading">Posts</h1>
@@ -2092,7 +2092,7 @@ describe('relative navigate to from route', () => {
       expect(
         await screen.findByTestId('post-detail-index-heading'),
       ).toBeInTheDocument()
-      expect(screen.queryByTestId("'post-info-heading")).not.toBeInTheDocument()
+      expect(screen.queryByTestId('post-info-heading')).not.toBeInTheDocument()
       expect(window.location.pathname).toEqual(`/posts/1${tail}`)
 
       const postNotesButton = await screen.findByTestId('post-notes-btn')
@@ -2112,10 +2112,10 @@ describe('relative navigate to from route', () => {
         await screen.findByTestId('posts-index-heading'),
       ).toBeInTheDocument()
       expect(
-        screen.queryByTestId("'post-notes-heading"),
+        screen.queryByTestId('post-notes-heading'),
       ).not.toBeInTheDocument()
       expect(
-        screen.queryByTestId("'post-detail-index-heading"),
+        screen.queryByTestId('post-detail-index-heading'),
       ).not.toBeInTheDocument()
       expect(window.location.pathname).toEqual(`/posts${tail}`)
 

packages/router-core/src/router.ts

@@ -1415,6 +1415,10 @@ export class RouterCore<
         _buildLocation: true,
       })
 
+      // Now let's find the starting pathname
+      // This should default to the current location if no from is provided
+      const lastMatch = last(allCurrentLocationMatches)!
+
       // check that from path exists in the current route tree
       // do this check only on navigations during test or development
       if (
@@ -1432,7 +1436,7 @@ export class RouterCore<
           })
 
           const matchedCurrent = findLast(allFromMatches, (d) => {
-            return comparePaths(d.fullPath, currentLocation.pathname)
+            return comparePaths(d.fullPath, lastMatch.fullPath)
           })
 
         // for from to be invalid it shouldn't just be unmatched to currentLocation
@@ -1442,10 +1446,6 @@ export class RouterCore<
         }
       }
 
-      // Now let's find the starting pathname
-      // This should default to the current location if no from is provided
-      const lastMatch = last(allCurrentLocationMatches)!
-
       const defaultedFromPath =
         dest.unsafeRelative === 'path'
           ? currentLocation.pathname

packages/solid-router/src/link.tsx

@@ -145,8 +145,10 @@ export function useLinkProps<
     select: (match) => match.index,
   })
 
+  const activeLocation = useRouterState({ select: (s) => s.location })
+
   const _options = () => {
-    const currentRouteMatches = router.matchRoutes(router.latestLocation, {
+    const currentRouteMatches = router.matchRoutes(activeLocation(), {
       _buildLocation: false,
     })
 
@@ -163,6 +165,8 @@ export function useLinkProps<
 
   const next = Solid.createMemo(() => {
     currentSearch()
+    // Access activeLocation to make this memo re-run on route changes
+    activeLocation()
     return router.buildLocation(_options() as any)
   })
 

packages/solid-router/tests/link.test.tsx

@@ -5137,7 +5137,7 @@ describe('relative links to from route', () => {
           screen.queryByTestId('post-detail-index-heading'),
         ).toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-info-heading"),
+          screen.queryByTestId('post-info-heading'),
         ).not.toBeInTheDocument()
         expect(window.location.pathname).toEqual(`/posts/1${tail}`)
       })
@@ -5160,10 +5160,10 @@ describe('relative links to from route', () => {
       await waitFor(() => {
         expect(screen.queryByTestId('posts-index-heading')).toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-notes-heading"),
+          screen.queryByTestId('post-notes-heading'),
         ).not.toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-detail-index-heading"),
+          screen.queryByTestId('post-detail-index-heading'),
         ).not.toBeInTheDocument()
         expect(window.location.pathname).toEqual(`/posts${tail}`)
       })

packages/solid-router/tests/useNavigate.test.tsx

@@ -32,6 +32,7 @@ beforeEach(() => {
 })
 
 afterEach(() => {
+  history.destroy()
   window.history.replaceState(null, 'root', '/')
   cleanup()
 })
@@ -2072,7 +2073,7 @@ describe('relative navigate to from route', () => {
           screen.queryByTestId('post-detail-index-heading'),
         ).toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-info-heading"),
+          screen.queryByTestId('post-info-heading'),
         ).not.toBeInTheDocument()
         expect(window.location.pathname).toEqual(`/posts/1${tail}`)
       })
@@ -2093,10 +2094,10 @@ describe('relative navigate to from route', () => {
       await waitFor(() => {
         expect(screen.queryByTestId('posts-index-heading')).toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-notes-heading"),
+          screen.queryByTestId('post-notes-heading'),
         ).not.toBeInTheDocument()
         expect(
-          screen.queryByTestId("'post-detail-index-heading"),
+          screen.queryByTestId('post-detail-index-heading'),
         ).not.toBeInTheDocument()
         expect(window.location.pathname).toEqual(`/posts${tail}`)
       })