Unverified Commit a94de4c7 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Check for null before reading value in useParams (#47875)

Ensures the `null` value is checked instead of destructuring the value
as it caused an error.
Also added a test to check for `useParams` in `pages`.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation or adding/fixing Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->

---------
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent fde065b9
......@@ -159,12 +159,12 @@ function getSelectedParams(
*/
export function useParams(): Params {
clientHookInServerComponentError('useParams')
const { tree } = useContext(GlobalLayoutRouterContext)
if (!tree) {
const globalLayoutRouterContext = useContext(GlobalLayoutRouterContext)
if (!globalLayoutRouterContext) {
// This only happens in `pages`. Type is overwritten in navigation.d.ts
return null!
}
return getSelectedParams(tree)
return getSelectedParams(globalLayoutRouterContext.tree)
}
// TODO-APP: handle parallel routes
......
'use client'
import { useParams } from 'next/navigation'
export default function Page() {
const { id, id2 } = useParams()
const params = useParams()
if (params === null) {
return null
}
return (
<div>
<div id="param-id">{id}</div>
<div id="param-id2">{id2}</div>
<div id="param-id">{params.id}</div>
<div id="param-id2">{params.id2}</div>
</div>
)
}
'use client'
import { useParams } from 'next/navigation'
export default function Page() {
const { id } = useParams()
const params = useParams()
if (params === null) {
return null
}
return (
<div>
<div id="param-id">{id}</div>
<div id="param-id">{params.id}</div>
</div>
)
}
'use client'
import { useParams } from 'next/navigation'
export default function Page() {
const params = useParams()
return (
<div>
<div id="params">{JSON.stringify(params)}</div>
</div>
)
}
......@@ -36,5 +36,11 @@ createNextDescribe(
expect(await browser.elementByCss('#param-id').text()).toBe('a')
expect(await browser.elementByCss('#param-id2').text()).toBe('b')
})
it('should return null in pages', async () => {
const browser = await next.browser('/use-params-pages')
expect(await browser.elementByCss('#params').text()).toBe('null')
})
}
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment