Skip to content

Core: Support array-based catch-all Next.js route segments in AppRouterProvider #31524

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
valentinpalkovic merged 3 commits into from
Jun 23, 2025
Merged

Core: Support array-based catch-all Next.js route segments in AppRouterProvider #31524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f4ef6c
fix(nextjs): support array params in Storybook Next.js addon for useP…
yatishgoel May 21, 2025
680de70
Merge branch 'next' into fix/storybook-nextjs-array-params
yatishgoel May 22, 2025
3ef9c74
Merge branch 'next' into fix/storybook-nextjs-array-params
valentinpalkovic Jun 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
31 changes: 28 additions & 3 deletions code/frameworks/nextjs-vite/src/routing/app-router-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function getSelectedParams(currentTree: FlightRouterState, params: Params = {}):
const isCatchAll = isDynamicParameter && (segment[2] === 'c' || segment[2] === 'oc');

if (isCatchAll) {
params[segment[0]] = segment[1].split('/');
params[segment[0]] = Array.isArray(segment[1]) ? segment[1] : segment[1].split('/');
Comment thread
yatishgoel marked this conversation as resolved.
} else if (isDynamicParameter) {
params[segment[0]] = segment[1];
}
Expand Down Expand Up @@ -77,8 +77,33 @@ export const AppRouterProvider: React.FC<React.PropsWithChildren<AppRouterProvid

const tree: FlightRouterState = [pathname, { children: getParallelRoutes([...segments]) }];
const pathParams = useMemo(() => {
return getSelectedParams(tree);
}, [tree]);
const params: Params = {};
const currentSegments = routeParams.segments;

if (currentSegments) {
if (Array.isArray(currentSegments)) {
for (const segmentEntry of currentSegments) {
if (
Array.isArray(segmentEntry) &&
segmentEntry.length === 2 &&
typeof segmentEntry[0] === 'string'
) {
const key: string = segmentEntry[0];
const value = segmentEntry[1] as string | string[] | undefined;
params[key] = value;
}
}
} else if (typeof currentSegments === 'object' && !Array.isArray(currentSegments)) {
const segmentObject = currentSegments as Record<string, string | string[] | undefined>;
for (const key in segmentObject) {
if (Object.prototype.hasOwnProperty.call(segmentObject, key)) {
params[key] = segmentObject[key];
}
}
}
}
return params;
}, [routeParams.segments]);

const newLazyCacheNode = {
lazyData: null,
Expand Down
31 changes: 28 additions & 3 deletions code/frameworks/nextjs/src/routing/app-router-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function getSelectedParams(currentTree: FlightRouterState, params: Params = {}):
const isCatchAll = isDynamicParameter && (segment[2] === 'c' || segment[2] === 'oc');

if (isCatchAll) {
params[segment[0]] = segment[1].split('/');
params[segment[0]] = Array.isArray(segment[1]) ? segment[1] : segment[1].split('/');
} else if (isDynamicParameter) {
params[segment[0]] = segment[1];
}
Expand Down Expand Up @@ -77,8 +77,33 @@ export const AppRouterProvider: React.FC<React.PropsWithChildren<AppRouterProvid

const tree: FlightRouterState = [pathname, { children: getParallelRoutes([...segments]) }];
const pathParams = useMemo(() => {
return getSelectedParams(tree);
}, [tree]);
const params: Params = {};
const currentSegments = routeParams.segments;

if (currentSegments) {
if (Array.isArray(currentSegments)) {
for (const segmentEntry of currentSegments) {
if (
Array.isArray(segmentEntry) &&
segmentEntry.length === 2 &&
typeof segmentEntry[0] === 'string'
) {
const key: string = segmentEntry[0];
const value = segmentEntry[1] as string | string[] | undefined;
params[key] = value;
}
}
} else if (typeof currentSegments === 'object' && !Array.isArray(currentSegments)) {
Comment thread
yatishgoel marked this conversation as resolved.
const segmentObject = currentSegments as Record<string, string | string[] | undefined>;
for (const key in segmentObject) {
if (Object.prototype.hasOwnProperty.call(segmentObject, key)) {
params[key] = segmentObject[key];
}
}
}
}
return params;
}, [routeParams.segments]);

const newLazyCacheNode = {
lazyData: null,
Expand Down
Loading