Skip to content

Remove matchRoutes optimization from render pass #13562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 16, 2025
Merged

Remove matchRoutes optimization from render pass #13562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c62122
Remove matchRoutes optimization from render pass
brophdawg11 May 8, 2025
4ccb337
Add changeset
brophdawg11 May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/flat-seas-own.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-router": patch
---

Partially revert optimization added in `7.1.4` to reduce calls to `matchRoutes` because it surfaced other issues
15 changes: 2 additions & 13 deletions packages/react-router/lib/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import type {
} from "./router/router";
import { IDLE_BLOCKER } from "./router/router";
import type {
AgnosticRouteMatch,
ParamParseKey,
Params,
PathMatch,
Expand Down Expand Up @@ -445,7 +444,7 @@ export function useRoutesImpl(
`useRoutes() may be used only in the context of a <Router> component.`
);

let { navigator, static: isStatic } = React.useContext(NavigationContext);
let { navigator } = React.useContext(NavigationContext);
let { matches: parentMatches } = React.useContext(RouteContext);
let routeMatch = parentMatches[parentMatches.length - 1];
let parentParams = routeMatch ? routeMatch.params : {};
Expand Down Expand Up @@ -532,17 +531,7 @@ export function useRoutesImpl(
remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
}

// Use data router matches when available to avoid another match routes call.
// Skip this during SSR because the matches coming in from StaticHandlerContext
// might be UI agnostic and we want the matches from the createStaticRouter's
// routes
let matches =
!isStatic &&
dataRouterState &&
dataRouterState.matches &&
dataRouterState.matches.length > 0
? (dataRouterState.matches as AgnosticRouteMatch<string, RouteObject>[])
: matchRoutes(routes, { pathname: remainingPathname });
let matches = matchRoutes(routes, { pathname: remainingPathname });

if (ENABLE_DEV_WARNINGS) {
warning(
Expand Down
Loading