@samitouri / QOS-React-2 / commits / ca99ae97b4

Replace some flushExpired callsites (#20975)

Ricky committed Mar 22, 2021 at 12:44 UTC ca99ae97b485963249c81a933c08cb092d6ca14b

5 files changed +38 -34

packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js

+31 -28

@@ -370,7 +370,7 @@ describe('ReactSuspense', () => {

370

371 await LazyClass;

372

373 - expect(Scheduler).toFlushExpired(['Hi', 'Did mount: Hi']);

373 + expect(Scheduler).toFlushUntilNextPaint(['Hi', 'Did mount: Hi']);

374 expect(root).toMatchRenderedOutput('Hi');

375 });

376

@@ -729,7 +729,7 @@ describe('ReactSuspense', () => {

729 jest.advanceTimersByTime(100);

730

731 expect(Scheduler).toHaveYielded(['Promise resolved [B:1]']);

732 - expect(Scheduler).toFlushExpired([

732 + expect(Scheduler).toFlushUntilNextPaint([

733 'B:1',

734 'Unmount [Loading...]',

735 // Should be a mount, not an update

@@ -748,7 +748,7 @@ describe('ReactSuspense', () => {

748 jest.advanceTimersByTime(100);

749

750 expect(Scheduler).toHaveYielded(['Promise resolved [B:2]']);

751 - expect(Scheduler).toFlushExpired([

751 + expect(Scheduler).toFlushUntilNextPaint([

752 'B:2',

753 'Unmount [Loading...]',

754 'Update [B:2]',

@@ -786,7 +786,7 @@ describe('ReactSuspense', () => {

786 jest.advanceTimersByTime(1000);

787

788 expect(Scheduler).toHaveYielded(['Promise resolved [A]']);

789 - expect(Scheduler).toFlushExpired(['A']);

789 + expect(Scheduler).toFlushUntilNextPaint(['A']);

790 expect(root).toMatchRenderedOutput('Stateful: 1A');

791

792 root.update(<App text="B" />);

@@ -804,7 +804,7 @@ describe('ReactSuspense', () => {

804 jest.advanceTimersByTime(1000);

805

806 expect(Scheduler).toHaveYielded(['Promise resolved [B]']);

807 - expect(Scheduler).toFlushExpired(['B']);

807 + expect(Scheduler).toFlushUntilNextPaint(['B']);

808 expect(root).toMatchRenderedOutput('Stateful: 2B');

809 });

810

@@ -846,7 +846,7 @@ describe('ReactSuspense', () => {

846 jest.advanceTimersByTime(1000);

847

848 expect(Scheduler).toHaveYielded(['Promise resolved [A]']);

849 - expect(Scheduler).toFlushExpired(['A']);

849 + expect(Scheduler).toFlushUntilNextPaint(['A']);

850 expect(root).toMatchRenderedOutput('Stateful: 1A');

851

852 root.update(<App text="B" />);

@@ -871,7 +871,7 @@ describe('ReactSuspense', () => {

871 jest.advanceTimersByTime(1000);

872

873 expect(Scheduler).toHaveYielded(['Promise resolved [B]']);

874 - expect(Scheduler).toFlushExpired(['B']);

874 + expect(Scheduler).toFlushUntilNextPaint(['B']);

875 expect(root).toMatchRenderedOutput('Stateful: 2B');

876 });

877

@@ -951,7 +951,7 @@ describe('ReactSuspense', () => {

951 jest.advanceTimersByTime(500);

952

953 expect(Scheduler).toHaveYielded(['Promise resolved [A]']);

954 - expect(Scheduler).toFlushExpired(['A', 'Did commit: A']);

954 + expect(Scheduler).toFlushUntilNextPaint(['A', 'Did commit: A']);

955 });

956

957 it('retries when an update is scheduled on a timed out tree', () => {

@@ -1038,7 +1038,7 @@ describe('ReactSuspense', () => {

1038 jest.advanceTimersByTime(1000);

1039

1040 expect(Scheduler).toHaveYielded(['Promise resolved [Child 1]']);

1041 - expect(Scheduler).toFlushExpired([

1041 + expect(Scheduler).toFlushUntilNextPaint([

1042 'Child 1',

1043 'Suspend! [Child 2]',

1044 'Suspend! [Child 3]',

@@ -1047,12 +1047,15 @@ describe('ReactSuspense', () => {

1047 jest.advanceTimersByTime(1000);

1048

1049 expect(Scheduler).toHaveYielded(['Promise resolved [Child 2]']);

1050 - expect(Scheduler).toFlushExpired(['Child 2', 'Suspend! [Child 3]']);

1050 + expect(Scheduler).toFlushUntilNextPaint([

1051 + 'Child 2',

1052 + 'Suspend! [Child 3]',

1053 + ]);

1054

1055 jest.advanceTimersByTime(1000);

1056

1057 expect(Scheduler).toHaveYielded(['Promise resolved [Child 3]']);

1055 - expect(Scheduler).toFlushExpired(['Child 3']);

1058 + expect(Scheduler).toFlushUntilNextPaint(['Child 3']);

1059 expect(root).toMatchRenderedOutput(

1060 ['Child 1', 'Child 2', 'Child 3'].join(''),

1061 );

@@ -1113,7 +1116,7 @@ describe('ReactSuspense', () => {

1116 jest.advanceTimersByTime(1000);

1117

1118 expect(Scheduler).toHaveYielded(['Promise resolved [Tab: 0]']);

1116 - expect(Scheduler).toFlushExpired(['Tab: 0']);

1119 + expect(Scheduler).toFlushUntilNextPaint(['Tab: 0']);

1120 expect(root).toMatchRenderedOutput('Tab: 0 + sibling');

1121

1122 act(() => setTab(1));

@@ -1126,7 +1129,7 @@ describe('ReactSuspense', () => {

1129 jest.advanceTimersByTime(1000);

1130

1131 expect(Scheduler).toHaveYielded(['Promise resolved [Tab: 1]']);

1129 - expect(Scheduler).toFlushExpired(['Tab: 1']);

1132 + expect(Scheduler).toFlushUntilNextPaint(['Tab: 1']);

1133 expect(root).toMatchRenderedOutput('Tab: 1 + sibling');

1134

1135 act(() => setTab(2));

@@ -1139,7 +1142,7 @@ describe('ReactSuspense', () => {

1142 jest.advanceTimersByTime(1000);

1143

1144 expect(Scheduler).toHaveYielded(['Promise resolved [Tab: 2]']);

1142 - expect(Scheduler).toFlushExpired(['Tab: 2']);

1145 + expect(Scheduler).toFlushUntilNextPaint(['Tab: 2']);

1146 expect(root).toMatchRenderedOutput('Tab: 2 + sibling');

1147 });

1148

@@ -1177,7 +1180,7 @@ describe('ReactSuspense', () => {

1180 jest.advanceTimersByTime(1000);

1181

1182 expect(Scheduler).toHaveYielded(['Promise resolved [A:0]']);

1180 - expect(Scheduler).toFlushExpired(['A:0']);

1183 + expect(Scheduler).toFlushUntilNextPaint(['A:0']);

1184 expect(root).toMatchRenderedOutput('A:0');

1185

1186 act(() => setStep(1));

@@ -1215,7 +1218,7 @@ describe('ReactSuspense', () => {

1218 jest.advanceTimersByTime(1000);

1219

1220 expect(Scheduler).toHaveYielded(['Promise resolved [A]']);

1218 - expect(Scheduler).toFlushExpired([

1221 + expect(Scheduler).toFlushUntilNextPaint([

1222 'A',

1223 // The promises for B and C have now been thrown twice

1224 'Suspend! [B]',

@@ -1226,7 +1229,7 @@ describe('ReactSuspense', () => {

1229 jest.advanceTimersByTime(1000);

1230

1231 expect(Scheduler).toHaveYielded(['Promise resolved [B]']);

1229 - expect(Scheduler).toFlushExpired([

1232 + expect(Scheduler).toFlushUntilNextPaint([

1233 // Even though the promise for B was thrown twice, we should only

1234 // re-render once.

1235 'B',

@@ -1238,7 +1241,7 @@ describe('ReactSuspense', () => {

1241 jest.advanceTimersByTime(1000);

1242

1243 expect(Scheduler).toHaveYielded(['Promise resolved [C]']);

1241 - expect(Scheduler).toFlushExpired([

1244 + expect(Scheduler).toFlushUntilNextPaint([

1245 // Even though the promise for C was thrown three times, we should only

1246 // re-render once.

1247 'C',

@@ -1280,7 +1283,7 @@ describe('ReactSuspense', () => {

1283 jest.advanceTimersByTime(1000);

1284

1285 expect(Scheduler).toHaveYielded(['Promise resolved [A]']);

1283 - expect(Scheduler).toFlushExpired([

1286 + expect(Scheduler).toFlushUntilNextPaint([

1287 'A',

1288 // The promises for B and C have now been thrown twice

1289 'Suspend! [B]',

@@ -1291,7 +1294,7 @@ describe('ReactSuspense', () => {

1294 jest.advanceTimersByTime(1000);

1295

1296 expect(Scheduler).toHaveYielded(['Promise resolved [B]']);

1294 - expect(Scheduler).toFlushExpired([

1297 + expect(Scheduler).toFlushUntilNextPaint([

1298 // Even though the promise for B was thrown twice, we should only

1299 // re-render once.

1300 'B',

@@ -1393,7 +1396,7 @@ describe('ReactSuspense', () => {

1396 jest.advanceTimersByTime(1000);

1397

1398 expect(Scheduler).toHaveYielded(['Promise resolved [default]']);

1396 - expect(Scheduler).toFlushExpired(['default']);

1399 + expect(Scheduler).toFlushUntilNextPaint(['default']);

1400 expect(root).toMatchRenderedOutput('default');

1401

1402 act(() => setValue('new value'));

@@ -1401,7 +1404,7 @@ describe('ReactSuspense', () => {

1404 jest.advanceTimersByTime(1000);

1405

1406 expect(Scheduler).toHaveYielded(['Promise resolved [new value]']);

1404 - expect(Scheduler).toFlushExpired(['new value']);

1407 + expect(Scheduler).toFlushUntilNextPaint(['new value']);

1408 expect(root).toMatchRenderedOutput('new value');

1409 });

1410

@@ -1450,7 +1453,7 @@ describe('ReactSuspense', () => {

1453 jest.advanceTimersByTime(1000);

1454

1455 expect(Scheduler).toHaveYielded(['Promise resolved [default]']);

1453 - expect(Scheduler).toFlushExpired(['default']);

1456 + expect(Scheduler).toFlushUntilNextPaint(['default']);

1457 expect(root).toMatchRenderedOutput('default');

1458

1459 act(() => setValue('new value'));

@@ -1458,7 +1461,7 @@ describe('ReactSuspense', () => {

1461 jest.advanceTimersByTime(1000);

1462

1463 expect(Scheduler).toHaveYielded(['Promise resolved [new value]']);

1461 - expect(Scheduler).toFlushExpired(['new value']);

1464 + expect(Scheduler).toFlushUntilNextPaint(['new value']);

1465 expect(root).toMatchRenderedOutput('new value');

1466 });

1467

@@ -1506,7 +1509,7 @@ describe('ReactSuspense', () => {

1509 jest.advanceTimersByTime(1000);

1510

1511 expect(Scheduler).toHaveYielded(['Promise resolved [default]']);

1509 - expect(Scheduler).toFlushExpired(['default']);

1512 + expect(Scheduler).toFlushUntilNextPaint(['default']);

1513 expect(root).toMatchRenderedOutput('default');

1514

1515 act(() => setValue('new value'));

@@ -1514,7 +1517,7 @@ describe('ReactSuspense', () => {

1517 jest.advanceTimersByTime(1000);

1518

1519 expect(Scheduler).toHaveYielded(['Promise resolved [new value]']);

1517 - expect(Scheduler).toFlushExpired(['new value']);

1520 + expect(Scheduler).toFlushUntilNextPaint(['new value']);

1521 expect(root).toMatchRenderedOutput('new value');

1522 });

1523

@@ -1558,7 +1561,7 @@ describe('ReactSuspense', () => {

1561 jest.advanceTimersByTime(1000);

1562

1563 expect(Scheduler).toHaveYielded(['Promise resolved [default]']);

1561 - expect(Scheduler).toFlushExpired(['default']);

1564 + expect(Scheduler).toFlushUntilNextPaint(['default']);

1565 expect(root).toMatchRenderedOutput('default');

1566

1567 act(() => setValue('new value'));

@@ -1566,7 +1569,7 @@ describe('ReactSuspense', () => {

1569 jest.advanceTimersByTime(1000);

1570

1571 expect(Scheduler).toHaveYielded(['Promise resolved [new value]']);

1569 - expect(Scheduler).toFlushExpired(['new value']);

1572 + expect(Scheduler).toFlushUntilNextPaint(['new value']);

1573 expect(root).toMatchRenderedOutput('new value');

1574 });

1575 });

packages/react/src/__tests__/ReactProfiler-test.internal.js

+3 -3

@@ -4306,7 +4306,7 @@ describe('Profiler', () => {

4306 await resourcePromise;

4307

4308 expect(Scheduler).toHaveYielded(['Promise resolved [loaded]']);

4309 - expect(Scheduler).toFlushExpired([

4309 + expect(Scheduler).toFlushUntilNextPaint([

4310 'onPostCommit',

4311 'AsyncText [loaded]',

4312 ]);

@@ -4370,7 +4370,7 @@ describe('Profiler', () => {

4370 await resourcePromise;

4371

4372 expect(Scheduler).toHaveYielded(['Promise resolved [loaded]']);

4373 - expect(Scheduler).toFlushExpired(['onPostCommit', 'render']);

4373 + expect(Scheduler).toFlushUntilNextPaint(['onPostCommit', 'render']);

4374

4375 expect(onInteractionScheduledWorkCompleted).not.toHaveBeenCalled();

4376

@@ -4575,7 +4575,7 @@ describe('Profiler', () => {

4575 await originalPromise;

4576

4577 expect(Scheduler).toHaveYielded(['Promise resolved [loaded]']);

4578 - expect(Scheduler).toFlushExpired(['AsyncText [loaded]']);

4578 + expect(Scheduler).toFlushUntilNextPaint(['AsyncText [loaded]']);

4579 expect(renderer.toJSON()).toEqual(['loaded', 'updated']);

4580 expect(Scheduler).toFlushAndYield(['onPostCommit']);

4581

packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js

+1 -1

@@ -198,7 +198,7 @@ describe('ReactProfiler DevTools integration', () => {

198 root.update(<Text text="B" />);

199

200 // Update B should not instantly expire.

201 - expect(Scheduler).toFlushExpired([]);

201 + expect(Scheduler).toFlushAndYieldThrough([]);

202

203 expect(Scheduler).toFlushAndYield(['B']);

204 expect(root).toMatchRenderedOutput('B');

packages/scheduler/src/__tests__/SchedulerMock-test.js

+2 -2

@@ -117,14 +117,14 @@ describe('Scheduler', () => {

117

118 // Advance by just a bit more to expire the user blocking callbacks

119 Scheduler.unstable_advanceTime(1);

120 - expect(Scheduler).toFlushExpired([

120 + expect(Scheduler).toFlushAndYieldThrough([

121 'B (did timeout: true)',

122 'C (did timeout: true)',

123 ]);

124

125 // Expire A

126 Scheduler.unstable_advanceTime(4600);

127 - expect(Scheduler).toFlushExpired(['A (did timeout: true)']);

127 + expect(Scheduler).toFlushAndYieldThrough(['A (did timeout: true)']);

128

129 // Flush the rest without expiring

130 expect(Scheduler).toFlushAndYield([

packages/scheduler/src/forks/SchedulerMock.js

@@ -414,6 +414,7 @@ function cancelHostTimeout(): void {

414

415 function shouldYieldToHost(): boolean {

416 if (

417 + (expectedNumberOfYields === 0 && yieldedValues === null) ||

418 (expectedNumberOfYields !== -1 &&

419 yieldedValues !== null &&

420 yieldedValues.length >= expectedNumberOfYields) ||