Skip to content

fix: use custom params from declarative masks when building the url #5756

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: use custom params from declarative masks when building the url #5756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20e3b3b
Use params from declarative masks
hakanshehu Nov 4, 2025
b4854d3
Add tests for masks
hakanshehu Nov 11, 2025
0b4f00c
Merge upstream/main into main
hakanshehu Nov 18, 2025
9c2a094
Include the necessary changes
hakanshehu Nov 18, 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
19 changes: 16 additions & 3 deletions packages/router-core/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,11 +1787,25 @@ export class RouterCore<
)
if (match) {
Object.assign(params, match.params) // Copy params, because they're cached
const { from: _from, ...maskProps } = match.route
const {
from: _from,
params: maskParams,
...maskProps
} = match.route

// If mask has a params function, call it with the matched params as context
// Otherwise, use the matched params or the provided params value
const nextParams =
maskParams === false || maskParams === null
? {}
: (maskParams ?? true) === true
? params
: Object.assign(params, functionalUpdate(maskParams, params))

maskedDest = {
from: opts.from,
...maskProps,
params,
params: nextParams,
}
maskedNext = build(maskedDest)
}
Expand Down Expand Up @@ -2096,7 +2110,6 @@ export class RouterCore<
updateMatch: this.updateMatch,
// eslint-disable-next-line @typescript-eslint/require-await
onReady: async () => {
// eslint-disable-next-line @typescript-eslint/require-await
// Wrap batch in framework-specific transition wrapper (e.g., Solid's startTransition)
this.startTransition(() => {
this.startViewTransition(async () => {
Expand Down
Loading
Loading