{"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\nindex 7310a9c49b..1a37b74f71 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\n@@ -43,7 +43,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n }\n \n \/\/ @gate experimental\n- \/\/ @gate enableDiscreteEventMicroTasks && enableNativeEventPriorityInference\n+ \/\/ @gate enableNativeEventPriorityInference\n it('ignores discrete events on a pending removed element', async () => {\n const disableButtonRef = React.createRef();\n const submitButtonRef = React.createRef();\n@@ -95,7 +95,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n });\n \n \/\/ @gate experimental\n- \/\/ @gate enableDiscreteEventMicroTasks && enableNativeEventPriorityInference\n+ \/\/ @gate enableNativeEventPriorityInference\n it('ignores discrete events on a pending removed event listener', async () => {\n const disableButtonRef = React.createRef();\n const submitButtonRef = React.createRef();\n@@ -165,7 +165,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n });\n \n \/\/ @gate experimental\n- \/\/ @gate enableDiscreteEventMicroTasks && enableNativeEventPriorityInference\n+ \/\/ @gate enableNativeEventPriorityInference\n it('uses the newest discrete events on a pending changed event listener', async () => {\n const enableButtonRef = React.createRef();\n const submitButtonRef = React.createRef();\n@@ -229,7 +229,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n });\n \n \/\/ @gate experimental\n- \/\/ @gate enableDiscreteEventMicroTasks && enableNativeEventPriorityInference\n+ \/\/ @gate enableNativeEventPriorityInference\n it('mouse over should be user-blocking but not discrete', async () => {\n const root = ReactDOM.unstable_createRoot(container);\n \n@@ -260,7 +260,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n });\n \n \/\/ @gate experimental\n- \/\/ @gate enableDiscreteEventMicroTasks && enableNativeEventPriorityInference\n+ \/\/ @gate enableNativeEventPriorityInference\n it('mouse enter should be user-blocking but not discrete', async () => {\n const root = ReactDOM.unstable_createRoot(container);\n \ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 0f27a15db3..dfd29b375a 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -67,7 +67,6 @@ import {\n enableCreateEventHandleAPI,\n enableScopeAPI,\n enableNewReconciler,\n- enableDiscreteEventMicroTasks,\n } from 'shared\/ReactFeatureFlags';\n import {HostComponent, HostText} from 'react-reconciler\/src\/ReactWorkTags';\n import {listenToAllSupportedEvents} from '..\/events\/DOMPluginEventSystem';\n@@ -404,7 +403,7 @@ export const noTimeout = -1;\n \/\/ -------------------\n \/\/ Microtasks\n \/\/ -------------------\n-export const supportsMicrotasks = enableDiscreteEventMicroTasks;\n+export const supportsMicrotasks = true;\n export const scheduleMicrotask: any =\n typeof queueMicrotask === 'function'\n ? queueMicrotask\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ChangeEventPlugin-test.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ChangeEventPlugin-test.js\nindex 45828e2735..26630b68b1 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ChangeEventPlugin-test.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ChangeEventPlugin-test.js\n@@ -728,17 +728,10 @@ describe('ChangeEventPlugin', () => {\n expect(Scheduler).toHaveYielded([]);\n expect(input.value).toBe('initial');\n \n- \/\/ Flush callbacks.\n- \/\/ Now the click update has flushed.\n- if (gate(flags => flags.enableDiscreteEventMicroTasks)) {\n- \/\/ Flush microtask queue.\n- await null;\n- expect(Scheduler).toHaveYielded(['render: ']);\n- expect(input.value).toBe('');\n- } else {\n- expect(Scheduler).toFlushAndYield(['render: ']);\n- expect(input.value).toBe('');\n- }\n+ \/\/ Flush microtask queue.\n+ await null;\n+ expect(Scheduler).toHaveYielded(['render: ']);\n+ expect(input.value).toBe('');\n });\n \n \/\/ @gate experimental\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/SimpleEventPlugin-test.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/SimpleEventPlugin-test.js\nindex 795eda90c8..9af14ccd86 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/SimpleEventPlugin-test.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/SimpleEventPlugin-test.js\n@@ -470,24 +470,15 @@ describe('SimpleEventPlugin', function() {\n 'High-pri count: 7, Low-pri count: 0',\n ]);\n \n- if (gate(flags => flags.enableDiscreteEventMicroTasks)) {\n- \/\/ Flush the microtask queue\n- await null;\n-\n- \/\/ At the end, both counters should equal the total number of clicks\n- expect(Scheduler).toHaveYielded([\n- 'High-pri count: 8, Low-pri count: 0',\n- ]);\n- expect(Scheduler).toFlushAndYield([\n- 'High-pri count: 8, Low-pri count: 8',\n- ]);\n- } else {\n- \/\/ At the end, both counters should equal the total number of clicks\n- expect(Scheduler).toFlushAndYield([\n- 'High-pri count: 8, Low-pri count: 0',\n- 'High-pri count: 8, Low-pri count: 8',\n- ]);\n- }\n+ \/\/ Flush the microtask queue\n+ await null;\n+\n+ \/\/ At the end, both counters should equal the total number of clicks\n+ expect(Scheduler).toHaveYielded(['High-pri count: 8, Low-pri count: 0']);\n+ expect(Scheduler).toFlushAndYield([\n+ 'High-pri count: 8, Low-pri count: 8',\n+ ]);\n+\n expect(button.textContent).toEqual('High-pri count: 8, Low-pri count: 8');\n });\n });\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex 743470966b..1a7ccbd07f 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -27,10 +27,7 @@ import {\n LegacyRoot,\n } from 'react-reconciler\/src\/ReactRootTags';\n \n-import {\n- enableNativeEventPriorityInference,\n- enableDiscreteEventMicroTasks,\n-} from 'shared\/ReactFeatureFlags';\n+import {enableNativeEventPriorityInference} from 'shared\/ReactFeatureFlags';\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import enqueueTask from 'shared\/enqueueTask';\n const {IsSomeRendererActing} = ReactSharedInternals;\n@@ -376,7 +373,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n cancelTimeout: clearTimeout,\n noTimeout: -1,\n \n- supportsMicrotasks: enableDiscreteEventMicroTasks,\n+ supportsMicrotasks: true,\n scheduleMicrotask:\n typeof queueMicrotask === 'function'\n ? queueMicrotask\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.js\nindex 8e8a512dac..8ec621be0d 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.js\n@@ -3518,56 +3518,6 @@ describe('ReactSuspenseWithNoopRenderer', () => {\n );\n });\n \n- \/\/ @gate enableCache\n- \/\/ @gate !enableDiscreteEventMicroTasks\n- it('regression: empty render at high priority causes update to be dropped', async () => {\n- \/\/ Reproduces a bug where flushDiscreteUpdates starts a new (empty) render\n- \/\/ pass which cancels a scheduled timeout and causes the fallback never to\n- \/\/ be committed.\n- function App({text, shouldSuspend}) {\n- return (\n- <>\n- \n- }>\n- {shouldSuspend && }\n- <\/Suspense>\n- <\/>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- ReactNoop.discreteUpdates(() => {\n- \/\/ High pri\n- root.render();\n- });\n- \/\/ Low pri\n- root.render();\n-\n- expect(Scheduler).toFlushAndYield([\n- \/\/ Render the high pri update\n- 'A',\n- \/\/ Render the low pri update\n- 'A',\n- 'Suspend! [B]',\n- 'Loading...',\n- ]);\n- expect(root).toMatchRenderedOutput();\n-\n- \/\/ Triggers erstwhile bug where flushDiscreteUpdates caused an empty render\n- \/\/ at a previously committed level\n- ReactNoop.flushDiscreteUpdates();\n-\n- \/\/ Commit the placeholder\n- Scheduler.unstable_advanceTime(2000);\n- await advanceTimers(2000);\n- expect(root).toMatchRenderedOutput(\n- <>\n- \n- \n- <\/>,\n- );\n- });\n-\n \/\/ @gate experimental\n \/\/ @gate enableCache\n it('regression: ping at high priority causes update to be dropped', async () => {\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 0d83efe103..4adc7ac9b4 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -150,8 +150,6 @@ export const enableRecursiveCommitTraversal = false;\n \n export const disableSchedulerTimeoutInWorkLoop = false;\n \n-export const enableDiscreteEventMicroTasks = false;\n-\n export const enableSyncMicroTasks = false;\n \n export const enableNativeEventPriorityInference = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex b0dad1851f..6c891df1b3 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -57,7 +57,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 7a34c7623c..4e12e63a4f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex adb63e0a8d..27dd0cdc9b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\nindex 5c18737ebe..8d3f3a92ea 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 9ef9ee181b..5d14b1de5f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\nindex b3240c62da..12fcc75be1 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\nindex 65eeaee980..c89caeffcf 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n@@ -56,7 +56,6 @@ export const enableUseRefAccessWarning = false;\n \n export const enableRecursiveCommitTraversal = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableDiscreteEventMicroTasks = false;\n export const enableSyncMicroTasks = false;\n export const enableNativeEventPriorityInference = false;\n export const enableLazyContextPropagation = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\nindex a550d45be2..46dc190a61 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n@@ -55,7 +55,6 @@ export const enableUseRefAccessWarning = __VARIANT__;\n \n export const enableProfilerNestedUpdateScheduledHook = __VARIANT__;\n export const disableSchedulerTimeoutInWorkLoop = __VARIANT__;\n-export const enableDiscreteEventMicroTasks = __VARIANT__;\n export const enableSyncMicroTasks = __VARIANT__;\n export const enableNativeEventPriorityInference = __VARIANT__;\n export const enableLazyContextPropagation = __VARIANT__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex e4d0b07916..35bbe2cb1f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -31,7 +31,6 @@ export const {\n enableUseRefAccessWarning,\n disableNativeComponentFrames,\n disableSchedulerTimeoutInWorkLoop,\n- enableDiscreteEventMicroTasks,\n enableSyncMicroTasks,\n enableNativeEventPriorityInference,\n enableLazyContextPropagation,\n","parents":["a3f30fed298b9ce1964c551dde9b1bcbd6fda08f"],"commit":{"subject":"Land enableDiscreteEventMicroTasks (#20954)","authoredAt":"2021-03-08T16:43:44-05:00","shortRevision":"73e900b0e7","revision":"73e900b0e78c752d1e045a42ddea8175679ea8f7","authorName":"Ricky","authorEmail":"rickhanlonii@gmail.com"},"files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ChangeEventPlugin-test.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/SimpleEventPlugin-test.js","status":"M"},{"path":"packages\/react-noop-renderer\/src\/createReactNoop.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.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.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.testing.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.testing.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"body":""}

dillon1000/react

Files changed