{"files":[{"path":"packages\/react-reconciler\/src\/ReactFiberCommitWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberFlags.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/useEffectEvent-test.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb-dynamic.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"body":"I accidentally pushed this to new flag to\nhttps:\/\/github.com\/facebook\/react\/pull\/35541 and then merged it.\n\nReverting it so I can submit a review.","patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\nindex 946e758c1d..43db744007 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n@@ -47,7 +47,6 @@ import type {ViewTransitionState} from '.\/ReactFiberViewTransitionComponent';\n import {\n alwaysThrottleRetries,\n enableCreateEventHandleAPI,\n- enableEffectEventMutationPhase,\n enableHiddenSubtreeInsertionEffectCleanup,\n enableProfilerTimer,\n enableProfilerCommitHooks,\n@@ -500,7 +499,7 @@ function commitBeforeMutationEffectsOnFiber(\n case FunctionComponent:\n case ForwardRef:\n case SimpleMemoComponent: {\n- if (!enableEffectEventMutationPhase && (flags & Update) !== NoFlags) {\n+ if ((flags & Update) !== NoFlags) {\n const updateQueue: FunctionComponentUpdateQueue | null =\n (finishedWork.updateQueue: any);\n const eventPayloads = updateQueue !== null ? updateQueue.events : null;\n@@ -2047,19 +2046,6 @@ function commitMutationEffectsOnFiber(\n commitReconciliationEffects(finishedWork, lanes);\n \n if (flags & Update) {\n- \/\/ Mutate event effect callbacks before insertion effects.\n- if (enableEffectEventMutationPhase) {\n- const updateQueue: FunctionComponentUpdateQueue | null =\n- (finishedWork.updateQueue: any);\n- const eventPayloads =\n- updateQueue !== null ? updateQueue.events : null;\n- if (eventPayloads !== null) {\n- for (let ii = 0; ii < eventPayloads.length; ii++) {\n- const {ref, nextImpl} = eventPayloads[ii];\n- ref.impl = nextImpl;\n- }\n- }\n- }\n commitHookEffectListUnmount(\n HookInsertion | HookHasEffect,\n finishedWork,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberFlags.js b\/packages\/react-reconciler\/src\/ReactFiberFlags.js\nindex 9f85897fb0..2d8d3f7fd1 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberFlags.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberFlags.js\n@@ -7,10 +7,7 @@\n * @flow\n *\/\n \n-import {\n- enableCreateEventHandleAPI,\n- enableEffectEventMutationPhase,\n-} from 'shared\/ReactFeatureFlags';\n+import {enableCreateEventHandleAPI} from 'shared\/ReactFeatureFlags';\n \n export type Flags = number;\n \n@@ -102,11 +99,10 @@ export const BeforeMutationMask: number =\n \/\/ TODO: Only need to visit Deletions during BeforeMutation phase if an\n \/\/ element is focused.\n Update | ChildDeletion | Visibility\n- : \/\/ useEffectEvent uses the snapshot phase,\n- \/\/ but we're moving it to the mutation phase.\n- enableEffectEventMutationPhase\n- ? 0\n- : Update);\n+ : \/\/ TODO: The useEffectEvent hook uses the snapshot phase for clean up but it\n+ \/\/ really should use the mutation phase for this or at least schedule an\n+ \/\/ explicit Snapshot phase flag for this.\n+ Update);\n \n \/\/ For View Transition support we use the snapshot phase to scan the tree for potentially\n \/\/ affected ViewTransition components.\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/useEffectEvent-test.js b\/packages\/react-reconciler\/src\/__tests__\/useEffectEvent-test.js\nindex 0d903d59e4..2b5af2206b 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/useEffectEvent-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/useEffectEvent-test.js\n@@ -595,214 +595,6 @@ describe('useEffectEvent', () => {\n assertLog(['Effect value: 2', 'Event value: 2']);\n });\n \n- it('updates parent and child event effects before their respective effect lifecycles', async () => {\n- function Parent({value}) {\n- const parentEvent = useEffectEvent(() => {\n- Scheduler.log('Parent event: ' + value);\n- });\n-\n- useInsertionEffect(() => {\n- Scheduler.log('Parent insertion');\n- parentEvent();\n- }, [value]);\n-\n- return ;\n- }\n-\n- function Child({value}) {\n- const childEvent = useEffectEvent(() => {\n- Scheduler.log('Child event: ' + value);\n- });\n-\n- useInsertionEffect(() => {\n- Scheduler.log('Child insertion');\n- childEvent();\n- }, [value]);\n-\n- return null;\n- }\n-\n- ReactNoop.render();\n- await waitForAll([\n- 'Child insertion',\n- 'Child event: 1',\n- 'Parent insertion',\n- 'Parent event: 1',\n- ]);\n-\n- await act(() => ReactNoop.render());\n- \/\/ Each component's event is updated before its own insertion effect runs\n- assertLog([\n- 'Child insertion',\n- 'Child event: 2',\n- 'Parent insertion',\n- 'Parent event: 2',\n- ]);\n- });\n-\n- it('fires all insertion effects (interleaved) with useEffectEvent before firing any layout effects', async () => {\n- \/\/ This test mirrors the 'fires all insertion effects (interleaved) before firing any layout effects'\n- \/\/ test in ReactHooksWithNoopRenderer-test.js, but adds useEffectEvent to verify that\n- \/\/ event payloads are updated before each component's insertion effects run.\n- \/\/ It also includes passive effects to verify the full effect lifecycle.\n- let committedA = '(empty)';\n- let committedB = '(empty)';\n-\n- function CounterA(props) {\n- const onEvent = useEffectEvent(() => {\n- return `Event A [A: ${committedA}, B: ${committedB}]`;\n- });\n-\n- useInsertionEffect(() => {\n- \/\/ Call the event function to verify it sees the latest value\n- Scheduler.log(\n- `Create Insertion A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- committedA = String(props.count);\n- return () => {\n- Scheduler.log(\n- `Destroy Insertion A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- useLayoutEffect(() => {\n- Scheduler.log(\n- `Create Layout A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- return () => {\n- Scheduler.log(\n- `Destroy Layout A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- useEffect(() => {\n- Scheduler.log(\n- `Create Passive A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- return () => {\n- Scheduler.log(\n- `Destroy Passive A [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- return null;\n- }\n-\n- function CounterB(props) {\n- const onEvent = useEffectEvent(() => {\n- return `Event B [A: ${committedA}, B: ${committedB}]`;\n- });\n-\n- useInsertionEffect(() => {\n- \/\/ Call the event function to verify it sees the latest value\n- Scheduler.log(\n- `Create Insertion B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- committedB = String(props.count);\n- return () => {\n- Scheduler.log(\n- `Destroy Insertion B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- useLayoutEffect(() => {\n- Scheduler.log(\n- `Create Layout B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- return () => {\n- Scheduler.log(\n- `Destroy Layout B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- useEffect(() => {\n- Scheduler.log(\n- `Create Passive B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- return () => {\n- Scheduler.log(\n- `Destroy Passive B [A: ${committedA}, B: ${committedB}], event: ${onEvent()}`,\n- );\n- };\n- });\n-\n- return null;\n- }\n-\n- await act(async () => {\n- ReactNoop.render(\n- \n- \n- \n- <\/React.Fragment>,\n- );\n- \/\/ All insertion effects fire before all layout effects, then passive effects\n- \/\/ Event functions should see the state AT THE TIME they're called\n- await waitForAll([\n- \/\/ Insertion effects (mutation phase)\n- 'Create Insertion A [A: (empty), B: (empty)], event: Event A [A: (empty), B: (empty)]',\n- 'Create Insertion B [A: 0, B: (empty)], event: Event B [A: 0, B: (empty)]',\n- \/\/ Layout effects\n- 'Create Layout A [A: 0, B: 0], event: Event A [A: 0, B: 0]',\n- 'Create Layout B [A: 0, B: 0], event: Event B [A: 0, B: 0]',\n- \/\/ Passive effects\n- 'Create Passive A [A: 0, B: 0], event: Event A [A: 0, B: 0]',\n- 'Create Passive B [A: 0, B: 0], event: Event B [A: 0, B: 0]',\n- ]);\n- expect([committedA, committedB]).toEqual(['0', '0']);\n- });\n-\n- await act(async () => {\n- ReactNoop.render(\n- \n- \n- \n- <\/React.Fragment>,\n- );\n- await waitForAll([\n- \/\/ Component A: insertion destroy, then create\n- 'Destroy Insertion A [A: 0, B: 0], event: Event A [A: 0, B: 0]',\n- 'Create Insertion A [A: 0, B: 0], event: Event A [A: 0, B: 0]',\n- \/\/ Component A: layout destroy (after insertion updated committedA)\n- 'Destroy Layout A [A: 1, B: 0], event: Event A [A: 1, B: 0]',\n- \/\/ Component B: insertion destroy, then create\n- 'Destroy Insertion B [A: 1, B: 0], event: Event B [A: 1, B: 0]',\n- 'Create Insertion B [A: 1, B: 0], event: Event B [A: 1, B: 0]',\n- \/\/ Component B: layout destroy (after insertion updated committedB)\n- 'Destroy Layout B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- \/\/ Layout creates\n- 'Create Layout A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Create Layout B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- \/\/ Passive destroys then creates\n- 'Destroy Passive A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Destroy Passive B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- 'Create Passive A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Create Passive B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- ]);\n- expect([committedA, committedB]).toEqual(['1', '1']);\n- });\n-\n- \/\/ Unmount everything\n- await act(async () => {\n- ReactNoop.render(null);\n- await waitForAll([\n- \/\/ Insertion and layout destroys (mutation\/layout phase)\n- 'Destroy Insertion A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Destroy Layout A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Destroy Insertion B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- 'Destroy Layout B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- \/\/ Passive destroys\n- 'Destroy Passive A [A: 1, B: 1], event: Event A [A: 1, B: 1]',\n- 'Destroy Passive B [A: 1, B: 1], event: Event B [A: 1, B: 1]',\n- ]);\n- });\n- });\n-\n it(\"doesn't provide a stable identity\", async () => {\n function Counter({shouldRender, value}) {\n const onClick = useEffectEvent(() => {\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 3e68d8c899..587e4e6a1d 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -125,10 +125,6 @@ export const enableFizzExternalRuntime = __EXPERIMENTAL__;\n \n export const alwaysThrottleRetries: boolean = true;\n \n-\/\/ Gate whether useEffectEvent uses the mutation phase (true) or before-mutation\n-\/\/ phase (false) for updating event function references.\n-export const enableEffectEventMutationPhase: boolean = false;\n-\n export const passChildrenWhenCloningPersistedNodes: boolean = false;\n \n export const enableEagerAlternateStateNodeCleanup: boolean = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb-dynamic.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb-dynamic.js\nindex 389d46be49..f139a3fcf2 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb-dynamic.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb-dynamic.js\n@@ -27,4 +27,3 @@ export const enableFragmentRefs = __VARIANT__;\n export const enableFragmentRefsScrollIntoView = __VARIANT__;\n export const enableFragmentRefsInstanceHandles = __VARIANT__;\n export const enableComponentPerformanceTrack = __VARIANT__;\n-export const enableEffectEventMutationPhase = __VARIANT__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex cb0b0b66f6..e2674b70fe 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -20,7 +20,6 @@ const dynamicFlags: DynamicExportsType = (dynamicFlagsUntyped: any);\n \/\/ the exports object every time a flag is read.\n export const {\n alwaysThrottleRetries,\n- enableEffectEventMutationPhase,\n enableHiddenSubtreeInsertionEffectCleanup,\n enableObjectFiber,\n enableEagerAlternateStateNodeCleanup,\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex f1e697b7b2..672c375510 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -46,7 +46,6 @@ export const enableSchedulingProfiler: boolean =\n !enableComponentPerformanceTrack && __PROFILE__;\n export const enableScopeAPI: boolean = false;\n export const enableEagerAlternateStateNodeCleanup: boolean = true;\n-export const enableEffectEventMutationPhase: boolean = false;\n export const enableSuspenseAvoidThisFallback: boolean = false;\n export const enableSuspenseCallback: boolean = false;\n export const enableTaint: boolean = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 8e65aea17b..67c08d9436 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -58,7 +58,6 @@ export const enableInfiniteRenderLoopDetection: boolean = false;\n \n export const renameElementSymbol: boolean = true;\n export const enableEagerAlternateStateNodeCleanup: boolean = true;\n-export const enableEffectEventMutationPhase: boolean = false;\n \n export const enableYieldingBeforePassive: boolean = true;\n \ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 120a20160f..a0ee01baa7 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -43,7 +43,6 @@ export const enableComponentPerformanceTrack = false;\n export const enablePerformanceIssueReporting = false;\n export const enableScopeAPI = false;\n export const enableEagerAlternateStateNodeCleanup = true;\n-export const enableEffectEventMutationPhase = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseCallback = false;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex dee7642449..058fd752d6 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -64,7 +64,6 @@ export const renameElementSymbol: boolean = false;\n \n export const enableObjectFiber: boolean = false;\n export const enableEagerAlternateStateNodeCleanup: boolean = true;\n-export const enableEffectEventMutationPhase: boolean = false;\n \n export const enableHydrationLaneScheduling: boolean = true;\n \ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\nindex 206e9ec3a3..1d174609cb 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n@@ -40,8 +40,6 @@ export const enableAsyncDebugInfo: boolean = __VARIANT__;\n \n export const enableInternalInstanceMap: boolean = __VARIANT__;\n \n-export const enableEffectEventMutationPhase: boolean = __VARIANT__;\n-\n \/\/ TODO: These flags are hard-coded to the default values used in open source.\n \/\/ Update the tests so that they pass in either mode, then set these\n \/\/ to __VARIANT__.\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 1db222df0b..0752f266af 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -18,7 +18,6 @@ export const {\n alwaysThrottleRetries,\n disableLegacyContextForFunctionComponents,\n disableSchedulerTimeoutInWorkLoop,\n- enableEffectEventMutationPhase,\n enableHiddenSubtreeInsertionEffectCleanup,\n enableInfiniteRenderLoopDetection,\n enableNoCloningMemoCache,\n","commit":{"revision":"be3fb29904a23322bd3cef7752df517fabdc188a","shortRevision":"be3fb29904","authorName":"Ricky","subject":"[internal] revert change merged accidentally (#35546)","authoredAt":"2026-01-17T13:21:46-05:00","authorEmail":"rickhanlonii@gmail.com"},"parents":["23e5edd05c1f89dc7a23452afabd02003c225858"]}

dillon1000/react

Files changed