Skip to content

Commit 885532c

Browse files
authored
Revert "Ship enableFabricCompleteRootInCommitPhase (#32318)" (#32434)
This reverts commit 8759c5c / #32318 We discovered that the experiment setup for this was faulty and we need to re-run as a back test.
1 parent 5f31228 commit 885532c

9 files changed

+20
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import {
5858
} from './ReactNativeFiberInspector';
5959

6060
import {
61+
enableFabricCompleteRootInCommitPhase,
6162
passChildrenWhenCloningPersistedNodes,
6263
enableLazyPublicInstanceInFabric,
6364
} from 'shared/ReactFeatureFlags';
@@ -533,14 +534,19 @@ export function finalizeContainerChildren(
533534
container: Container,
534535
newChildren: ChildSet,
535536
): void {
536-
// Noop - children will be finalized in replaceContainerChildren
537+
if (!enableFabricCompleteRootInCommitPhase) {
538+
completeRoot(container.containerTag, newChildren);
539+
}
537540
}
538541

539542
export function replaceContainerChildren(
540543
container: Container,
541544
newChildren: ChildSet,
542545
): void {
543-
completeRoot(container.containerTag, newChildren);
546+
// Noop - children will be replaced in finalizeContainerChildren
547+
if (enableFabricCompleteRootInCommitPhase) {
548+
completeRoot(container.containerTag, newChildren);
549+
}
544550
}
545551

546552
export {getClosestInstanceFromNode as getInstanceFromNode};

packages/shared/ReactFeatureFlags.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ export const enableViewTransition = __EXPERIMENTAL__;
9494

9595
export const enableSwipeTransition = __EXPERIMENTAL__;
9696

97+
/**
98+
* Switches the Fabric API from doing layout in commit work instead of complete work.
99+
*/
100+
export const enableFabricCompleteRootInCommitPhase = false;
101+
97102
/**
98103
* Switches Fiber creation to a simple object instead of a constructor.
99104
*/

packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export const enableHiddenSubtreeInsertionEffectCleanup = __VARIANT__;
2323
export const enablePersistedModeClonedFlag = __VARIANT__;
2424
export const enableShallowPropDiffing = __VARIANT__;
2525
export const passChildrenWhenCloningPersistedNodes = __VARIANT__;
26+
export const enableFabricCompleteRootInCommitPhase = __VARIANT__;
2627
export const enableSiblingPrerendering = __VARIANT__;
2728
export const enableUseEffectCRUDOverload = __VARIANT__;
2829
export const enableFastAddPropertiesInDiffing = __VARIANT__;

packages/shared/forks/ReactFeatureFlags.native-fb.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const dynamicFlags: DynamicExportsType = (dynamicFlagsUntyped: any);
2020
// the exports object every time a flag is read.
2121
export const {
2222
alwaysThrottleRetries,
23+
enableFabricCompleteRootInCommitPhase,
2324
enableHiddenSubtreeInsertionEffectCleanup,
2425
enableObjectFiber,
2526
enablePersistedModeClonedFlag,

packages/shared/forks/ReactFeatureFlags.native-oss.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export const enableAsyncIterableChildren = false;
3030
export const enableCPUSuspense = false;
3131
export const enableCreateEventHandleAPI = false;
3232
export const enableDO_NOT_USE_disableStrictPassiveEffect = false;
33+
export const enableFabricCompleteRootInCommitPhase = false;
3334
export const enableMoveBefore = true;
3435
export const enableFizzExternalRuntime = true;
3536
export const enableHalt = false;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export const enableUseEffectEventHook = false;
3636
export const favorSafetyOverHydrationPerf = true;
3737
export const enableLegacyFBSupport = false;
3838
export const enableMoveBefore = false;
39+
export const enableFabricCompleteRootInCommitPhase = false;
3940
export const enableHiddenSubtreeInsertionEffectCleanup = false;
4041
export const enableHydrationLaneScheduling = true;
4142

packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export const renameElementSymbol = false;
6161
export const retryLaneExpirationMs = 5000;
6262
export const syncLaneExpirationMs = 250;
6363
export const transitionLaneExpirationMs = 5000;
64+
export const enableFabricCompleteRootInCommitPhase = false;
6465
export const enableSiblingPrerendering = true;
6566
export const enableUseEffectCRUDOverload = true;
6667
export const enableHydrationLaneScheduling = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export const favorSafetyOverHydrationPerf = true;
3939
export const enableLegacyFBSupport = false;
4040
export const enableMoveBefore = false;
4141
export const enableRenderableContext = false;
42+
export const enableFabricCompleteRootInCommitPhase = false;
4243
export const enableHiddenSubtreeInsertionEffectCleanup = true;
4344

4445
export const enableRetryLaneExpiration = false;

packages/shared/forks/ReactFeatureFlags.www.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export const enableProfilerTimer = __PROFILE__;
5050
export const enableProfilerCommitHooks = __PROFILE__;
5151
export const enableProfilerNestedUpdatePhase = __PROFILE__;
5252
export const enableUpdaterTracking = __PROFILE__;
53+
export const enableFabricCompleteRootInCommitPhase = false;
5354

5455
export const enableSuspenseAvoidThisFallback = true;
5556

0 commit comments

Comments
 (0)