Unverified Commit 3e10a73f authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

guard navigation `use` hooks for React 18 (#85151)

We need to guard these calls, otherwise they fail in our React 18.3.1
tests. x-ref:
https://github.com/vercel/next.js/actions/runs/18671327784/job/53236002824
parent 38b9a5e4
import type { Params } from '../../server/request/params' import type { Params } from '../../server/request/params'
import { useContext, useMemo, use } from 'react' import React, { useContext, useMemo, use } from 'react'
import { import {
AppRouterContext, AppRouterContext,
LayoutRouterContext, LayoutRouterContext,
...@@ -72,7 +72,7 @@ export function useSearchParams(): ReadonlyURLSearchParams { ...@@ -72,7 +72,7 @@ export function useSearchParams(): ReadonlyURLSearchParams {
}, [searchParams]) as ReadonlyURLSearchParams }, [searchParams]) as ReadonlyURLSearchParams
// Instrument with Suspense DevTools (dev-only) // Instrument with Suspense DevTools (dev-only)
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production' && 'use' in React) {
const navigationPromises = use(NavigationPromisesContext) const navigationPromises = use(NavigationPromisesContext)
if (navigationPromises) { if (navigationPromises) {
return use(navigationPromises.searchParams) return use(navigationPromises.searchParams)
...@@ -108,7 +108,7 @@ export function usePathname(): string { ...@@ -108,7 +108,7 @@ export function usePathname(): string {
const pathname = useContext(PathnameContext) as string const pathname = useContext(PathnameContext) as string
// Instrument with Suspense DevTools (dev-only) // Instrument with Suspense DevTools (dev-only)
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production' && 'use' in React) {
const navigationPromises = use(NavigationPromisesContext) const navigationPromises = use(NavigationPromisesContext)
if (navigationPromises) { if (navigationPromises) {
return use(navigationPromises.pathname) return use(navigationPromises.pathname)
...@@ -176,7 +176,7 @@ export function useParams<T extends Params = Params>(): T { ...@@ -176,7 +176,7 @@ export function useParams<T extends Params = Params>(): T {
const params = useContext(PathParamsContext) as T const params = useContext(PathParamsContext) as T
// Instrument with Suspense DevTools (dev-only) // Instrument with Suspense DevTools (dev-only)
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production' && 'use' in React) {
const navigationPromises = use(NavigationPromisesContext) const navigationPromises = use(NavigationPromisesContext)
if (navigationPromises) { if (navigationPromises) {
return use(navigationPromises.params) as T return use(navigationPromises.params) as T
...@@ -222,7 +222,7 @@ export function useSelectedLayoutSegments( ...@@ -222,7 +222,7 @@ export function useSelectedLayoutSegments(
if (!context) return null if (!context) return null
// Instrument with Suspense DevTools (dev-only) // Instrument with Suspense DevTools (dev-only)
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production' && 'use' in React) {
const navigationPromises = use(NavigationPromisesContext) const navigationPromises = use(NavigationPromisesContext)
if (navigationPromises) { if (navigationPromises) {
const promise = const promise =
...@@ -265,7 +265,11 @@ export function useSelectedLayoutSegment( ...@@ -265,7 +265,11 @@ export function useSelectedLayoutSegment(
const selectedLayoutSegments = useSelectedLayoutSegments(parallelRouteKey) const selectedLayoutSegments = useSelectedLayoutSegments(parallelRouteKey)
// Instrument with Suspense DevTools (dev-only) // Instrument with Suspense DevTools (dev-only)
if (process.env.NODE_ENV !== 'production' && navigationPromises) { if (
process.env.NODE_ENV !== 'production' &&
navigationPromises &&
'use' in React
) {
const promise = const promise =
navigationPromises.selectedLayoutSegmentPromises?.get(parallelRouteKey) navigationPromises.selectedLayoutSegmentPromises?.get(parallelRouteKey)
if (promise) { if (promise) {
......
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