{"files":[{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCacheComponent.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCacheComponent.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberTransition.new.js","status":"A"},{"path":"packages\/react-reconciler\/src\/ReactFiberTransition.old.js","status":"A"},{"path":"packages\/react-reconciler\/src\/ReactFiberTransitionPool.old.js","status":"A"},{"path":"packages\/react-reconciler\/src\/ReactFiberUnwindWork.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberUnwindWork.old.js","status":"M"}],"patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\nindex 27a414004c..09a0e16a1e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n@@ -229,15 +229,7 @@ import {\n getWorkInProgressTransitions,\n } from '.\/ReactFiberWorkLoop.new';\n import {setWorkInProgressVersion} from '.\/ReactMutableSource.new';\n-import {\n- requestCacheFromPool,\n- pushCacheProvider,\n- pushRootCachePool,\n- CacheContext,\n- getSuspendedCachePool,\n- pushSpawnedCachePool,\n- getOffscreenDeferredCachePool,\n-} from '.\/ReactFiberCacheComponent.new';\n+import {pushCacheProvider, CacheContext} from '.\/ReactFiberCacheComponent.new';\n import {createCapturedValue} from '.\/ReactCapturedValue';\n import {createClassErrorUpdate} from '.\/ReactFiberThrow.new';\n import {completeSuspendedOffscreenHostContainer} from '.\/ReactFiberCompleteWork.new';\n@@ -248,6 +240,13 @@ import {\n pushTreeId,\n pushMaterializedTreeId,\n } from '.\/ReactFiberTreeContext.new';\n+import {\n+ requestCacheFromPool,\n+ pushRootTransition,\n+ getSuspendedCache,\n+ pushTransition,\n+ getOffscreenDeferredCache,\n+} from '.\/ReactFiberTransition.new';\n \n const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;\n \n@@ -652,7 +651,7 @@ function updateOffscreenComponent(\n \/\/ push the cache pool even though we're going to bail out\n \/\/ because otherwise there'd be a context mismatch\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n pushRenderLanes(workInProgress, renderLanes);\n@@ -666,7 +665,7 @@ function updateOffscreenComponent(\n nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);\n if (enableCache) {\n \/\/ Save the cache pool so we can resume later.\n- spawnedCachePool = getOffscreenDeferredCachePool();\n+ spawnedCachePool = getOffscreenDeferredCache();\n }\n } else {\n nextBaseLanes = renderLanes;\n@@ -686,7 +685,7 @@ function updateOffscreenComponent(\n \/\/ push the cache pool even though we're going to bail out\n \/\/ because otherwise there'd be a context mismatch\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n \n@@ -724,7 +723,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n const prevCachePool = prevState !== null ? prevState.cachePool : null;\n- pushSpawnedCachePool(workInProgress, prevCachePool);\n+ pushTransition(workInProgress, prevCachePool);\n }\n \n pushRenderLanes(workInProgress, subtreeRenderLanes);\n@@ -742,7 +741,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n const prevCachePool = prevState.cachePool;\n- pushSpawnedCachePool(workInProgress, prevCachePool);\n+ pushTransition(workInProgress, prevCachePool);\n }\n \n \/\/ Since we're not hidden anymore, reset the state\n@@ -758,7 +757,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n }\n@@ -1329,7 +1328,7 @@ function updateHostRoot(current, workInProgress, renderLanes) {\n \n if (enableCache) {\n const nextCache: Cache = nextState.cache;\n- pushRootCachePool(root);\n+ pushRootTransition(root);\n pushCacheProvider(workInProgress, nextCache);\n if (nextCache !== prevState.cache) {\n \/\/ The root cache refreshed.\n@@ -1910,7 +1909,7 @@ const SUSPENDED_MARKER: SuspenseState = {\n function mountSuspenseOffscreenState(renderLanes: Lanes): OffscreenState {\n return {\n baseLanes: renderLanes,\n- cachePool: getSuspendedCachePool(),\n+ cachePool: getSuspendedCache(),\n };\n }\n \n@@ -1939,7 +1938,7 @@ function updateSuspenseOffscreenState(\n }\n } else {\n \/\/ If there's no previous cache pool, grab the current one.\n- cachePool = getSuspendedCachePool();\n+ cachePool = getSuspendedCache();\n }\n }\n return {\n@@ -3504,7 +3503,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n if (enableCache) {\n const cache: Cache = current.memoizedState.cache;\n pushCacheProvider(workInProgress, cache);\n- pushRootCachePool(root);\n+ pushRootTransition(root);\n }\n if (enableTransitionTracing) {\n workInProgress.memoizedState.transitions = getWorkInProgressTransitions();\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\nindex 297d5e7d2b..2db03f39a2 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n@@ -229,15 +229,7 @@ import {\n getWorkInProgressTransitions,\n } from '.\/ReactFiberWorkLoop.old';\n import {setWorkInProgressVersion} from '.\/ReactMutableSource.old';\n-import {\n- requestCacheFromPool,\n- pushCacheProvider,\n- pushRootCachePool,\n- CacheContext,\n- getSuspendedCachePool,\n- pushSpawnedCachePool,\n- getOffscreenDeferredCachePool,\n-} from '.\/ReactFiberCacheComponent.old';\n+import {pushCacheProvider, CacheContext} from '.\/ReactFiberCacheComponent.old';\n import {createCapturedValue} from '.\/ReactCapturedValue';\n import {createClassErrorUpdate} from '.\/ReactFiberThrow.old';\n import {completeSuspendedOffscreenHostContainer} from '.\/ReactFiberCompleteWork.old';\n@@ -248,6 +240,13 @@ import {\n pushTreeId,\n pushMaterializedTreeId,\n } from '.\/ReactFiberTreeContext.old';\n+import {\n+ requestCacheFromPool,\n+ pushRootTransition,\n+ getSuspendedCache,\n+ pushTransition,\n+ getOffscreenDeferredCache,\n+} from '.\/ReactFiberTransition.old';\n \n const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;\n \n@@ -652,7 +651,7 @@ function updateOffscreenComponent(\n \/\/ push the cache pool even though we're going to bail out\n \/\/ because otherwise there'd be a context mismatch\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n pushRenderLanes(workInProgress, renderLanes);\n@@ -666,7 +665,7 @@ function updateOffscreenComponent(\n nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);\n if (enableCache) {\n \/\/ Save the cache pool so we can resume later.\n- spawnedCachePool = getOffscreenDeferredCachePool();\n+ spawnedCachePool = getOffscreenDeferredCache();\n }\n } else {\n nextBaseLanes = renderLanes;\n@@ -686,7 +685,7 @@ function updateOffscreenComponent(\n \/\/ push the cache pool even though we're going to bail out\n \/\/ because otherwise there'd be a context mismatch\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n \n@@ -724,7 +723,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n const prevCachePool = prevState !== null ? prevState.cachePool : null;\n- pushSpawnedCachePool(workInProgress, prevCachePool);\n+ pushTransition(workInProgress, prevCachePool);\n }\n \n pushRenderLanes(workInProgress, subtreeRenderLanes);\n@@ -742,7 +741,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n const prevCachePool = prevState.cachePool;\n- pushSpawnedCachePool(workInProgress, prevCachePool);\n+ pushTransition(workInProgress, prevCachePool);\n }\n \n \/\/ Since we're not hidden anymore, reset the state\n@@ -758,7 +757,7 @@ function updateOffscreenComponent(\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n if (current !== null) {\n- pushSpawnedCachePool(workInProgress, null);\n+ pushTransition(workInProgress, null);\n }\n }\n }\n@@ -1329,7 +1328,7 @@ function updateHostRoot(current, workInProgress, renderLanes) {\n \n if (enableCache) {\n const nextCache: Cache = nextState.cache;\n- pushRootCachePool(root);\n+ pushRootTransition(root);\n pushCacheProvider(workInProgress, nextCache);\n if (nextCache !== prevState.cache) {\n \/\/ The root cache refreshed.\n@@ -1910,7 +1909,7 @@ const SUSPENDED_MARKER: SuspenseState = {\n function mountSuspenseOffscreenState(renderLanes: Lanes): OffscreenState {\n return {\n baseLanes: renderLanes,\n- cachePool: getSuspendedCachePool(),\n+ cachePool: getSuspendedCache(),\n };\n }\n \n@@ -1939,7 +1938,7 @@ function updateSuspenseOffscreenState(\n }\n } else {\n \/\/ If there's no previous cache pool, grab the current one.\n- cachePool = getSuspendedCachePool();\n+ cachePool = getSuspendedCache();\n }\n }\n return {\n@@ -3504,7 +3503,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n if (enableCache) {\n const cache: Cache = current.memoizedState.cache;\n pushCacheProvider(workInProgress, cache);\n- pushRootCachePool(root);\n+ pushRootTransition(root);\n }\n if (enableTransitionTracing) {\n workInProgress.memoizedState.transitions = getWorkInProgressTransitions();\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.new.js b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.new.js\nindex 3d1db8124b..14ec05bd5b 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.new.js\n@@ -8,18 +8,12 @@\n *\/\n \n import type {ReactContext} from 'shared\/ReactTypes';\n-import type {FiberRoot} from '.\/ReactInternalTypes';\n-import type {Lanes} from '.\/ReactFiberLane.new';\n-import type {StackCursor} from '.\/ReactFiberStack.new';\n \n import {enableCache} from 'shared\/ReactFeatureFlags';\n import {REACT_CONTEXT_TYPE} from 'shared\/ReactSymbols';\n \n-import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n-import {createCursor, push, pop} from '.\/ReactFiberStack.new';\n import {pushProvider, popProvider} from '.\/ReactFiberNewContext.new';\n import * as Scheduler from 'scheduler';\n-import {getWorkInProgressRoot} from '.\/ReactFiberWorkLoop.new';\n \n export type Cache = {|\n controller: AbortController,\n@@ -62,10 +56,6 @@ if (__DEV__ && enableCache) {\n CacheContext._currentRenderer2 = null;\n }\n \n-\/\/ When retrying a Suspense\/Offscreen boundary, we restore the cache that was\n-\/\/ used during the previous render by placing it here, on the stack.\n-const resumedCache: StackCursor = createCursor(null);\n-\n \/\/ Creates a new empty Cache instance with a ref-count of 0. The caller is responsible\n \/\/ for retaining the cache once it is in use (retainCache), and releasing the cache\n \/\/ once it is no longer needed (releaseCache).\n@@ -131,135 +121,3 @@ export function popCacheProvider(workInProgress: Fiber, cache: Cache) {\n }\n popProvider(CacheContext, workInProgress);\n }\n-\n-function peekCacheFromPool(): Cache | null {\n- if (!enableCache) {\n- return (null: any);\n- }\n-\n- \/\/ Check if the cache pool already has a cache we can use.\n-\n- \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n- \/\/ we should use the same cache that we used during the previous render, if\n- \/\/ one exists.\n- const cacheResumedFromPreviousRender = resumedCache.current;\n- if (cacheResumedFromPreviousRender !== null) {\n- return cacheResumedFromPreviousRender;\n- }\n-\n- \/\/ Otherwise, check the root's cache pool.\n- const root = (getWorkInProgressRoot(): any);\n- const cacheFromRootCachePool = root.pooledCache;\n-\n- return cacheFromRootCachePool;\n-}\n-\n-export function requestCacheFromPool(renderLanes: Lanes): Cache {\n- \/\/ Similar to previous function, except if there's not already a cache in the\n- \/\/ pool, we allocate a new one.\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool !== null) {\n- return cacheFromPool;\n- }\n-\n- \/\/ Create a fresh cache and add it to the root cache pool. A cache can have\n- \/\/ multiple owners:\n- \/\/ - A cache pool that lives on the FiberRoot. This is where all fresh caches\n- \/\/ are originally created (TODO: except during refreshes, until we implement\n- \/\/ this correctly). The root takes ownership immediately when the cache is\n- \/\/ created. Conceptually, root.pooledCache is an Option> (owned),\n- \/\/ and the return value of this function is a &Arc (borrowed).\n- \/\/ - One of several fiber types: host root, cache boundary, suspense\n- \/\/ component. These retain and release in the commit phase.\n-\n- const root = (getWorkInProgressRoot(): any);\n- const freshCache = createCache();\n- root.pooledCache = freshCache;\n- retainCache(freshCache);\n- if (freshCache !== null) {\n- root.pooledCacheLanes |= renderLanes;\n- }\n- return freshCache;\n-}\n-\n-export function pushRootCachePool(root: FiberRoot) {\n- if (!enableCache) {\n- return;\n- }\n- \/\/ Note: This function currently does nothing but I'll leave it here for\n- \/\/ code organization purposes in case that changes.\n-}\n-\n-export function popRootCachePool(root: FiberRoot, renderLanes: Lanes) {\n- if (!enableCache) {\n- return;\n- }\n- \/\/ Note: This function currently does nothing but I'll leave it here for\n- \/\/ code organization purposes in case that changes.\n-}\n-\n-export function pushSpawnedCachePool(\n- offscreenWorkInProgress: Fiber,\n- prevCachePool: SpawnedCachePool | null,\n-): void {\n- if (!enableCache) {\n- return;\n- }\n-\n- if (prevCachePool === null) {\n- push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n- } else {\n- push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n- }\n-}\n-\n-export function popCachePool(workInProgress: Fiber) {\n- if (!enableCache) {\n- return;\n- }\n-\n- pop(resumedCache, workInProgress);\n-}\n-\n-export function getSuspendedCachePool(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n- \/\/ This function is called when a Suspense boundary suspends. It returns the\n- \/\/ cache that would have been used to render fresh data during this render,\n- \/\/ if there was any, so that we can resume rendering with the same cache when\n- \/\/ we receive more data.\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool === null) {\n- return null;\n- }\n-\n- return {\n- \/\/ We must also save the parent, so that when we resume we can detect\n- \/\/ a refresh.\n- parent: isPrimaryRenderer\n- ? CacheContext._currentValue\n- : CacheContext._currentValue2,\n- pool: cacheFromPool,\n- };\n-}\n-\n-export function getOffscreenDeferredCachePool(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n-\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool === null) {\n- return null;\n- }\n-\n- return {\n- \/\/ We must also store the parent, so that when we resume we can detect\n- \/\/ a refresh.\n- parent: isPrimaryRenderer\n- ? CacheContext._currentValue\n- : CacheContext._currentValue2,\n- pool: cacheFromPool,\n- };\n-}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.old.js b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.old.js\nindex 74dc9a449a..a34de4142e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.old.js\n@@ -8,18 +8,12 @@\n *\/\n \n import type {ReactContext} from 'shared\/ReactTypes';\n-import type {FiberRoot} from '.\/ReactInternalTypes';\n-import type {Lanes} from '.\/ReactFiberLane.old';\n-import type {StackCursor} from '.\/ReactFiberStack.old';\n \n import {enableCache} from 'shared\/ReactFeatureFlags';\n import {REACT_CONTEXT_TYPE} from 'shared\/ReactSymbols';\n \n-import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n-import {createCursor, push, pop} from '.\/ReactFiberStack.old';\n import {pushProvider, popProvider} from '.\/ReactFiberNewContext.old';\n import * as Scheduler from 'scheduler';\n-import {getWorkInProgressRoot} from '.\/ReactFiberWorkLoop.old';\n \n export type Cache = {|\n controller: AbortController,\n@@ -62,10 +56,6 @@ if (__DEV__ && enableCache) {\n CacheContext._currentRenderer2 = null;\n }\n \n-\/\/ When retrying a Suspense\/Offscreen boundary, we restore the cache that was\n-\/\/ used during the previous render by placing it here, on the stack.\n-const resumedCache: StackCursor = createCursor(null);\n-\n \/\/ Creates a new empty Cache instance with a ref-count of 0. The caller is responsible\n \/\/ for retaining the cache once it is in use (retainCache), and releasing the cache\n \/\/ once it is no longer needed (releaseCache).\n@@ -131,135 +121,3 @@ export function popCacheProvider(workInProgress: Fiber, cache: Cache) {\n }\n popProvider(CacheContext, workInProgress);\n }\n-\n-function peekCacheFromPool(): Cache | null {\n- if (!enableCache) {\n- return (null: any);\n- }\n-\n- \/\/ Check if the cache pool already has a cache we can use.\n-\n- \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n- \/\/ we should use the same cache that we used during the previous render, if\n- \/\/ one exists.\n- const cacheResumedFromPreviousRender = resumedCache.current;\n- if (cacheResumedFromPreviousRender !== null) {\n- return cacheResumedFromPreviousRender;\n- }\n-\n- \/\/ Otherwise, check the root's cache pool.\n- const root = (getWorkInProgressRoot(): any);\n- const cacheFromRootCachePool = root.pooledCache;\n-\n- return cacheFromRootCachePool;\n-}\n-\n-export function requestCacheFromPool(renderLanes: Lanes): Cache {\n- \/\/ Similar to previous function, except if there's not already a cache in the\n- \/\/ pool, we allocate a new one.\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool !== null) {\n- return cacheFromPool;\n- }\n-\n- \/\/ Create a fresh cache and add it to the root cache pool. A cache can have\n- \/\/ multiple owners:\n- \/\/ - A cache pool that lives on the FiberRoot. This is where all fresh caches\n- \/\/ are originally created (TODO: except during refreshes, until we implement\n- \/\/ this correctly). The root takes ownership immediately when the cache is\n- \/\/ created. Conceptually, root.pooledCache is an Option> (owned),\n- \/\/ and the return value of this function is a &Arc (borrowed).\n- \/\/ - One of several fiber types: host root, cache boundary, suspense\n- \/\/ component. These retain and release in the commit phase.\n-\n- const root = (getWorkInProgressRoot(): any);\n- const freshCache = createCache();\n- root.pooledCache = freshCache;\n- retainCache(freshCache);\n- if (freshCache !== null) {\n- root.pooledCacheLanes |= renderLanes;\n- }\n- return freshCache;\n-}\n-\n-export function pushRootCachePool(root: FiberRoot) {\n- if (!enableCache) {\n- return;\n- }\n- \/\/ Note: This function currently does nothing but I'll leave it here for\n- \/\/ code organization purposes in case that changes.\n-}\n-\n-export function popRootCachePool(root: FiberRoot, renderLanes: Lanes) {\n- if (!enableCache) {\n- return;\n- }\n- \/\/ Note: This function currently does nothing but I'll leave it here for\n- \/\/ code organization purposes in case that changes.\n-}\n-\n-export function pushSpawnedCachePool(\n- offscreenWorkInProgress: Fiber,\n- prevCachePool: SpawnedCachePool | null,\n-): void {\n- if (!enableCache) {\n- return;\n- }\n-\n- if (prevCachePool === null) {\n- push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n- } else {\n- push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n- }\n-}\n-\n-export function popCachePool(workInProgress: Fiber) {\n- if (!enableCache) {\n- return;\n- }\n-\n- pop(resumedCache, workInProgress);\n-}\n-\n-export function getSuspendedCachePool(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n- \/\/ This function is called when a Suspense boundary suspends. It returns the\n- \/\/ cache that would have been used to render fresh data during this render,\n- \/\/ if there was any, so that we can resume rendering with the same cache when\n- \/\/ we receive more data.\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool === null) {\n- return null;\n- }\n-\n- return {\n- \/\/ We must also save the parent, so that when we resume we can detect\n- \/\/ a refresh.\n- parent: isPrimaryRenderer\n- ? CacheContext._currentValue\n- : CacheContext._currentValue2,\n- pool: cacheFromPool,\n- };\n-}\n-\n-export function getOffscreenDeferredCachePool(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n-\n- const cacheFromPool = peekCacheFromPool();\n- if (cacheFromPool === null) {\n- return null;\n- }\n-\n- return {\n- \/\/ We must also store the parent, so that when we resume we can detect\n- \/\/ a refresh.\n- parent: isPrimaryRenderer\n- ? CacheContext._currentValue\n- : CacheContext._currentValue2,\n- pool: cacheFromPool,\n- };\n-}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\nindex 50ab1d3d96..3ca22e5826 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\n@@ -162,12 +162,9 @@ import {\n import {resetChildFibers} from '.\/ReactChildFiber.new';\n import {createScopeInstance} from '.\/ReactFiberScope.new';\n import {transferActualDuration} from '.\/ReactProfilerTimer.new';\n-import {\n- popCacheProvider,\n- popRootCachePool,\n- popCachePool,\n-} from '.\/ReactFiberCacheComponent.new';\n+import {popCacheProvider} from '.\/ReactFiberCacheComponent.new';\n import {popTreeContext} from '.\/ReactFiberTreeContext.new';\n+import {popRootTransition, popTransition} from '.\/ReactFiberTransition.new';\n \n function markUpdate(workInProgress: Fiber) {\n \/\/ Tag the fiber with an update effect. This turns a Placement into\n@@ -864,7 +861,7 @@ function completeWork(\n case HostRoot: {\n const fiberRoot = (workInProgress.stateNode: FiberRoot);\n if (enableCache) {\n- popRootCachePool(fiberRoot, renderLanes);\n+ popRootTransition(fiberRoot, renderLanes);\n \n let previousCache: Cache | null = null;\n if (current !== null) {\n@@ -1553,7 +1550,7 @@ function completeWork(\n workInProgress.flags |= Passive;\n }\n if (current !== null) {\n- popCachePool(workInProgress);\n+ popTransition(workInProgress);\n }\n }\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\nindex 81a51eaff8..bea755f7b4 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\n@@ -162,12 +162,9 @@ import {\n import {resetChildFibers} from '.\/ReactChildFiber.old';\n import {createScopeInstance} from '.\/ReactFiberScope.old';\n import {transferActualDuration} from '.\/ReactProfilerTimer.old';\n-import {\n- popCacheProvider,\n- popRootCachePool,\n- popCachePool,\n-} from '.\/ReactFiberCacheComponent.old';\n+import {popCacheProvider} from '.\/ReactFiberCacheComponent.old';\n import {popTreeContext} from '.\/ReactFiberTreeContext.old';\n+import {popRootTransition, popTransition} from '.\/ReactFiberTransition.old';\n \n function markUpdate(workInProgress: Fiber) {\n \/\/ Tag the fiber with an update effect. This turns a Placement into\n@@ -864,7 +861,7 @@ function completeWork(\n case HostRoot: {\n const fiberRoot = (workInProgress.stateNode: FiberRoot);\n if (enableCache) {\n- popRootCachePool(fiberRoot, renderLanes);\n+ popRootTransition(fiberRoot, renderLanes);\n \n let previousCache: Cache | null = null;\n if (current !== null) {\n@@ -1553,7 +1550,7 @@ function completeWork(\n workInProgress.flags |= Passive;\n }\n if (current !== null) {\n- popCachePool(workInProgress);\n+ popTransition(workInProgress);\n }\n }\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberTransition.new.js b\/packages\/react-reconciler\/src\/ReactFiberTransition.new.js\nnew file mode 100644\nindex 0000000000..dc3c36a918\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberTransition.new.js\n@@ -0,0 +1,154 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+import type {FiberRoot} from '.\/ReactInternalTypes';\n+import type {Lanes} from '.\/ReactFiberLane.new';\n+import type {StackCursor} from '.\/ReactFiberStack.new';\n+import type {Cache, SpawnedCachePool} from '.\/ReactFiberCacheComponent.new';\n+\n+import {enableCache} from 'shared\/ReactFeatureFlags';\n+import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n+import {createCursor, push, pop} from '.\/ReactFiberStack.new';\n+import {getWorkInProgressRoot} from '.\/ReactFiberWorkLoop.new';\n+import {\n+ createCache,\n+ retainCache,\n+ CacheContext,\n+} from '.\/ReactFiberCacheComponent.new';\n+\n+\/\/ When retrying a Suspense\/Offscreen boundary, we restore the cache that was\n+\/\/ used during the previous render by placing it here, on the stack.\n+const resumedCache: StackCursor = createCursor(null);\n+\n+function peekCacheFromPool(): Cache | null {\n+ if (!enableCache) {\n+ return (null: any);\n+ }\n+\n+ \/\/ Check if the cache pool already has a cache we can use.\n+\n+ \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n+ \/\/ we should use the same cache that we used during the previous render, if\n+ \/\/ one exists.\n+ const cacheResumedFromPreviousRender = resumedCache.current;\n+ if (cacheResumedFromPreviousRender !== null) {\n+ return cacheResumedFromPreviousRender;\n+ }\n+\n+ \/\/ Otherwise, check the root's cache pool.\n+ const root = (getWorkInProgressRoot(): any);\n+ const cacheFromRootCachePool = root.pooledCache;\n+\n+ return cacheFromRootCachePool;\n+}\n+\n+export function requestCacheFromPool(renderLanes: Lanes): Cache {\n+ \/\/ Similar to previous function, except if there's not already a cache in the\n+ \/\/ pool, we allocate a new one.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool !== null) {\n+ return cacheFromPool;\n+ }\n+\n+ \/\/ Create a fresh cache and add it to the root cache pool. A cache can have\n+ \/\/ multiple owners:\n+ \/\/ - A cache pool that lives on the FiberRoot. This is where all fresh caches\n+ \/\/ are originally created (TODO: except during refreshes, until we implement\n+ \/\/ this correctly). The root takes ownership immediately when the cache is\n+ \/\/ created. Conceptually, root.pooledCache is an Option> (owned),\n+ \/\/ and the return value of this function is a &Arc (borrowed).\n+ \/\/ - One of several fiber types: host root, cache boundary, suspense\n+ \/\/ component. These retain and release in the commit phase.\n+\n+ const root = (getWorkInProgressRoot(): any);\n+ const freshCache = createCache();\n+ root.pooledCache = freshCache;\n+ retainCache(freshCache);\n+ if (freshCache !== null) {\n+ root.pooledCacheLanes |= renderLanes;\n+ }\n+ return freshCache;\n+}\n+\n+export function pushRootTransition(root: FiberRoot) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function popRootTransition(root: FiberRoot, renderLanes: Lanes) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function pushTransition(\n+ offscreenWorkInProgress: Fiber,\n+ prevCachePool: SpawnedCachePool | null,\n+): void {\n+ if (enableCache) {\n+ if (prevCachePool === null) {\n+ push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n+ } else {\n+ push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n+ }\n+ }\n+}\n+\n+export function popTransition(workInProgress: Fiber) {\n+ if (enableCache) {\n+ pop(resumedCache, workInProgress);\n+ }\n+}\n+\n+export function getSuspendedCache(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+ \/\/ This function is called when a Suspense boundary suspends. It returns the\n+ \/\/ cache that would have been used to render fresh data during this render,\n+ \/\/ if there was any, so that we can resume rendering with the same cache when\n+ \/\/ we receive more data.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also save the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\n+\n+export function getOffscreenDeferredCache(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also store the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberTransition.old.js b\/packages\/react-reconciler\/src\/ReactFiberTransition.old.js\nnew file mode 100644\nindex 0000000000..666e41d518\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberTransition.old.js\n@@ -0,0 +1,154 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+import type {FiberRoot} from '.\/ReactInternalTypes';\n+import type {Lanes} from '.\/ReactFiberLane.old';\n+import type {StackCursor} from '.\/ReactFiberStack.old';\n+import type {Cache, SpawnedCachePool} from '.\/ReactFiberCacheComponent.old';\n+\n+import {enableCache} from 'shared\/ReactFeatureFlags';\n+import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n+import {createCursor, push, pop} from '.\/ReactFiberStack.old';\n+import {getWorkInProgressRoot} from '.\/ReactFiberWorkLoop.old';\n+import {\n+ createCache,\n+ retainCache,\n+ CacheContext,\n+} from '.\/ReactFiberCacheComponent.old';\n+\n+\/\/ When retrying a Suspense\/Offscreen boundary, we restore the cache that was\n+\/\/ used during the previous render by placing it here, on the stack.\n+const resumedCache: StackCursor = createCursor(null);\n+\n+function peekCacheFromPool(): Cache | null {\n+ if (!enableCache) {\n+ return (null: any);\n+ }\n+\n+ \/\/ Check if the cache pool already has a cache we can use.\n+\n+ \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n+ \/\/ we should use the same cache that we used during the previous render, if\n+ \/\/ one exists.\n+ const cacheResumedFromPreviousRender = resumedCache.current;\n+ if (cacheResumedFromPreviousRender !== null) {\n+ return cacheResumedFromPreviousRender;\n+ }\n+\n+ \/\/ Otherwise, check the root's cache pool.\n+ const root = (getWorkInProgressRoot(): any);\n+ const cacheFromRootCachePool = root.pooledCache;\n+\n+ return cacheFromRootCachePool;\n+}\n+\n+export function requestCacheFromPool(renderLanes: Lanes): Cache {\n+ \/\/ Similar to previous function, except if there's not already a cache in the\n+ \/\/ pool, we allocate a new one.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool !== null) {\n+ return cacheFromPool;\n+ }\n+\n+ \/\/ Create a fresh cache and add it to the root cache pool. A cache can have\n+ \/\/ multiple owners:\n+ \/\/ - A cache pool that lives on the FiberRoot. This is where all fresh caches\n+ \/\/ are originally created (TODO: except during refreshes, until we implement\n+ \/\/ this correctly). The root takes ownership immediately when the cache is\n+ \/\/ created. Conceptually, root.pooledCache is an Option> (owned),\n+ \/\/ and the return value of this function is a &Arc (borrowed).\n+ \/\/ - One of several fiber types: host root, cache boundary, suspense\n+ \/\/ component. These retain and release in the commit phase.\n+\n+ const root = (getWorkInProgressRoot(): any);\n+ const freshCache = createCache();\n+ root.pooledCache = freshCache;\n+ retainCache(freshCache);\n+ if (freshCache !== null) {\n+ root.pooledCacheLanes |= renderLanes;\n+ }\n+ return freshCache;\n+}\n+\n+export function pushRootTransition(root: FiberRoot) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function popRootTransition(root: FiberRoot, renderLanes: Lanes) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function pushTransition(\n+ offscreenWorkInProgress: Fiber,\n+ prevCachePool: SpawnedCachePool | null,\n+): void {\n+ if (enableCache) {\n+ if (prevCachePool === null) {\n+ push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n+ } else {\n+ push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n+ }\n+ }\n+}\n+\n+export function popTransition(workInProgress: Fiber) {\n+ if (enableCache) {\n+ pop(resumedCache, workInProgress);\n+ }\n+}\n+\n+export function getSuspendedCache(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+ \/\/ This function is called when a Suspense boundary suspends. It returns the\n+ \/\/ cache that would have been used to render fresh data during this render,\n+ \/\/ if there was any, so that we can resume rendering with the same cache when\n+ \/\/ we receive more data.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also save the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\n+\n+export function getOffscreenDeferredCache(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also store the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberTransitionPool.old.js b\/packages\/react-reconciler\/src\/ReactFiberTransitionPool.old.js\nnew file mode 100644\nindex 0000000000..e78670aa3f\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberTransitionPool.old.js\n@@ -0,0 +1,154 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+import type {FiberRoot} from '.\/ReactInternalTypes';\n+import type {Lanes} from '.\/ReactFiberLane.old';\n+import type {StackCursor} from '.\/ReactFiberStack.old';\n+import type {Cache, SpawnedCachePool} from '.\/ReactFiberCacheComponent.old';\n+\n+import {enableCache} from 'shared\/ReactFeatureFlags';\n+import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n+import {createCursor, push, pop} from '.\/ReactFiberStack.old';\n+import {getWorkInProgressRoot} from '.\/ReactFiberWorkLoop.old';\n+import {\n+ createCache,\n+ retainCache,\n+ CacheContext,\n+} from '.\/ReactFiberCacheComponent.old';\n+\n+\/\/ When retrying a Suspense\/Offscreen boundary, we restore the cache that was\n+\/\/ used during the previous render by placing it here, on the stack.\n+const resumedCache: StackCursor = createCursor(null);\n+\n+function peekCacheFromPool(): Cache | null {\n+ if (!enableCache) {\n+ return (null: any);\n+ }\n+\n+ \/\/ Check if the cache pool already has a cache we can use.\n+\n+ \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n+ \/\/ we should use the same cache that we used during the previous render, if\n+ \/\/ one exists.\n+ const cacheResumedFromPreviousRender = resumedCache.current;\n+ if (cacheResumedFromPreviousRender !== null) {\n+ return cacheResumedFromPreviousRender;\n+ }\n+\n+ \/\/ Otherwise, check the root's cache pool.\n+ const root = (getWorkInProgressRoot(): any);\n+ const cacheFromRootCachePool = root.pooledCache;\n+\n+ return cacheFromRootCachePool;\n+}\n+\n+export function requestCacheFromPool(renderLanes: Lanes): Cache {\n+ \/\/ Similar to previous function, except if there's not already a cache in the\n+ \/\/ pool, we allocate a new one.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool !== null) {\n+ return cacheFromPool;\n+ }\n+\n+ \/\/ Create a fresh cache and add it to the root cache pool. A cache can have\n+ \/\/ multiple owners:\n+ \/\/ - A cache pool that lives on the FiberRoot. This is where all fresh caches\n+ \/\/ are originally created (TODO: except during refreshes, until we implement\n+ \/\/ this correctly). The root takes ownership immediately when the cache is\n+ \/\/ created. Conceptually, root.pooledCache is an Option> (owned),\n+ \/\/ and the return value of this function is a &Arc (borrowed).\n+ \/\/ - One of several fiber types: host root, cache boundary, suspense\n+ \/\/ component. These retain and release in the commit phase.\n+\n+ const root = (getWorkInProgressRoot(): any);\n+ const freshCache = createCache();\n+ root.pooledCache = freshCache;\n+ retainCache(freshCache);\n+ if (freshCache !== null) {\n+ root.pooledCacheLanes |= renderLanes;\n+ }\n+ return freshCache;\n+}\n+\n+export function pushRootTransitionPool(root: FiberRoot) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function popRootTransitionPool(root: FiberRoot, renderLanes: Lanes) {\n+ if (enableCache) {\n+ return;\n+ }\n+ \/\/ Note: This function currently does nothing but I'll leave it here for\n+ \/\/ code organization purposes in case that changes.\n+}\n+\n+export function pushTransitionPool(\n+ offscreenWorkInProgress: Fiber,\n+ prevCachePool: SpawnedCachePool | null,\n+): void {\n+ if (enableCache) {\n+ if (prevCachePool === null) {\n+ push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n+ } else {\n+ push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n+ }\n+ }\n+}\n+\n+export function popTransitionPool(workInProgress: Fiber) {\n+ if (enableCache) {\n+ pop(resumedCache, workInProgress);\n+ }\n+}\n+\n+export function getSuspendedCachePool(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+ \/\/ This function is called when a Suspense boundary suspends. It returns the\n+ \/\/ cache that would have been used to render fresh data during this render,\n+ \/\/ if there was any, so that we can resume rendering with the same cache when\n+ \/\/ we receive more data.\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also save the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\n+\n+export function getOffscreenDeferredCachePool(): SpawnedCachePool | null {\n+ if (!enableCache) {\n+ return null;\n+ }\n+\n+ const cacheFromPool = peekCacheFromPool();\n+ if (cacheFromPool === null) {\n+ return null;\n+ }\n+\n+ return {\n+ \/\/ We must also store the parent, so that when we resume we can detect\n+ \/\/ a refresh.\n+ parent: isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2,\n+ pool: cacheFromPool,\n+ };\n+}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.new.js\nindex aa1b391b03..faac8f38f0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.new.js\n@@ -44,13 +44,10 @@ import {\n } from '.\/ReactFiberContext.new';\n import {popProvider} from '.\/ReactFiberNewContext.new';\n import {popRenderLanes} from '.\/ReactFiberWorkLoop.new';\n-import {\n- popCacheProvider,\n- popRootCachePool,\n- popCachePool,\n-} from '.\/ReactFiberCacheComponent.new';\n+import {popCacheProvider} from '.\/ReactFiberCacheComponent.new';\n import {transferActualDuration} from '.\/ReactProfilerTimer.new';\n import {popTreeContext} from '.\/ReactFiberTreeContext.new';\n+import {popRootTransition, popTransition} from '.\/ReactFiberTransition.new';\n \n function unwindWork(\n current: Fiber | null,\n@@ -84,7 +81,7 @@ function unwindWork(\n case HostRoot: {\n if (enableCache) {\n const root: FiberRoot = workInProgress.stateNode;\n- popRootCachePool(root, renderLanes);\n+ popRootTransition(root, renderLanes);\n \n const cache: Cache = workInProgress.memoizedState.cache;\n popCacheProvider(workInProgress, cache);\n@@ -158,7 +155,7 @@ function unwindWork(\n popRenderLanes(workInProgress);\n if (enableCache) {\n if (current !== null) {\n- popCachePool(workInProgress);\n+ popTransition(workInProgress);\n }\n }\n return null;\n@@ -194,7 +191,7 @@ function unwindInterruptedWork(\n case HostRoot: {\n if (enableCache) {\n const root: FiberRoot = interruptedWork.stateNode;\n- popRootCachePool(root, renderLanes);\n+ popRootTransition(root, renderLanes);\n \n const cache: Cache = interruptedWork.memoizedState.cache;\n popCacheProvider(interruptedWork, cache);\n@@ -226,7 +223,7 @@ function unwindInterruptedWork(\n popRenderLanes(interruptedWork);\n if (enableCache) {\n if (current !== null) {\n- popCachePool(interruptedWork);\n+ popTransition(interruptedWork);\n }\n }\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.old.js\nindex cb5df61782..4578134d58 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.old.js\n@@ -44,13 +44,10 @@ import {\n } from '.\/ReactFiberContext.old';\n import {popProvider} from '.\/ReactFiberNewContext.old';\n import {popRenderLanes} from '.\/ReactFiberWorkLoop.old';\n-import {\n- popCacheProvider,\n- popRootCachePool,\n- popCachePool,\n-} from '.\/ReactFiberCacheComponent.old';\n+import {popCacheProvider} from '.\/ReactFiberCacheComponent.old';\n import {transferActualDuration} from '.\/ReactProfilerTimer.old';\n import {popTreeContext} from '.\/ReactFiberTreeContext.old';\n+import {popRootTransition, popTransition} from '.\/ReactFiberTransition.old';\n \n function unwindWork(\n current: Fiber | null,\n@@ -84,7 +81,7 @@ function unwindWork(\n case HostRoot: {\n if (enableCache) {\n const root: FiberRoot = workInProgress.stateNode;\n- popRootCachePool(root, renderLanes);\n+ popRootTransition(root, renderLanes);\n \n const cache: Cache = workInProgress.memoizedState.cache;\n popCacheProvider(workInProgress, cache);\n@@ -158,7 +155,7 @@ function unwindWork(\n popRenderLanes(workInProgress);\n if (enableCache) {\n if (current !== null) {\n- popCachePool(workInProgress);\n+ popTransition(workInProgress);\n }\n }\n return null;\n@@ -194,7 +191,7 @@ function unwindInterruptedWork(\n case HostRoot: {\n if (enableCache) {\n const root: FiberRoot = interruptedWork.stateNode;\n- popRootCachePool(root, renderLanes);\n+ popRootTransition(root, renderLanes);\n \n const cache: Cache = interruptedWork.memoizedState.cache;\n popCacheProvider(interruptedWork, cache);\n@@ -226,7 +223,7 @@ function unwindInterruptedWork(\n popRenderLanes(interruptedWork);\n if (enableCache) {\n if (current !== null) {\n- popCachePool(interruptedWork);\n+ popTransition(interruptedWork);\n }\n }\n \n","commit":{"authorEmail":"lunaris.ruan@gmail.com","shortRevision":"feefe437fe","revision":"feefe437fe160cb99facbf9444ad6a32a901c6a3","authorName":"Luna Ruan","authoredAt":"2022-03-01T15:39:51-05:00","subject":"Refactor Cache Code (#23393)"},"parents":["17806594cc28284fe195f918e8d77de3516848ec"],"body":"This PR refactors the cache code by moving it out of ReactFiberCacheComponent to ReactFiberTransitionPool in anticipation of it being reused by multiple stacks (ie. transition tracing)"}

dillon1000/react

Files changed