Skip to content

Commit 59aea20

Browse files
committed
Fix cross-fork discrepancy
I missed a few lines when syncing an earlier step. Usually I would find which one and patch it but I'm about to squash and merge so meh.
1 parent 4bb19da commit 59aea20

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

packages/react-reconciler/src/ReactFiberCommitWork.old.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old';
2424
import type {Wakeable} from 'shared/ReactTypes';
2525
import type {ReactPriorityLevel} from './ReactInternalTypes';
2626
import type {OffscreenState} from './ReactFiberOffscreenComponent';
27+
import type {HookFlags} from './ReactHookEffectTags';
2728

2829
import {unstable_wrap as Schedule_tracing_wrap} from 'scheduler/tracing';
2930
import {

packages/react-reconciler/src/ReactFiberRoot.old.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ function FiberRootNode(containerInfo, tag, hydrate) {
5454
this.entanglements = createLaneMap(NoLanes);
5555

5656
if (enableCache) {
57-
this.caches = createLaneMap(null);
5857
this.pooledCache = null;
58+
this.pooledCacheLanes = NoLanes;
5959
}
6060

6161
if (supportsHydration) {

packages/react-reconciler/src/ReactFiberUnwindWork.old.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ function unwindInterruptedWork(interruptedWork: Fiber, renderLanes: Lanes) {
170170
break;
171171
}
172172
case HostRoot: {
173-
popHostContainer(interruptedWork);
174173
if (enableCache) {
175174
const root: FiberRoot = interruptedWork.stateNode;
176175
popRootCachePool(root, renderLanes);
177176

178177
const cache: Cache = interruptedWork.memoizedState.cache;
179178
popCacheProvider(interruptedWork, cache);
180179
}
180+
popHostContainer(interruptedWork);
181181
popTopLevelLegacyContextObject(interruptedWork);
182182
resetMutableSourceWorkInProgressVersions();
183183
break;

0 commit comments

Comments
 (0)