{"files":[{"path":"packages\/react-devtools-shared\/src\/__tests__\/__snapshots__\/profilingCache-test.js.snap","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactMount-test.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOM.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMLegacy.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMUpdateBatching.js","status":"M"},{"path":"packages\/react-noop-renderer\/src\/ReactNoop.js","status":"M"},{"path":"packages\/react-noop-renderer\/src\/ReactNoopPersistent.js","status":"M"},{"path":"packages\/react-noop-renderer\/src\/createReactNoop.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberReconciler.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberReconciler.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberReconciler.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactFlushSync-test.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalScheduling-test.js","status":"M"}],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/__snapshots__\/profilingCache-test.js.snap b\/packages\/react-devtools-shared\/src\/__tests__\/__snapshots__\/profilingCache-test.js.snap\nindex 2ab8751e3c..b27231efdf 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/__snapshots__\/profilingCache-test.js.snap\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/__snapshots__\/profilingCache-test.js.snap\n@@ -40,7 +40,7 @@ Object {\n 6 => 1,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 16,\n \"updaters\": Array [\n Object {\n@@ -87,7 +87,7 @@ Object {\n 4 => 2,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 15,\n \"updaters\": Array [\n Object {\n@@ -186,7 +186,7 @@ Object {\n 6 => 1,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 12,\n \"updaters\": Array [\n Object {\n@@ -445,7 +445,7 @@ Object {\n ],\n ],\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 12,\n \"updaters\": Array [\n Object {\n@@ -938,7 +938,7 @@ Object {\n ],\n ],\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 11,\n \"updaters\": Array [\n Object {\n@@ -1597,7 +1597,7 @@ Object {\n 17 => 1,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 24,\n \"updaters\": Array [\n Object {\n@@ -1687,7 +1687,7 @@ Object {\n \"fiberActualDurations\": Map {},\n \"fiberSelfDurations\": Map {},\n \"passiveEffectDuration\": 0,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 34,\n \"updaters\": Array [\n Object {\n@@ -2223,7 +2223,7 @@ Object {\n ],\n ],\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 24,\n \"updaters\": Array [\n Object {\n@@ -2310,7 +2310,7 @@ Object {\n \"fiberActualDurations\": Array [],\n \"fiberSelfDurations\": Array [],\n \"passiveEffectDuration\": 0,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 34,\n \"updaters\": Array [\n Object {\n@@ -2431,7 +2431,7 @@ Object {\n 2 => 0,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 0,\n \"updaters\": Array [\n Object {\n@@ -2506,7 +2506,7 @@ Object {\n 3 => 0,\n },\n \"passiveEffectDuration\": 0,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 0,\n \"updaters\": Array [\n Object {\n@@ -2715,7 +2715,7 @@ Object {\n ],\n ],\n \"passiveEffectDuration\": 0,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 0,\n \"updaters\": Array [\n Object {\n@@ -3071,7 +3071,7 @@ Object {\n 7 => 0,\n },\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 0,\n \"updaters\": Array [\n Object {\n@@ -3515,7 +3515,7 @@ Object {\n ],\n ],\n \"passiveEffectDuration\": null,\n- \"priorityLevel\": \"Immediate\",\n+ \"priorityLevel\": \"Normal\",\n \"timestamp\": 0,\n \"updaters\": Array [\n Object {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\nindex ff1ea1771f..36c8367af5 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\n@@ -1154,13 +1154,19 @@ describe('ReactDOMFiber', () => {\n expect(ops).toEqual(['A']);\n \n if (__DEV__) {\n- expect(console.error.calls.count()).toBe(2);\n+ const errorCalls = console.error.calls.count();\n expect(console.error.calls.argsFor(0)[0]).toMatch(\n 'ReactDOM.render is no longer supported in React 18',\n );\n expect(console.error.calls.argsFor(1)[0]).toMatch(\n 'ReactDOM.render is no longer supported in React 18',\n );\n+ \/\/ TODO: this warning shouldn't be firing in the first place if user didn't call it.\n+ for (let i = 2; i < errorCalls; i++) {\n+ expect(console.error.calls.argsFor(i)[0]).toMatch(\n+ 'unstable_flushDiscreteUpdates: Cannot flush updates when React is already rendering.',\n+ );\n+ }\n }\n });\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactMount-test.js b\/packages\/react-dom\/src\/__tests__\/ReactMount-test.js\nindex 9571905eda..a214c32f58 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactMount-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactMount-test.js\n@@ -277,7 +277,7 @@ describe('ReactMount', () => {\n expect(calls).toBe(5);\n });\n \n- it('initial mount of legacy root is sync inside batchedUpdates, as if it were wrapped in flushSync', () => {\n+ it('initial mount is sync inside batchedUpdates, but task work is deferred until the end of the batch', () => {\n const container1 = document.createElement('div');\n const container2 = document.createElement('div');\n \n@@ -302,12 +302,12 @@ describe('ReactMount', () => {\n \n \/\/ Initial mount on another root. Should flush immediately.\n ReactDOM.render(a<\/Foo>, container2);\n- \/\/ The earlier update also flushed, since flushSync flushes all pending\n- \/\/ sync work across all roots.\n- expect(container1.textContent).toEqual('2');\n- \/\/ Layout updates are also flushed synchronously\n- expect(container2.textContent).toEqual('a!');\n+ \/\/ The update did not flush yet.\n+ expect(container1.textContent).toEqual('1');\n+ \/\/ The initial mount flushed, but not the update scheduled in cDM.\n+ expect(container2.textContent).toEqual('a');\n });\n+ \/\/ All updates have flushed.\n expect(container1.textContent).toEqual('2');\n expect(container2.textContent).toEqual('a!');\n });\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex 80fc3d1e4a..8e97469707 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -23,8 +23,8 @@ import {createEventHandle} from '.\/ReactDOMEventHandle';\n import {\n batchedUpdates,\n discreteUpdates,\n+ flushDiscreteUpdates,\n flushSync,\n- flushSyncWithoutWarningIfAlreadyRendering,\n flushControlled,\n injectIntoDevTools,\n attemptSynchronousHydration,\n@@ -100,7 +100,7 @@ setRestoreImplementation(restoreControlledState);\n setBatchingImplementation(\n batchedUpdates,\n discreteUpdates,\n- flushSyncWithoutWarningIfAlreadyRendering,\n+ flushDiscreteUpdates,\n );\n \n function createPortal(\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMLegacy.js b\/packages\/react-dom\/src\/client\/ReactDOMLegacy.js\nindex f03350cb29..a62a7fb444 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMLegacy.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMLegacy.js\n@@ -29,7 +29,7 @@ import {\n createContainer,\n findHostInstanceWithNoPortals,\n updateContainer,\n- flushSyncWithoutWarningIfAlreadyRendering,\n+ unbatchedUpdates,\n getPublicRootInstance,\n findHostInstance,\n findHostInstanceWithWarning,\n@@ -174,7 +174,7 @@ function legacyRenderSubtreeIntoContainer(\n };\n }\n \/\/ Initial mount should not be batched.\n- flushSyncWithoutWarningIfAlreadyRendering(() => {\n+ unbatchedUpdates(() => {\n updateContainer(children, fiberRoot, parentComponent, callback);\n });\n } else {\n@@ -357,7 +357,7 @@ export function unmountComponentAtNode(container: Container) {\n }\n \n \/\/ Unmount should not be batched.\n- flushSyncWithoutWarningIfAlreadyRendering(() => {\n+ unbatchedUpdates(() => {\n legacyRenderSubtreeIntoContainer(null, null, container, false, () => {\n \/\/ $FlowFixMe This should probably use `delete container._reactRootContainer`\n container._reactRootContainer = null;\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMUpdateBatching.js b\/packages\/react-dom\/src\/events\/ReactDOMUpdateBatching.js\nindex d3c46630b1..f2fbfe4c3f 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMUpdateBatching.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMUpdateBatching.js\n@@ -23,7 +23,7 @@ let batchedUpdatesImpl = function(fn, bookkeeping) {\n let discreteUpdatesImpl = function(fn, a, b, c, d) {\n return fn(a, b, c, d);\n };\n-let flushSyncImpl = function() {};\n+let flushDiscreteUpdatesImpl = function() {};\n \n let isInsideEventHandler = false;\n \n@@ -39,7 +39,7 @@ function finishEventHandler() {\n \/\/ bails out of the update without touching the DOM.\n \/\/ TODO: Restore state in the microtask, after the discrete updates flush,\n \/\/ instead of early flushing them here.\n- flushSyncImpl();\n+ flushDiscreteUpdatesImpl();\n restoreStateIfNeeded();\n }\n }\n@@ -67,9 +67,9 @@ export function discreteUpdates(fn, a, b, c, d) {\n export function setBatchingImplementation(\n _batchedUpdatesImpl,\n _discreteUpdatesImpl,\n- _flushSyncImpl,\n+ _flushDiscreteUpdatesImpl,\n ) {\n batchedUpdatesImpl = _batchedUpdatesImpl;\n discreteUpdatesImpl = _discreteUpdatesImpl;\n- flushSyncImpl = _flushSyncImpl;\n+ flushDiscreteUpdatesImpl = _flushDiscreteUpdatesImpl;\n }\ndiff --git a\/packages\/react-noop-renderer\/src\/ReactNoop.js b\/packages\/react-noop-renderer\/src\/ReactNoop.js\nindex a225deaf96..c09fa2d800 100644\n--- a\/packages\/react-noop-renderer\/src\/ReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/ReactNoop.js\n@@ -38,8 +38,10 @@ export const {\n flushExpired,\n batchedUpdates,\n deferredUpdates,\n+ unbatchedUpdates,\n discreteUpdates,\n idleUpdates,\n+ flushDiscreteUpdates,\n flushSync,\n flushPassiveEffects,\n act,\ndiff --git a\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js b\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\nindex 86bb87c065..97876990a9 100644\n--- a\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\n+++ b\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\n@@ -38,6 +38,7 @@ export const {\n flushExpired,\n batchedUpdates,\n deferredUpdates,\n+ unbatchedUpdates,\n discreteUpdates,\n idleUpdates,\n flushDiscreteUpdates,\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex 5ea510d73d..8dbadafd2c 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -901,6 +901,8 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n \n deferredUpdates: NoopRenderer.deferredUpdates,\n \n+ unbatchedUpdates: NoopRenderer.unbatchedUpdates,\n+\n discreteUpdates: NoopRenderer.discreteUpdates,\n \n idleUpdates(fn: () => T): T {\n@@ -913,6 +915,8 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n }\n },\n \n+ flushDiscreteUpdates: NoopRenderer.flushDiscreteUpdates,\n+\n flushSync(fn: () => mixed) {\n NoopRenderer.flushSync(fn);\n },\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\nindex d25783164e..bc169fd8a6 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n@@ -18,11 +18,12 @@ import {\n createContainer as createContainer_old,\n updateContainer as updateContainer_old,\n batchedUpdates as batchedUpdates_old,\n+ unbatchedUpdates as unbatchedUpdates_old,\n deferredUpdates as deferredUpdates_old,\n discreteUpdates as discreteUpdates_old,\n+ flushDiscreteUpdates as flushDiscreteUpdates_old,\n flushControlled as flushControlled_old,\n flushSync as flushSync_old,\n- flushSyncWithoutWarningIfAlreadyRendering as flushSyncWithoutWarningIfAlreadyRendering_old,\n flushPassiveEffects as flushPassiveEffects_old,\n getPublicRootInstance as getPublicRootInstance_old,\n attemptSynchronousHydration as attemptSynchronousHydration_old,\n@@ -55,11 +56,12 @@ import {\n createContainer as createContainer_new,\n updateContainer as updateContainer_new,\n batchedUpdates as batchedUpdates_new,\n+ unbatchedUpdates as unbatchedUpdates_new,\n deferredUpdates as deferredUpdates_new,\n discreteUpdates as discreteUpdates_new,\n+ flushDiscreteUpdates as flushDiscreteUpdates_new,\n flushControlled as flushControlled_new,\n flushSync as flushSync_new,\n- flushSyncWithoutWarningIfAlreadyRendering as flushSyncWithoutWarningIfAlreadyRendering_new,\n flushPassiveEffects as flushPassiveEffects_new,\n getPublicRootInstance as getPublicRootInstance_new,\n attemptSynchronousHydration as attemptSynchronousHydration_new,\n@@ -97,19 +99,22 @@ export const updateContainer = enableNewReconciler\n export const batchedUpdates = enableNewReconciler\n ? batchedUpdates_new\n : batchedUpdates_old;\n+export const unbatchedUpdates = enableNewReconciler\n+ ? unbatchedUpdates_new\n+ : unbatchedUpdates_old;\n export const deferredUpdates = enableNewReconciler\n ? deferredUpdates_new\n : deferredUpdates_old;\n export const discreteUpdates = enableNewReconciler\n ? discreteUpdates_new\n : discreteUpdates_old;\n+export const flushDiscreteUpdates = enableNewReconciler\n+ ? flushDiscreteUpdates_new\n+ : flushDiscreteUpdates_old;\n export const flushControlled = enableNewReconciler\n ? flushControlled_new\n : flushControlled_old;\n export const flushSync = enableNewReconciler ? flushSync_new : flushSync_old;\n-export const flushSyncWithoutWarningIfAlreadyRendering = enableNewReconciler\n- ? flushSyncWithoutWarningIfAlreadyRendering_new\n- : flushSyncWithoutWarningIfAlreadyRendering_old;\n export const flushPassiveEffects = enableNewReconciler\n ? flushPassiveEffects_new\n : flushPassiveEffects_old;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\nindex 7ab995a5fc..f406f8592b 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n@@ -52,11 +52,12 @@ import {\n scheduleUpdateOnFiber,\n flushRoot,\n batchedUpdates,\n+ unbatchedUpdates,\n flushSync,\n flushControlled,\n deferredUpdates,\n discreteUpdates,\n- flushSyncWithoutWarningIfAlreadyRendering,\n+ flushDiscreteUpdates,\n flushPassiveEffects,\n } from '.\/ReactFiberWorkLoop.new';\n import {\n@@ -326,11 +327,12 @@ export function updateContainer(\n \n export {\n batchedUpdates,\n+ unbatchedUpdates,\n deferredUpdates,\n discreteUpdates,\n+ flushDiscreteUpdates,\n flushControlled,\n flushSync,\n- flushSyncWithoutWarningIfAlreadyRendering,\n flushPassiveEffects,\n };\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\nindex da127689c7..f6ae425b44 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n@@ -52,11 +52,12 @@ import {\n scheduleUpdateOnFiber,\n flushRoot,\n batchedUpdates,\n+ unbatchedUpdates,\n flushSync,\n flushControlled,\n deferredUpdates,\n discreteUpdates,\n- flushSyncWithoutWarningIfAlreadyRendering,\n+ flushDiscreteUpdates,\n flushPassiveEffects,\n } from '.\/ReactFiberWorkLoop.old';\n import {\n@@ -326,11 +327,12 @@ export function updateContainer(\n \n export {\n batchedUpdates,\n+ unbatchedUpdates,\n deferredUpdates,\n discreteUpdates,\n+ flushDiscreteUpdates,\n flushControlled,\n flushSync,\n- flushSyncWithoutWarningIfAlreadyRendering,\n flushPassiveEffects,\n };\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\nindex aa36d6da83..7f429c8734 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n@@ -246,11 +246,12 @@ const {\n \n type ExecutionContext = number;\n \n-export const NoContext = \/* *\/ 0b0000;\n-const BatchedContext = \/* *\/ 0b0001;\n-const RenderContext = \/* *\/ 0b0010;\n-const CommitContext = \/* *\/ 0b0100;\n-export const RetryAfterError = \/* *\/ 0b1000;\n+export const NoContext = \/* *\/ 0b00000;\n+const BatchedContext = \/* *\/ 0b00001;\n+const LegacyUnbatchedContext = \/* *\/ 0b00010;\n+const RenderContext = \/* *\/ 0b00100;\n+const CommitContext = \/* *\/ 0b01000;\n+export const RetryAfterError = \/* *\/ 0b10000;\n \n type RootExitStatus = 0 | 1 | 2 | 3 | 4 | 5;\n const RootIncomplete = 0;\n@@ -514,19 +515,35 @@ export function scheduleUpdateOnFiber(\n }\n }\n \n- ensureRootIsScheduled(root, eventTime);\n- if (\n- lane === SyncLane &&\n- executionContext === NoContext &&\n- (fiber.mode & ConcurrentMode) === NoMode\n- ) {\n- \/\/ Flush the synchronous work now, unless we're already working or inside\n- \/\/ a batch. This is intentionally inside scheduleUpdateOnFiber instead of\n- \/\/ scheduleCallbackForFiber to preserve the ability to schedule a callback\n- \/\/ without immediately flushing it. We only do this for user-initiated\n- \/\/ updates, to preserve historical behavior of legacy mode.\n- resetRenderTimer();\n- flushSyncCallbacksOnlyInLegacyMode();\n+ if (lane === SyncLane) {\n+ if (\n+ \/\/ Check if we're inside unbatchedUpdates\n+ (executionContext & LegacyUnbatchedContext) !== NoContext &&\n+ \/\/ Check if we're not already rendering\n+ (executionContext & (RenderContext | CommitContext)) === NoContext\n+ ) {\n+ \/\/ This is a legacy edge case. The initial mount of a ReactDOM.render-ed\n+ \/\/ root inside of batchedUpdates should be synchronous, but layout updates\n+ \/\/ should be deferred until the end of the batch.\n+ performSyncWorkOnRoot(root);\n+ } else {\n+ ensureRootIsScheduled(root, eventTime);\n+ if (\n+ executionContext === NoContext &&\n+ (fiber.mode & ConcurrentMode) === NoMode\n+ ) {\n+ \/\/ Flush the synchronous work now, unless we're already working or inside\n+ \/\/ a batch. This is intentionally inside scheduleUpdateOnFiber instead of\n+ \/\/ scheduleCallbackForFiber to preserve the ability to schedule a callback\n+ \/\/ without immediately flushing it. We only do this for user-initiated\n+ \/\/ updates, to preserve historical behavior of legacy mode.\n+ resetRenderTimer();\n+ flushSyncCallbacksOnlyInLegacyMode();\n+ }\n+ }\n+ } else {\n+ \/\/ Schedule other updates after in case the callback is sync.\n+ ensureRootIsScheduled(root, eventTime);\n }\n \n return root;\n@@ -1027,6 +1044,34 @@ export function getExecutionContext(): ExecutionContext {\n return executionContext;\n }\n \n+export function flushDiscreteUpdates() {\n+ \/\/ TODO: Should be able to flush inside batchedUpdates, but not inside `act`.\n+ \/\/ However, `act` uses `batchedUpdates`, so there's no way to distinguish\n+ \/\/ those two cases. Need to fix this before exposing flushDiscreteUpdates\n+ \/\/ as a public API.\n+ if (\n+ (executionContext & (BatchedContext | RenderContext | CommitContext)) !==\n+ NoContext\n+ ) {\n+ if (__DEV__) {\n+ if ((executionContext & RenderContext) !== NoContext) {\n+ console.error(\n+ 'unstable_flushDiscreteUpdates: Cannot flush updates when React is ' +\n+ 'already rendering.',\n+ );\n+ }\n+ }\n+ \/\/ We're already rendering, so we can't synchronously flush pending work.\n+ \/\/ This is probably a nested event dispatch triggered by a lifecycle\/effect,\n+ \/\/ like `el.focus()`. Exit.\n+ return;\n+ }\n+ flushSyncCallbacks();\n+ \/\/ If the discrete updates scheduled passive effects, flush them now so that\n+ \/\/ they fire before the next serial event.\n+ flushPassiveEffects();\n+}\n+\n export function deferredUpdates(fn: () => A): A {\n const previousPriority = getCurrentUpdatePriority();\n const prevTransition = ReactCurrentBatchConfig.transition;\n@@ -1078,10 +1123,26 @@ export function discreteUpdates(\n }\n }\n \n-export function flushSyncWithoutWarningIfAlreadyRendering(\n- fn: A => R,\n- a: A,\n-): R {\n+export function unbatchedUpdates(fn: (a: A) => R, a: A): R {\n+ const prevExecutionContext = executionContext;\n+ executionContext &= ~BatchedContext;\n+ executionContext |= LegacyUnbatchedContext;\n+ try {\n+ return fn(a);\n+ } finally {\n+ executionContext = prevExecutionContext;\n+ \/\/ If there were legacy sync updates, flush them at the end of the outer\n+ \/\/ most batchedUpdates-like method.\n+ if (executionContext === NoContext) {\n+ resetRenderTimer();\n+ \/\/ TODO: I think this call is redundant, because we flush inside\n+ \/\/ scheduleUpdateOnFiber when LegacyUnbatchedContext is set.\n+ flushSyncCallbacksOnlyInLegacyMode();\n+ }\n+ }\n+}\n+\n+export function flushSync(fn: A => R, a: A): R {\n const prevExecutionContext = executionContext;\n executionContext |= BatchedContext;\n \n@@ -1104,23 +1165,18 @@ export function flushSyncWithoutWarningIfAlreadyRendering(\n \/\/ the stack.\n if ((executionContext & (RenderContext | CommitContext)) === NoContext) {\n flushSyncCallbacks();\n+ } else {\n+ if (__DEV__) {\n+ console.error(\n+ 'flushSync was called from inside a lifecycle method. React cannot ' +\n+ 'flush when React is already rendering. Consider moving this call to ' +\n+ 'a scheduler task or micro task.',\n+ );\n+ }\n }\n }\n }\n \n-export function flushSync(fn: A => R, a: A): R {\n- if (__DEV__) {\n- if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {\n- console.error(\n- 'flushSync was called from inside a lifecycle method. React cannot ' +\n- 'flush when React is already rendering. Consider moving this call to ' +\n- 'a scheduler task or micro task.',\n- );\n- }\n- }\n- return flushSyncWithoutWarningIfAlreadyRendering(fn, a);\n-}\n-\n export function flushControlled(fn: () => mixed): void {\n const prevExecutionContext = executionContext;\n executionContext |= BatchedContext;\n@@ -1918,6 +1974,24 @@ function commitRootImpl(root, renderPriorityLevel) {\n throw error;\n }\n \n+ if ((executionContext & LegacyUnbatchedContext) !== NoContext) {\n+ if (__DEV__) {\n+ if (enableDebugTracing) {\n+ logCommitStopped();\n+ }\n+ }\n+\n+ if (enableSchedulingProfiler) {\n+ markCommitStopped();\n+ }\n+\n+ \/\/ This is a legacy edge case. We just committed the initial mount of\n+ \/\/ a ReactDOM.render-ed root inside of batchedUpdates. The commit fired\n+ \/\/ synchronously, but layout updates should be deferred until the end\n+ \/\/ of the batch.\n+ return null;\n+ }\n+\n \/\/ If the passive effects are the result of a discrete render, flush them\n \/\/ synchronously at the end of the current task so that the result is\n \/\/ immediately observable. Otherwise, we assume that they are not\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\nindex 2fd46c7cda..f356fc3f11 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n@@ -246,11 +246,12 @@ const {\n \n type ExecutionContext = number;\n \n-export const NoContext = \/* *\/ 0b0000;\n-const BatchedContext = \/* *\/ 0b0001;\n-const RenderContext = \/* *\/ 0b0010;\n-const CommitContext = \/* *\/ 0b0100;\n-export const RetryAfterError = \/* *\/ 0b1000;\n+export const NoContext = \/* *\/ 0b00000;\n+const BatchedContext = \/* *\/ 0b00001;\n+const LegacyUnbatchedContext = \/* *\/ 0b00010;\n+const RenderContext = \/* *\/ 0b00100;\n+const CommitContext = \/* *\/ 0b01000;\n+export const RetryAfterError = \/* *\/ 0b10000;\n \n type RootExitStatus = 0 | 1 | 2 | 3 | 4 | 5;\n const RootIncomplete = 0;\n@@ -514,19 +515,35 @@ export function scheduleUpdateOnFiber(\n }\n }\n \n- ensureRootIsScheduled(root, eventTime);\n- if (\n- lane === SyncLane &&\n- executionContext === NoContext &&\n- (fiber.mode & ConcurrentMode) === NoMode\n- ) {\n- \/\/ Flush the synchronous work now, unless we're already working or inside\n- \/\/ a batch. This is intentionally inside scheduleUpdateOnFiber instead of\n- \/\/ scheduleCallbackForFiber to preserve the ability to schedule a callback\n- \/\/ without immediately flushing it. We only do this for user-initiated\n- \/\/ updates, to preserve historical behavior of legacy mode.\n- resetRenderTimer();\n- flushSyncCallbacksOnlyInLegacyMode();\n+ if (lane === SyncLane) {\n+ if (\n+ \/\/ Check if we're inside unbatchedUpdates\n+ (executionContext & LegacyUnbatchedContext) !== NoContext &&\n+ \/\/ Check if we're not already rendering\n+ (executionContext & (RenderContext | CommitContext)) === NoContext\n+ ) {\n+ \/\/ This is a legacy edge case. The initial mount of a ReactDOM.render-ed\n+ \/\/ root inside of batchedUpdates should be synchronous, but layout updates\n+ \/\/ should be deferred until the end of the batch.\n+ performSyncWorkOnRoot(root);\n+ } else {\n+ ensureRootIsScheduled(root, eventTime);\n+ if (\n+ executionContext === NoContext &&\n+ (fiber.mode & ConcurrentMode) === NoMode\n+ ) {\n+ \/\/ Flush the synchronous work now, unless we're already working or inside\n+ \/\/ a batch. This is intentionally inside scheduleUpdateOnFiber instead of\n+ \/\/ scheduleCallbackForFiber to preserve the ability to schedule a callback\n+ \/\/ without immediately flushing it. We only do this for user-initiated\n+ \/\/ updates, to preserve historical behavior of legacy mode.\n+ resetRenderTimer();\n+ flushSyncCallbacksOnlyInLegacyMode();\n+ }\n+ }\n+ } else {\n+ \/\/ Schedule other updates after in case the callback is sync.\n+ ensureRootIsScheduled(root, eventTime);\n }\n \n return root;\n@@ -1027,6 +1044,34 @@ export function getExecutionContext(): ExecutionContext {\n return executionContext;\n }\n \n+export function flushDiscreteUpdates() {\n+ \/\/ TODO: Should be able to flush inside batchedUpdates, but not inside `act`.\n+ \/\/ However, `act` uses `batchedUpdates`, so there's no way to distinguish\n+ \/\/ those two cases. Need to fix this before exposing flushDiscreteUpdates\n+ \/\/ as a public API.\n+ if (\n+ (executionContext & (BatchedContext | RenderContext | CommitContext)) !==\n+ NoContext\n+ ) {\n+ if (__DEV__) {\n+ if ((executionContext & RenderContext) !== NoContext) {\n+ console.error(\n+ 'unstable_flushDiscreteUpdates: Cannot flush updates when React is ' +\n+ 'already rendering.',\n+ );\n+ }\n+ }\n+ \/\/ We're already rendering, so we can't synchronously flush pending work.\n+ \/\/ This is probably a nested event dispatch triggered by a lifecycle\/effect,\n+ \/\/ like `el.focus()`. Exit.\n+ return;\n+ }\n+ flushSyncCallbacks();\n+ \/\/ If the discrete updates scheduled passive effects, flush them now so that\n+ \/\/ they fire before the next serial event.\n+ flushPassiveEffects();\n+}\n+\n export function deferredUpdates (fn: () => A): A {\n const previousPriority = getCurrentUpdatePriority();\n const prevTransition = ReactCurrentBatchConfig.transition;\n@@ -1078,10 +1123,26 @@ export function discreteUpdates(\n }\n }\n \n-export function flushSyncWithoutWarningIfAlreadyRendering(\n- fn: A => R,\n- a: A,\n-): R {\n+export function unbatchedUpdates(fn: (a: A) => R, a: A): R {\n+ const prevExecutionContext = executionContext;\n+ executionContext &= ~BatchedContext;\n+ executionContext |= LegacyUnbatchedContext;\n+ try {\n+ return fn(a);\n+ } finally {\n+ executionContext = prevExecutionContext;\n+ \/\/ If there were legacy sync updates, flush them at the end of the outer\n+ \/\/ most batchedUpdates-like method.\n+ if (executionContext === NoContext) {\n+ resetRenderTimer();\n+ \/\/ TODO: I think this call is redundant, because we flush inside\n+ \/\/ scheduleUpdateOnFiber when LegacyUnbatchedContext is set.\n+ flushSyncCallbacksOnlyInLegacyMode();\n+ }\n+ }\n+}\n+\n+export function flushSync(fn: A => R, a: A): R {\n const prevExecutionContext = executionContext;\n executionContext |= BatchedContext;\n \n@@ -1104,23 +1165,18 @@ export function flushSyncWithoutWarningIfAlreadyRendering(\n \/\/ the stack.\n if ((executionContext & (RenderContext | CommitContext)) === NoContext) {\n flushSyncCallbacks();\n+ } else {\n+ if (__DEV__) {\n+ console.error(\n+ 'flushSync was called from inside a lifecycle method. React cannot ' +\n+ 'flush when React is already rendering. Consider moving this call to ' +\n+ 'a scheduler task or micro task.',\n+ );\n+ }\n }\n }\n }\n \n-export function flushSync(fn: A => R, a: A): R {\n- if (__DEV__) {\n- if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {\n- console.error(\n- 'flushSync was called from inside a lifecycle method. React cannot ' +\n- 'flush when React is already rendering. Consider moving this call to ' +\n- 'a scheduler task or micro task.',\n- );\n- }\n- }\n- return flushSyncWithoutWarningIfAlreadyRendering(fn, a);\n-}\n-\n export function flushControlled(fn: () => mixed): void {\n const prevExecutionContext = executionContext;\n executionContext |= BatchedContext;\n@@ -1918,6 +1974,24 @@ function commitRootImpl(root, renderPriorityLevel) {\n throw error;\n }\n \n+ if ((executionContext & LegacyUnbatchedContext) !== NoContext) {\n+ if (__DEV__) {\n+ if (enableDebugTracing) {\n+ logCommitStopped();\n+ }\n+ }\n+\n+ if (enableSchedulingProfiler) {\n+ markCommitStopped();\n+ }\n+\n+ \/\/ This is a legacy edge case. We just committed the initial mount of\n+ \/\/ a ReactDOM.render-ed root inside of batchedUpdates. The commit fired\n+ \/\/ synchronously, but layout updates should be deferred until the end\n+ \/\/ of the batch.\n+ return null;\n+ }\n+\n \/\/ If the passive effects are the result of a discrete render, flush them\n \/\/ synchronously at the end of the current task so that the result is\n \/\/ immediately observable. Otherwise, we assume that they are not\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactFlushSync-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactFlushSync-test.js\nindex c73e46ddc5..a3a74d739a 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactFlushSync-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactFlushSync-test.js\n@@ -173,27 +173,4 @@ describe('ReactFlushSync', () => {\n \/\/ Effect flushes after paint.\n expect(Scheduler).toHaveYielded(['Effect']);\n });\n-\n- test('does not flush pending passive effects', async () => {\n- function App() {\n- useEffect(() => {\n- Scheduler.unstable_yieldValue('Effect');\n- }, []);\n- return ;\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(async () => {\n- root.render();\n- expect(Scheduler).toFlushUntilNextPaint(['Child']);\n- expect(root).toMatchRenderedOutput('Child');\n-\n- \/\/ Passive effects are pending. Calling flushSync should not affect them.\n- ReactNoop.flushSync();\n- \/\/ Effects still haven't fired.\n- expect(Scheduler).toHaveYielded([]);\n- });\n- \/\/ Now the effects have fired.\n- expect(Scheduler).toHaveYielded(['Effect']);\n- });\n });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalScheduling-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalScheduling-test.js\nindex 9c94900851..b603b03c69 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalScheduling-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalScheduling-test.js\n@@ -349,4 +349,63 @@ describe('ReactIncrementalScheduling', () => {\n \/\/ The updates should all be flushed with Task priority\n expect(ReactNoop).toMatchRenderedOutput();\n });\n+\n+ it('can opt-out of batching using unbatchedUpdates', () => {\n+ ReactNoop.flushSync(() => {\n+ ReactNoop.render();\n+ expect(ReactNoop.getChildren()).toEqual([]);\n+ \/\/ Should not have flushed yet because we're still batching\n+\n+ \/\/ unbatchedUpdates reverses the effect of batchedUpdates, so sync\n+ \/\/ updates are not batched\n+ ReactNoop.unbatchedUpdates(() => {\n+ ReactNoop.render();\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ ReactNoop.render();\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ });\n+\n+ ReactNoop.render();\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ });\n+ \/\/ Remaining update is now flushed\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ });\n+\n+ it('nested updates are always deferred, even inside unbatchedUpdates', () => {\n+ let instance;\n+ class Foo extends React.Component {\n+ state = {step: 0};\n+ componentDidUpdate() {\n+ Scheduler.unstable_yieldValue('componentDidUpdate: ' + this.state.step);\n+ if (this.state.step === 1) {\n+ ReactNoop.unbatchedUpdates(() => {\n+ \/\/ This is a nested state update, so it should not be\n+ \/\/ flushed synchronously, even though we wrapped it\n+ \/\/ in unbatchedUpdates.\n+ this.setState({step: 2});\n+ });\n+ expect(Scheduler).toHaveYielded([\n+ 'render: 1',\n+ 'componentDidUpdate: 1',\n+ ]);\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ }\n+ }\n+ render() {\n+ Scheduler.unstable_yieldValue('render: ' + this.state.step);\n+ instance = this;\n+ return ;\n+ }\n+ }\n+ ReactNoop.render();\n+ expect(Scheduler).toFlushAndYield(['render: 0']);\n+ expect(ReactNoop).toMatchRenderedOutput();\n+\n+ ReactNoop.flushSync(() => {\n+ instance.setState({step: 1});\n+ });\n+ expect(Scheduler).toHaveYielded(['render: 2', 'componentDidUpdate: 2']);\n+ expect(ReactNoop).toMatchRenderedOutput();\n+ });\n });\n","commit":{"authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","revision":"9ccc25a0ea322b39ea04f8dfc03620ea90e0da94","subject":"Reverting recent flushSync changes (#21816)","shortRevision":"9ccc25a0ea","authoredAt":"2021-07-07T15:07:55-04:00"},"body":"","parents":["b6258b05f4ea16776557bc370ee0892604504d8f"]}

dillon1000/react

Files changed