fix: Params flash undefined on specific route progression

Fixes #889
TanStack · Dec 28, 2023 · 998861c · 998861c
1 parent 14e15fa
commit 998861c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx
@@ -283,7 +283,7 @@ export function MatchRoute<
   return !!params ? props.children : null
 }
 
-function getRenderedMatches(state: RouterState) {
+export function getRenderedMatches(state: RouterState) {
   return state.pendingMatches?.some((d) => d.showPending)
     ? state.pendingMatches
     : state.matches

diff --git a/packages/react-router/src/useParams.tsx b/packages/react-router/src/useParams.tsx
@@ -4,6 +4,7 @@ import { RegisteredRouter } from './router'
 import { last } from './utils'
 import { useRouterState } from './RouterProvider'
 import { StrictOrFrom } from './utils'
+import { getRenderedMatches } from './Matches'
 
 export function useParams<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
@@ -18,7 +19,7 @@ export function useParams<
 ): TSelected {
   return useRouterState({
     select: (state: any) => {
-      const params = (last(state.matches) as any)?.params
+      const params = (last(getRenderedMatches(state)) as any)?.params
       return opts?.select ? opts.select(params) : params
     },
   })