Skip to content

Commit 7671621

Browse files
sebmarkbagegnoff
authored andcommitted
Resolve cycle
1 parent 6acd079 commit 7671621

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

packages/react-dom/src/client/ReactDOMRootFB.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
6161
import getComponentNameFromType from 'shared/getComponentNameFromType';
6262
import {has as hasInstance} from 'shared/ReactInstanceMap';
6363

64-
import {currentOwner} from 'react-reconciler/src/ReactFiberAsyncDispatcher';
64+
import {currentOwner} from 'react-reconciler/src/ReactFiberCurrentOwner';
6565

6666
import assign from 'shared/assign';
6767

packages/react-native-renderer/src/ReactNativePublicCompat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
} from 'react-reconciler/src/ReactFiberReconciler';
2626
import {doesFiberContain} from 'react-reconciler/src/ReactFiberTreeReflection';
2727
import getComponentNameFromType from 'shared/getComponentNameFromType';
28-
import {currentOwner} from 'react-reconciler/src/ReactFiberAsyncDispatcher';
28+
import {currentOwner} from 'react-reconciler/src/ReactFiberCurrentOwner';
2929

3030
export function findHostInstance_DEPRECATED<TElementType: ElementType>(
3131
componentOrHandle: ?(ElementRef<TElementType> | number),

packages/react-reconciler/src/ReactFiberAsyncDispatcher.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import {CacheContext} from './ReactFiberCacheComponent';
1616

1717
import {disableStringRefs} from 'shared/ReactFeatureFlags';
1818

19+
import {currentOwner} from './ReactFiberCurrentOwner';
20+
1921
function getCacheForType<T>(resourceType: () => T): T {
2022
if (!enableCache) {
2123
throw new Error('Not implemented.');
@@ -29,8 +31,6 @@ function getCacheForType<T>(resourceType: () => T): T {
2931
return cacheForType;
3032
}
3133

32-
export let currentOwner: Fiber | null = null;
33-
3434
export const DefaultAsyncDispatcher: AsyncDispatcher = ({
3535
getCacheForType,
3636
}: any);
@@ -40,7 +40,3 @@ if (__DEV__ || !disableStringRefs) {
4040
return currentOwner;
4141
};
4242
}
43-
44-
export function setCurrentOwner(fiber: null | Fiber) {
45-
currentOwner = fiber;
46-
}

packages/react-reconciler/src/ReactFiberBeginWork.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ import {
296296
pushRootMarkerInstance,
297297
TransitionTracingMarker,
298298
} from './ReactFiberTracingMarkerComponent';
299-
import {setCurrentOwner} from './ReactFiberAsyncDispatcher';
299+
import {setCurrentOwner} from './ReactFiberCurrentOwner';
300300

301301
// A special exception that's used to unwind the stack when an update flows
302302
// into a dehydrated boundary.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @flow
8+
*/
9+
10+
import type {Fiber} from './ReactInternalTypes';
11+
12+
export let currentOwner: Fiber | null = null;
13+
14+
export function setCurrentOwner(fiber: null | Fiber) {
15+
currentOwner = fiber;
16+
}

packages/react-reconciler/src/ReactFiberTreeReflection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
SuspenseComponent,
2525
} from './ReactWorkTags';
2626
import {NoFlags, Placement, Hydrating} from './ReactFiberFlags';
27-
import {currentOwner} from './ReactFiberAsyncDispatcher';
27+
import {currentOwner} from './ReactFiberCurrentOwner';
2828

2929
export function getNearestMountedFiber(fiber: Fiber): null | Fiber {
3030
let node = fiber;

packages/react-reconciler/src/ReactFiberWorkLoop.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,8 @@ import {
203203
resetHooksOnUnwind,
204204
ContextOnlyDispatcher,
205205
} from './ReactFiberHooks';
206-
import {
207-
DefaultAsyncDispatcher,
208-
setCurrentOwner,
209-
} from './ReactFiberAsyncDispatcher';
206+
import {DefaultAsyncDispatcher} from './ReactFiberAsyncDispatcher';
207+
import {setCurrentOwner} from './ReactFiberCurrentOwner';
210208
import {
211209
createCapturedValueAtFiber,
212210
type CapturedValue,

0 commit comments

Comments
 (0)