Skip to content
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.

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

Memoize useRouter from next/navigation when used in Pages Router #52177

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
6 changes: 5 additions & 1 deletion packages/next/src/client/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ function renderApp(App: AppComponent, appProps: AppProps) {
function AppContainer({
children,
}: React.PropsWithChildren<{}>): React.ReactElement {
// Create a memoized value for next/navigation router context.
const adaptedForAppRouter = React.useMemo(() => {
return adaptForAppRouterInstance(router)
}, [])
return (
<Container
fn={(error) =>
Expand All @@ -336,7 +340,7 @@ function AppContainer({
)
}
>
<AppRouterContext.Provider value={adaptForAppRouterInstance(router)}>
<AppRouterContext.Provider value={adaptedForAppRouter}>
<SearchParamsContext.Provider value={adaptForSearchParams(router)}>
<PathnameContextProviderAdapter
router={router}
Expand Down