Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions packages/router-core/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1805,6 +1805,7 @@ export class RouterCore<
const interpolatedNextTo = interpolatePath({
path: nextTo,
params: nextParams,
decoder: this.pathParamsDecoder,
server: this.isServer,
}).interpolatedPath

Expand Down Expand Up @@ -1833,11 +1834,13 @@ export class RouterCore<
}

// If there are any params, we need to stringify them
let changedParams = false
if (Object.keys(nextParams).length > 0) {
for (const route of destRoutes) {
const fn =
route.options.params?.stringify ?? route.options.stringifyParams
if (fn) {
changedParams = true
Object.assign(nextParams, fn(nextParams))
}
}
Expand All @@ -1848,12 +1851,14 @@ export class RouterCore<
// This preserves the original parameter syntax including optional parameters
nextTo
: decodePath(
interpolatePath({
path: nextTo,
params: nextParams,
decoder: this.pathParamsDecoder,
server: this.isServer,
}).interpolatedPath,
!changedParams
? interpolatedNextTo
: interpolatePath({
path: nextTo,
params: nextParams,
decoder: this.pathParamsDecoder,
server: this.isServer,
}).interpolatedPath,
)

// Resolve the next search
Expand Down
Loading