Skip to content

refactor(router-core): no validateSearch in buildLocation #6979

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

Open
Sheraff wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(router-core): no validateSearch in buildLocation #6979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0af5ff
refactor(router-core): no validateSearch in buildLocation
Sheraff Mar 19, 2026
9c41ff7
Merge branch 'main' into refactor-router-core-no-search-validation-in…
Sheraff Mar 20, 2026
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
15 changes: 1 addition & 14 deletions packages/router-core/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,19 +1699,6 @@ export class RouterCore<
// _includeValidateSearch: true,
// })

// Accumulate search validation through route chain
const accumulatedSearch = { ...location.search }
for (const route of matchedRoutes) {
try {
Object.assign(
accumulatedSearch,
validateSearch(route.options.validateSearch, accumulatedSearch),
)
} catch {
// Ignore errors, we're not actually routing
}
}

// Determine params: reuse from state if possible, otherwise parse
const lastStateMatchId = last(this.stores.matchesId.state)
const lastStateMatch =
Expand Down Expand Up @@ -1749,7 +1736,7 @@ export class RouterCore<
return {
matchedRoutes,
fullPath: lastRoute.fullPath,
search: accumulatedSearch,
search: location.search,
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep validated search when reusing current search

This drops the route-validated/defaulted search state whenever a caller preserves or updates the current search (search: true or search: prev => ...). buildLocation callers like the framework Link components (packages/react-router/src/link.tsx:418-419) and redirects (packages/router-core/src/router.ts:2711-2714) do not pass _includeValidateSearch, so they now see the raw parsed query instead of the validated one. In the redirect scenario covered by packages/react-router/tests/link.test.tsx:3948-4019, the callback should receive { postPage: 0 } from the current route's validateSearch, but after this change it receives {}, so links/redirects to routes that do not reintroduce the same validator lose existing defaulted params and generate the wrong URL/search state.

Useful? React with 👍 / 👎.

params,
}
}
Expand Down
Loading