Core: Support array-based catch-all Next.js route segments in AppRouterProvider#31524
Merged
valentinpalkovic merged 3 commits intoJun 23, 2025
Merged
Conversation
…arams (catch-all routes)\n\n- Allow array values in navigation.segments for useParams in stories\n- Improve type safety, avoid any\n- Support both array and object segment formats\n- Fixes issue with catch-all/optional catch-all dynamic routes in stories
Contributor
There was a problem hiding this comment.
2 file(s) reviewed, 2 comment(s)
Edit PR Review Bot Settings | Greptile
|
View your CI Pipeline Execution ↗ for commit 3ef9c74.
☁️ Nx Cloud last updated this comment at |
Contributor
|
Hi @yatishgoel, Thank you for your PR! Much appreciated! Could you please add some stories in code/frameworks/nextjs/template/stories/Navigation.stories.tsx and code/frameworks/nextjs-vite/template/stories/Navigation.stories.tsx so that we can easily verify its functionality? |
This was referenced Jun 23, 2025
Merged
ghengeveld
pushed a commit
that referenced
this pull request
Jun 24, 2025
…params Core: Support array-based catch-all Next.js route segments in AppRouterProvider (cherry picked from commit fe82494)
This was referenced Aug 18, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #31523
What I did
This PR fixes an issue where the Next.js framework addon (for both Webpack and Vite) did not correctly handle array values for route parameters when using the App Router (
appDirectory: true). Specifically, components usinguseParams()for catch-all or optional catch-all routes (e.g.,[[...slug]]or[...slug]) would not receive the parameter as an array if specified as such in the story'sparameters.nextjs.navigation.segments.The
AppRouterProviderhas been updated to:parameters.nextjs.navigation.segmentsto construct thepathParamsobject provided toPathParamsContext.segmentsdefined as an array of[key, value]tuples (e.g.,[['directories', ['a', 'b']]]).segmentsdefined as an object (e.g.,{ directories: ['a', 'b'] }), enhancing flexibility.valuefor a parameter is an array, it is preserved as an array, allowinguseParams()to receive it correctly.The
getSelectedParamsutility function was also made more robust to handle cases where a segment value within theFlightRouterStatemight already be an array, preventing potential runtime errors.This change enables stories to accurately mock and test components that rely on array-based route parameters from Next.js's dynamic routing.
Checklist for Contributors
Testing
The changes in this PR are covered in the following automated tests:
Manual testing
This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!
Generate a Next.js sandbox
cd storybook yarn task --task sandbox --template nextjs/default-tsStart the sandbox in development mode
Add a test component
Create
src/components/TestComponent.tsxinside the sandbox:Add a corresponding story
Create
src/stories/TestComponent.stories.tsx:Verify in Storybook
<div data-testid="items">renders["one","two","three"].Documentation
MIGRATION.MD
Checklist for Maintainers
When this PR is ready for testing, make sure to add
ci:normal,ci:mergedorci:dailyGH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found incode/lib/cli-storybook/src/sandbox-templates.tsMake sure this PR contains one of the labels below:
Available labels
bug: Internal changes that fixes incorrect behavior.maintenance: User-facing maintenance tasks.dependencies: Upgrading (sometimes downgrading) dependencies.build: Internal-facing build tooling & test updates. Will not show up in release changelog.cleanup: Minor cleanup style change. Will not show up in release changelog.documentation: Documentation only changes. Will not show up in release changelog.feature request: Introducing a new feature.BREAKING CHANGE: Changes that break compatibility in some way with current major version.other: Changes that don't fit in the above categories.🦋 Canary release
This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the
@storybookjs/coreteam here.core team members can create a canary release here or locally with
gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>Greptile Summary
Enhanced AppRouterProvider to properly handle array-based catch-all route segments in Next.js, ensuring correct parameter handling for dynamic routes like
[...slug]and[[...slug]].getSelectedParamsincode/frameworks/nextjs/src/routing/app-router-provider.tsxto handle pre-existing array segment valuespathParamsgeneration to support both array tuples ([['key', ['value1', 'value2']]]) and object format segmentsuseParams()hook responses