Unverified Commit 629c7f58 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Clean up startTransition in Link (#40505)

- Use React.startTransition instead of useTransition
- Upgrade to latest React experimental
- Split router cache invalidate into separate function

Some minor cleanup while verifying behaviors.
parent e6ed8ef5
......@@ -178,8 +178,8 @@
"react-17": "npm:react@17.0.2",
"react-dom": "18.2.0",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-exp": "npm:react-dom@0.0.0-experimental-7028ce745-20220907",
"react-exp": "npm:react@0.0.0-experimental-7028ce745-20220907",
"react-dom-exp": "npm:react-dom@0.0.0-experimental-c739cef2f-20220912",
"react-exp": "npm:react@0.0.0-experimental-c739cef2f-20220912",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
......
......@@ -9,6 +9,31 @@ import type {
import { matchSegment } from './match-segments'
import { fetchServerResponse } from './app-router.client'
/**
* Invalidate cache one level down from the router state.
*/
// TODO-APP: Verify if this needs to be recursive.
function invalidateCacheByRouterState(
newCache: CacheNode,
existingCache: CacheNode,
routerState: FlightRouterState
) {
// Remove segment that we got data for so that it is filled in during rendering of subTreeData.
for (const key in routerState[1]) {
const segmentForParallelRoute = routerState[1][key][0]
const cacheKey = Array.isArray(segmentForParallelRoute)
? segmentForParallelRoute[1]
: segmentForParallelRoute
const existingParallelRoutesCacheNode =
existingCache.parallelRoutes.get(key)
if (existingParallelRoutesCacheNode) {
let parallelRouteCacheNode = new Map(existingParallelRoutesCacheNode)
parallelRouteCacheNode.delete(cacheKey)
newCache.parallelRoutes.set(key, parallelRouteCacheNode)
}
}
}
/**
* Fill cache with subTreeData based on flightDataPath
*/
......@@ -56,19 +81,12 @@ function fillCacheWithNewSubTreeData(
: new Map(),
}
// Remove segment that we got data for so that it is filled in during rendering of subTreeData.
for (const key in flightDataPath[2][1]) {
const segmentForParallelRoute = flightDataPath[2][1][key][0]
const cacheKey = Array.isArray(segmentForParallelRoute)
? segmentForParallelRoute[1]
: segmentForParallelRoute
const existingParallelRoutesCacheNode =
existingChildCacheNode?.parallelRoutes.get(key)
if (existingParallelRoutesCacheNode) {
let parallelRouteCacheNode = new Map(existingParallelRoutesCacheNode)
parallelRouteCacheNode.delete(cacheKey)
childCacheNode.parallelRoutes.set(key, parallelRouteCacheNode)
}
if (existingChildCacheNode) {
invalidateCacheByRouterState(
childCacheNode,
existingChildCacheNode,
flightDataPath[2]
)
}
childSegmentMap.set(segmentForCache, childCacheNode)
......
......@@ -16,9 +16,6 @@ import { useIntersection } from './use-intersection'
import { getDomainLocale } from './get-domain-locale'
import { addBasePath } from './add-base-path'
// @ts-ignore useTransition exist
const hasUseTransition = typeof React.useTransition !== 'undefined'
type Url = string | UrlObject
type RequiredKeys<T> = {
[K in keyof T]-?: {} extends Pick<T, K> ? never : K
......@@ -110,7 +107,7 @@ function linkClicked(
shallow?: boolean,
scroll?: boolean,
locale?: string | false,
startTransition?: (cb: any) => void,
isAppRouter?: boolean,
prefetchEnabled?: boolean
): void {
const { nodeName } = e.currentTarget
......@@ -141,8 +138,9 @@ function linkClicked(
}
}
if (startTransition) {
startTransition(navigate)
if (isAppRouter) {
// @ts-expect-error startTransition exists.
React.startTransition(navigate)
} else {
navigate()
}
......@@ -305,13 +303,6 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
}
const p = prefetchProp !== false
const [, /* isPending */ startTransition] = hasUseTransition
? // Rules of hooks is disabled here because the useTransition will always exist with React 18.
// There is no difference between renders in this case, only between using React 18 vs 17.
// @ts-ignore useTransition exists
// eslint-disable-next-line react-hooks/rules-of-hooks
React.useTransition()
: []
let router = React.useContext(RouterContext)
// TODO-APP: type error. Remove `as any`
......@@ -442,7 +433,7 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
shallow,
scroll,
locale,
appRouter ? startTransition : undefined,
Boolean(appRouter),
p
)
}
......
......@@ -140,8 +140,8 @@ importers:
react-17: npm:react@17.0.2
react-dom: 18.2.0
react-dom-17: npm:react-dom@17.0.2
react-dom-exp: npm:react-dom@0.0.0-experimental-7028ce745-20220907
react-exp: npm:react@0.0.0-experimental-7028ce745-20220907
react-dom-exp: npm:react-dom@0.0.0-experimental-c739cef2f-20220912
react-exp: npm:react@0.0.0-experimental-c739cef2f-20220912
react-ssr-prepass: 1.0.8
react-virtualized: 9.22.3
relay-compiler: 13.0.2
......@@ -295,8 +295,8 @@ importers:
react-17: /react/17.0.2
react-dom: 18.2.0_react@18.2.0
react-dom-17: /react-dom/17.0.2_react@18.2.0
react-dom-exp: /react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0
react-exp: /react/0.0.0-experimental-7028ce745-20220907
react-dom-exp: /react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0
react-exp: /react/0.0.0-experimental-c739cef2f-20220912
react-ssr-prepass: 1.0.8_qncsgtzehe3fgiqp6tr7lwq6fm
react-virtualized: 9.22.3_biqbaboplfbrettd7655fr4n2y
relay-compiler: 13.0.2
......@@ -24369,17 +24369,17 @@ packages:
strip-json-comments: 2.0.1
dev: true
/react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0:
/react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0:
resolution:
{
integrity: sha512-vNt0UKStPB47hPjpk6I1JEnxjl3vb0VItCtpZolzcNtYlMyfDmZFInh6IGiMtfBpm6Fp1LCztfopAnuiYoEb3Q==,
integrity: sha512-RbKxCHjX+H/n9yRvB2LFVhHUsFxWOiOlnhSGQ/JO45odUVreNVw0W7hez3biBF1r32f+0dp8RDVfvvKcF1sQyg==,
}
peerDependencies:
react: 0.0.0-experimental-7028ce745-20220907
react: 0.0.0-experimental-c739cef2f-20220912
dependencies:
loose-envify: 1.4.0
react: 18.2.0
scheduler: 0.0.0-experimental-7028ce745-20220907
scheduler: 0.0.0-experimental-c739cef2f-20220912
dev: true
/react-dom/17.0.2_react@18.2.0:
......@@ -24493,10 +24493,10 @@ packages:
react-lifecycles-compat: 3.0.4
dev: true
/react/0.0.0-experimental-7028ce745-20220907:
/react/0.0.0-experimental-c739cef2f-20220912:
resolution:
{
integrity: sha512-GJkc7NNWnUV7imij/n8YxJTQEY+OsE8qSmHB4esfFV/Gdi5zFOtzXr9LEB8CItAIoIpZ0eK1LXcOAO3cenDzLQ==,
integrity: sha512-K3T+R0lw7LzA3HSPHtI4CIYXw6tXKV5ewvuvuY7vfom/0rDvgoUkWHpdkykFUiEaShMKrQyeK6+faq41LeucKA==,
}
engines: { node: '>=0.10.0' }
dependencies:
......@@ -25838,10 +25838,10 @@ packages:
xmlchars: 2.2.0
dev: true
/scheduler/0.0.0-experimental-7028ce745-20220907:
/scheduler/0.0.0-experimental-c739cef2f-20220912:
resolution:
{
integrity: sha512-vmk4QI8sXQYFk7rtB9omwlsyNOhdsai4BKvud+XE+CfZuI5iTV+Nzj2EQq19PcfS7cmf1UOQ83wgv4yGgsefUQ==,
integrity: sha512-6HcdQoIp5PENl8IWJfCkIHcMx9Z+PVYxiTzFURS58bdkYhF8vsl65w/z6dpq6Ii/05miYi16VzrLc9T61EmexQ==,
}
dependencies:
loose-envify: 1.4.0
......
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