Skip to content

Commit a11b4e5

Browse files
committed
Switch flag to boolean
1 parent b4e9696 commit a11b4e5

File tree

8 files changed

+23
-30
lines changed

8 files changed

+23
-30
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ function createRootImpl(
123123
options.hydrationOptions != null &&
124124
options.hydrationOptions.mutableSources) ||
125125
null;
126-
const strictModeLevelOverride =
127-
options != null && options.unstable_strictMode === true ? 2 : null;
126+
const isStrictMode = options != null && options.unstable_strictMode === true;
128127

129128
let concurrentUpdatesByDefaultOverride = null;
130129
if (allowConcurrentByDefault) {
@@ -139,7 +138,7 @@ function createRootImpl(
139138
tag,
140139
hydrate,
141140
hydrationCallbacks,
142-
strictModeLevelOverride,
141+
isStrictMode,
143142
concurrentUpdatesByDefaultOverride,
144143
);
145144
markContainerAsRoot(root.current, container);

packages/react-reconciler/src/ReactFiber.new.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,20 +422,17 @@ export function resetWorkInProgress(workInProgress: Fiber, renderLanes: Lanes) {
422422

423423
export function createHostRootFiber(
424424
tag: RootTag,
425-
strictModeLevelOverride: null | number,
425+
isStrictMode: boolean,
426426
concurrentUpdatesByDefaultOverride: null | boolean,
427427
): Fiber {
428428
let mode;
429429
if (tag === ConcurrentRoot) {
430430
mode = ConcurrentMode;
431-
if (strictModeLevelOverride !== null) {
432-
if (strictModeLevelOverride >= 1) {
433-
mode |= StrictLegacyMode;
434-
}
431+
if (isStrictMode === true) {
432+
mode |= StrictLegacyMode;
433+
435434
if (enableStrictEffects) {
436-
if (strictModeLevelOverride >= 2) {
437-
mode |= StrictEffectsMode;
438-
}
435+
mode |= StrictEffectsMode;
439436
}
440437
} else if (enableStrictEffects && createRootStrictEffectsByDefault) {
441438
mode |= StrictLegacyMode | StrictEffectsMode;

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,20 +422,17 @@ export function resetWorkInProgress(workInProgress: Fiber, renderLanes: Lanes) {
422422

423423
export function createHostRootFiber(
424424
tag: RootTag,
425-
strictModeLevelOverride: null | number,
425+
isStrictMode: boolean,
426426
concurrentUpdatesByDefaultOverride: null | boolean,
427427
): Fiber {
428428
let mode;
429429
if (tag === ConcurrentRoot) {
430430
mode = ConcurrentMode;
431-
if (strictModeLevelOverride !== null) {
432-
if (strictModeLevelOverride >= 1) {
433-
mode |= StrictLegacyMode;
434-
}
431+
if (isStrictMode === true) {
432+
mode |= StrictLegacyMode;
433+
435434
if (enableStrictEffects) {
436-
if (strictModeLevelOverride >= 2) {
437-
mode |= StrictEffectsMode;
438-
}
435+
mode |= StrictEffectsMode;
439436
}
440437
} else if (enableStrictEffects && createRootStrictEffectsByDefault) {
441438
mode |= StrictLegacyMode | StrictEffectsMode;

packages/react-reconciler/src/ReactFiberReconciler.new.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ export function createContainer(
248248
tag: RootTag,
249249
hydrate: boolean,
250250
hydrationCallbacks: null | SuspenseHydrationCallbacks,
251-
strictModeLevelOverride: null | number,
251+
isStrictMode: boolean,
252252
concurrentUpdatesByDefaultOverride: null | boolean,
253253
): OpaqueRoot {
254254
return createFiberRoot(
255255
containerInfo,
256256
tag,
257257
hydrate,
258258
hydrationCallbacks,
259-
strictModeLevelOverride,
259+
isStrictMode,
260260
concurrentUpdatesByDefaultOverride,
261261
);
262262
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ export function createContainer(
248248
tag: RootTag,
249249
hydrate: boolean,
250250
hydrationCallbacks: null | SuspenseHydrationCallbacks,
251-
strictModeLevelOverride: null | number,
251+
isStrictMode: boolean,
252252
concurrentUpdatesByDefaultOverride: null | boolean,
253253
): OpaqueRoot {
254254
return createFiberRoot(
255255
containerInfo,
256256
tag,
257257
hydrate,
258258
hydrationCallbacks,
259-
strictModeLevelOverride,
259+
isStrictMode,
260260
concurrentUpdatesByDefaultOverride,
261261
);
262262
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function createFiberRoot(
9898
tag: RootTag,
9999
hydrate: boolean,
100100
hydrationCallbacks: null | SuspenseHydrationCallbacks,
101-
strictModeLevelOverride: null | number,
101+
isStrictMode: boolean,
102102
concurrentUpdatesByDefaultOverride: null | boolean,
103103
): FiberRoot {
104104
const root: FiberRoot = (new FiberRootNode(containerInfo, tag, hydrate): any);
@@ -110,7 +110,7 @@ export function createFiberRoot(
110110
// stateNode is any.
111111
const uninitializedFiber = createHostRootFiber(
112112
tag,
113-
strictModeLevelOverride,
113+
isStrictMode,
114114
concurrentUpdatesByDefaultOverride,
115115
);
116116
root.current = uninitializedFiber;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function createFiberRoot(
9898
tag: RootTag,
9999
hydrate: boolean,
100100
hydrationCallbacks: null | SuspenseHydrationCallbacks,
101-
strictModeLevelOverride: null | number,
101+
isStrictMode: boolean,
102102
concurrentUpdatesByDefaultOverride: null | boolean,
103103
): FiberRoot {
104104
const root: FiberRoot = (new FiberRootNode(containerInfo, tag, hydrate): any);
@@ -110,7 +110,7 @@ export function createFiberRoot(
110110
// stateNode is any.
111111
const uninitializedFiber = createHostRootFiber(
112112
tag,
113-
strictModeLevelOverride,
113+
isStrictMode,
114114
concurrentUpdatesByDefaultOverride,
115115
);
116116
root.current = uninitializedFiber;

packages/react-test-renderer/src/ReactTestRenderer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ function propsMatch(props: Object, filter: Object): boolean {
437437
function create(element: React$Element<any>, options: TestRendererOptions) {
438438
let createNodeMock = defaultTestOptions.createNodeMock;
439439
let isConcurrent = false;
440-
let strictModeLevel = null;
440+
let isStrictMode = false;
441441
let concurrentUpdatesByDefault = null;
442442
if (typeof options === 'object' && options !== null) {
443443
if (typeof options.createNodeMock === 'function') {
@@ -447,7 +447,7 @@ function create(element: React$Element<any>, options: TestRendererOptions) {
447447
isConcurrent = true;
448448
}
449449
if (options.unstable_strictMode === true) {
450-
strictModeLevel = 2;
450+
isStrictMode = true;
451451
}
452452
if (allowConcurrentByDefault) {
453453
if (options.unstable_concurrentUpdatesByDefault !== undefined) {
@@ -466,7 +466,7 @@ function create(element: React$Element<any>, options: TestRendererOptions) {
466466
isConcurrent ? ConcurrentRoot : LegacyRoot,
467467
false,
468468
null,
469-
strictModeLevel,
469+
isStrictMode,
470470
concurrentUpdatesByDefault,
471471
);
472472
invariant(root != null, 'something went wrong');

0 commit comments

Comments
 (0)