Skip to content

Commit 9ccc25a

Browse files
author
Brian Vaughn
authored
Reverting recent flushSync changes (#21816)
1 parent b6258b0 commit 9ccc25a

16 files changed

+338
-132
lines changed

‎packages/react-devtools-shared/src/__tests__/__snapshots__/profilingCache-test.js.snap

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Object {
4040
6 => 1,
4141
},
4242
"passiveEffectDuration": null,
43-
"priorityLevel": "Immediate",
43+
"priorityLevel": "Normal",
4444
"timestamp": 16,
4545
"updaters": Array [
4646
Object {
@@ -87,7 +87,7 @@ Object {
8787
4 => 2,
8888
},
8989
"passiveEffectDuration": null,
90-
"priorityLevel": "Immediate",
90+
"priorityLevel": "Normal",
9191
"timestamp": 15,
9292
"updaters": Array [
9393
Object {
@@ -186,7 +186,7 @@ Object {
186186
6 => 1,
187187
},
188188
"passiveEffectDuration": null,
189-
"priorityLevel": "Immediate",
189+
"priorityLevel": "Normal",
190190
"timestamp": 12,
191191
"updaters": Array [
192192
Object {
@@ -445,7 +445,7 @@ Object {
445445
],
446446
],
447447
"passiveEffectDuration": null,
448-
"priorityLevel": "Immediate",
448+
"priorityLevel": "Normal",
449449
"timestamp": 12,
450450
"updaters": Array [
451451
Object {
@@ -938,7 +938,7 @@ Object {
938938
],
939939
],
940940
"passiveEffectDuration": null,
941-
"priorityLevel": "Immediate",
941+
"priorityLevel": "Normal",
942942
"timestamp": 11,
943943
"updaters": Array [
944944
Object {
@@ -1597,7 +1597,7 @@ Object {
15971597
17 => 1,
15981598
},
15991599
"passiveEffectDuration": null,
1600-
"priorityLevel": "Immediate",
1600+
"priorityLevel": "Normal",
16011601
"timestamp": 24,
16021602
"updaters": Array [
16031603
Object {
@@ -1687,7 +1687,7 @@ Object {
16871687
"fiberActualDurations": Map {},
16881688
"fiberSelfDurations": Map {},
16891689
"passiveEffectDuration": 0,
1690-
"priorityLevel": "Immediate",
1690+
"priorityLevel": "Normal",
16911691
"timestamp": 34,
16921692
"updaters": Array [
16931693
Object {
@@ -2223,7 +2223,7 @@ Object {
22232223
],
22242224
],
22252225
"passiveEffectDuration": null,
2226-
"priorityLevel": "Immediate",
2226+
"priorityLevel": "Normal",
22272227
"timestamp": 24,
22282228
"updaters": Array [
22292229
Object {
@@ -2310,7 +2310,7 @@ Object {
23102310
"fiberActualDurations": Array [],
23112311
"fiberSelfDurations": Array [],
23122312
"passiveEffectDuration": 0,
2313-
"priorityLevel": "Immediate",
2313+
"priorityLevel": "Normal",
23142314
"timestamp": 34,
23152315
"updaters": Array [
23162316
Object {
@@ -2431,7 +2431,7 @@ Object {
24312431
2 => 0,
24322432
},
24332433
"passiveEffectDuration": null,
2434-
"priorityLevel": "Immediate",
2434+
"priorityLevel": "Normal",
24352435
"timestamp": 0,
24362436
"updaters": Array [
24372437
Object {
@@ -2506,7 +2506,7 @@ Object {
25062506
3 => 0,
25072507
},
25082508
"passiveEffectDuration": 0,
2509-
"priorityLevel": "Immediate",
2509+
"priorityLevel": "Normal",
25102510
"timestamp": 0,
25112511
"updaters": Array [
25122512
Object {
@@ -2715,7 +2715,7 @@ Object {
27152715
],
27162716
],
27172717
"passiveEffectDuration": 0,
2718-
"priorityLevel": "Immediate",
2718+
"priorityLevel": "Normal",
27192719
"timestamp": 0,
27202720
"updaters": Array [
27212721
Object {
@@ -3071,7 +3071,7 @@ Object {
30713071
7 => 0,
30723072
},
30733073
"passiveEffectDuration": null,
3074-
"priorityLevel": "Immediate",
3074+
"priorityLevel": "Normal",
30753075
"timestamp": 0,
30763076
"updaters": Array [
30773077
Object {
@@ -3515,7 +3515,7 @@ Object {
35153515
],
35163516
],
35173517
"passiveEffectDuration": null,
3518-
"priorityLevel": "Immediate",
3518+
"priorityLevel": "Normal",
35193519
"timestamp": 0,
35203520
"updaters": Array [
35213521
Object {

‎packages/react-dom/src/__tests__/ReactDOMFiber-test.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,13 +1154,19 @@ describe('ReactDOMFiber', () => {
11541154
expect(ops).toEqual(['A']);
11551155

11561156
if (__DEV__) {
1157-
expect(console.error.calls.count()).toBe(2);
1157+
const errorCalls = console.error.calls.count();
11581158
expect(console.error.calls.argsFor(0)[0]).toMatch(
11591159
'ReactDOM.render is no longer supported in React 18',
11601160
);
11611161
expect(console.error.calls.argsFor(1)[0]).toMatch(
11621162
'ReactDOM.render is no longer supported in React 18',
11631163
);
1164+
// TODO: this warning shouldn't be firing in the first place if user didn't call it.
1165+
for (let i = 2; i < errorCalls; i++) {
1166+
expect(console.error.calls.argsFor(i)[0]).toMatch(
1167+
'unstable_flushDiscreteUpdates: Cannot flush updates when React is already rendering.',
1168+
);
1169+
}
11641170
}
11651171
});
11661172

‎packages/react-dom/src/__tests__/ReactMount-test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ describe('ReactMount', () => {
277277
expect(calls).toBe(5);
278278
});
279279

280-
it('initial mount of legacy root is sync inside batchedUpdates, as if it were wrapped in flushSync', () => {
280+
it('initial mount is sync inside batchedUpdates, but task work is deferred until the end of the batch', () => {
281281
const container1 = document.createElement('div');
282282
const container2 = document.createElement('div');
283283

@@ -302,12 +302,12 @@ describe('ReactMount', () => {
302302

303303
// Initial mount on another root. Should flush immediately.
304304
ReactDOM.render(<Foo>a</Foo>, container2);
305-
// The earlier update also flushed, since flushSync flushes all pending
306-
// sync work across all roots.
307-
expect(container1.textContent).toEqual('2');
308-
// Layout updates are also flushed synchronously
309-
expect(container2.textContent).toEqual('a!');
305+
// The update did not flush yet.
306+
expect(container1.textContent).toEqual('1');
307+
// The initial mount flushed, but not the update scheduled in cDM.
308+
expect(container2.textContent).toEqual('a');
310309
});
310+
// All updates have flushed.
311311
expect(container1.textContent).toEqual('2');
312312
expect(container2.textContent).toEqual('a!');
313313
});

‎packages/react-dom/src/client/ReactDOM.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {createEventHandle} from './ReactDOMEventHandle';
2323
import {
2424
batchedUpdates,
2525
discreteUpdates,
26+
flushDiscreteUpdates,
2627
flushSync,
27-
flushSyncWithoutWarningIfAlreadyRendering,
2828
flushControlled,
2929
injectIntoDevTools,
3030
attemptSynchronousHydration,
@@ -100,7 +100,7 @@ setRestoreImplementation(restoreControlledState);
100100
setBatchingImplementation(
101101
batchedUpdates,
102102
discreteUpdates,
103-
flushSyncWithoutWarningIfAlreadyRendering,
103+
flushDiscreteUpdates,
104104
);
105105

106106
function createPortal(

‎packages/react-dom/src/client/ReactDOMLegacy.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
createContainer,
3030
findHostInstanceWithNoPortals,
3131
updateContainer,
32-
flushSyncWithoutWarningIfAlreadyRendering,
32+
unbatchedUpdates,
3333
getPublicRootInstance,
3434
findHostInstance,
3535
findHostInstanceWithWarning,
@@ -174,7 +174,7 @@ function legacyRenderSubtreeIntoContainer(
174174
};
175175
}
176176
// Initial mount should not be batched.
177-
flushSyncWithoutWarningIfAlreadyRendering(() => {
177+
unbatchedUpdates(() => {
178178
updateContainer(children, fiberRoot, parentComponent, callback);
179179
});
180180
} else {
@@ -357,7 +357,7 @@ export function unmountComponentAtNode(container: Container) {
357357
}
358358

359359
// Unmount should not be batched.
360-
flushSyncWithoutWarningIfAlreadyRendering(() => {
360+
unbatchedUpdates(() => {
361361
legacyRenderSubtreeIntoContainer(null, null, container, false, () => {
362362
// $FlowFixMe This should probably use `delete container._reactRootContainer`
363363
container._reactRootContainer = null;

‎packages/react-dom/src/events/ReactDOMUpdateBatching.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let batchedUpdatesImpl = function(fn, bookkeeping) {
2323
let discreteUpdatesImpl = function(fn, a, b, c, d) {
2424
return fn(a, b, c, d);
2525
};
26-
let flushSyncImpl = function() {};
26+
let flushDiscreteUpdatesImpl = function() {};
2727

2828
let isInsideEventHandler = false;
2929

@@ -39,7 +39,7 @@ function finishEventHandler() {
3939
// bails out of the update without touching the DOM.
4040
// TODO: Restore state in the microtask, after the discrete updates flush,
4141
// instead of early flushing them here.
42-
flushSyncImpl();
42+
flushDiscreteUpdatesImpl();
4343
restoreStateIfNeeded();
4444
}
4545
}
@@ -67,9 +67,9 @@ export function discreteUpdates(fn, a, b, c, d) {
6767
export function setBatchingImplementation(
6868
_batchedUpdatesImpl,
6969
_discreteUpdatesImpl,
70-
_flushSyncImpl,
70+
_flushDiscreteUpdatesImpl,
7171
) {
7272
batchedUpdatesImpl = _batchedUpdatesImpl;
7373
discreteUpdatesImpl = _discreteUpdatesImpl;
74-
flushSyncImpl = _flushSyncImpl;
74+
flushDiscreteUpdatesImpl = _flushDiscreteUpdatesImpl;
7575
}

‎packages/react-noop-renderer/src/ReactNoop.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ export const {
3838
flushExpired,
3939
batchedUpdates,
4040
deferredUpdates,
41+
unbatchedUpdates,
4142
discreteUpdates,
4243
idleUpdates,
44+
flushDiscreteUpdates,
4345
flushSync,
4446
flushPassiveEffects,
4547
act,

‎packages/react-noop-renderer/src/ReactNoopPersistent.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const {
3838
flushExpired,
3939
batchedUpdates,
4040
deferredUpdates,
41+
unbatchedUpdates,
4142
discreteUpdates,
4243
idleUpdates,
4344
flushDiscreteUpdates,

‎packages/react-noop-renderer/src/createReactNoop.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,8 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
901901

902902
deferredUpdates: NoopRenderer.deferredUpdates,
903903

904+
unbatchedUpdates: NoopRenderer.unbatchedUpdates,
905+
904906
discreteUpdates: NoopRenderer.discreteUpdates,
905907

906908
idleUpdates<T>(fn: () => T): T {
@@ -913,6 +915,8 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
913915
}
914916
},
915917

918+
flushDiscreteUpdates: NoopRenderer.flushDiscreteUpdates,
919+
916920
flushSync(fn: () => mixed) {
917921
NoopRenderer.flushSync(fn);
918922
},

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import {
1818
createContainer as createContainer_old,
1919
updateContainer as updateContainer_old,
2020
batchedUpdates as batchedUpdates_old,
21+
unbatchedUpdates as unbatchedUpdates_old,
2122
deferredUpdates as deferredUpdates_old,
2223
discreteUpdates as discreteUpdates_old,
24+
flushDiscreteUpdates as flushDiscreteUpdates_old,
2325
flushControlled as flushControlled_old,
2426
flushSync as flushSync_old,
25-
flushSyncWithoutWarningIfAlreadyRendering as flushSyncWithoutWarningIfAlreadyRendering_old,
2627
flushPassiveEffects as flushPassiveEffects_old,
2728
getPublicRootInstance as getPublicRootInstance_old,
2829
attemptSynchronousHydration as attemptSynchronousHydration_old,
@@ -55,11 +56,12 @@ import {
5556
createContainer as createContainer_new,
5657
updateContainer as updateContainer_new,
5758
batchedUpdates as batchedUpdates_new,
59+
unbatchedUpdates as unbatchedUpdates_new,
5860
deferredUpdates as deferredUpdates_new,
5961
discreteUpdates as discreteUpdates_new,
62+
flushDiscreteUpdates as flushDiscreteUpdates_new,
6063
flushControlled as flushControlled_new,
6164
flushSync as flushSync_new,
62-
flushSyncWithoutWarningIfAlreadyRendering as flushSyncWithoutWarningIfAlreadyRendering_new,
6365
flushPassiveEffects as flushPassiveEffects_new,
6466
getPublicRootInstance as getPublicRootInstance_new,
6567
attemptSynchronousHydration as attemptSynchronousHydration_new,
@@ -97,19 +99,22 @@ export const updateContainer = enableNewReconciler
9799
export const batchedUpdates = enableNewReconciler
98100
? batchedUpdates_new
99101
: batchedUpdates_old;
102+
export const unbatchedUpdates = enableNewReconciler
103+
? unbatchedUpdates_new
104+
: unbatchedUpdates_old;
100105
export const deferredUpdates = enableNewReconciler
101106
? deferredUpdates_new
102107
: deferredUpdates_old;
103108
export const discreteUpdates = enableNewReconciler
104109
? discreteUpdates_new
105110
: discreteUpdates_old;
111+
export const flushDiscreteUpdates = enableNewReconciler
112+
? flushDiscreteUpdates_new
113+
: flushDiscreteUpdates_old;
106114
export const flushControlled = enableNewReconciler
107115
? flushControlled_new
108116
: flushControlled_old;
109117
export const flushSync = enableNewReconciler ? flushSync_new : flushSync_old;
110-
export const flushSyncWithoutWarningIfAlreadyRendering = enableNewReconciler
111-
? flushSyncWithoutWarningIfAlreadyRendering_new
112-
: flushSyncWithoutWarningIfAlreadyRendering_old;
113118
export const flushPassiveEffects = enableNewReconciler
114119
? flushPassiveEffects_new
115120
: flushPassiveEffects_old;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ import {
5252
scheduleUpdateOnFiber,
5353
flushRoot,
5454
batchedUpdates,
55+
unbatchedUpdates,
5556
flushSync,
5657
flushControlled,
5758
deferredUpdates,
5859
discreteUpdates,
59-
flushSyncWithoutWarningIfAlreadyRendering,
60+
flushDiscreteUpdates,
6061
flushPassiveEffects,
6162
} from './ReactFiberWorkLoop.new';
6263
import {
@@ -326,11 +327,12 @@ export function updateContainer(
326327

327328
export {
328329
batchedUpdates,
330+
unbatchedUpdates,
329331
deferredUpdates,
330332
discreteUpdates,
333+
flushDiscreteUpdates,
331334
flushControlled,
332335
flushSync,
333-
flushSyncWithoutWarningIfAlreadyRendering,
334336
flushPassiveEffects,
335337
};
336338

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ import {
5252
scheduleUpdateOnFiber,
5353
flushRoot,
5454
batchedUpdates,
55+
unbatchedUpdates,
5556
flushSync,
5657
flushControlled,
5758
deferredUpdates,
5859
discreteUpdates,
59-
flushSyncWithoutWarningIfAlreadyRendering,
60+
flushDiscreteUpdates,
6061
flushPassiveEffects,
6162
} from './ReactFiberWorkLoop.old';
6263
import {
@@ -326,11 +327,12 @@ export function updateContainer(
326327

327328
export {
328329
batchedUpdates,
330+
unbatchedUpdates,
329331
deferredUpdates,
330332
discreteUpdates,
333+
flushDiscreteUpdates,
331334
flushControlled,
332335
flushSync,
333-
flushSyncWithoutWarningIfAlreadyRendering,
334336
flushPassiveEffects,
335337
};
336338

0 commit comments

Comments
 (0)