Skip to content

Commit c6baac3

Browse files
committed
Revert "Revert "Cleanup enableSyncDefaultUpdate flag (#26236)" (#26528)"
This reverts commit da94e8b.
1 parent f41ddb6 commit c6baac3

36 files changed

+312
-1471
lines changed

packages/react-art/src/__tests__/ReactART-test.js

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@ const ReactTestRenderer = require('react-test-renderer');
3333

3434
// Isolate the noop renderer
3535
jest.resetModules();
36-
const ReactNoop = require('react-noop-renderer');
37-
const Scheduler = require('scheduler');
3836

3937
let Group;
4038
let Shape;
4139
let Surface;
4240
let TestComponent;
4341

44-
let waitFor;
45-
4642
const Missing = {};
4743

4844
function testDOMNodeStructure(domNode, expectedStructure) {
@@ -80,8 +76,6 @@ describe('ReactART', () => {
8076
Shape = ReactART.Shape;
8177
Surface = ReactART.Surface;
8278

83-
({waitFor} = require('internal-test-utils'));
84-
8579
TestComponent = class extends React.Component {
8680
group = React.createRef();
8781

@@ -363,58 +357,6 @@ describe('ReactART', () => {
363357
doClick(instance);
364358
expect(onClick2).toBeCalled();
365359
});
366-
367-
// @gate !enableSyncDefaultUpdates
368-
it('can concurrently render with a "primary" renderer while sharing context', async () => {
369-
const CurrentRendererContext = React.createContext(null);
370-
371-
function Yield(props) {
372-
Scheduler.log(props.value);
373-
return null;
374-
}
375-
376-
let ops = [];
377-
function LogCurrentRenderer() {
378-
return (
379-
<CurrentRendererContext.Consumer>
380-
{currentRenderer => {
381-
ops.push(currentRenderer);
382-
return null;
383-
}}
384-
</CurrentRendererContext.Consumer>
385-
);
386-
}
387-
388-
// Using test renderer instead of the DOM renderer here because async
389-
// testing APIs for the DOM renderer don't exist.
390-
ReactNoop.render(
391-
<CurrentRendererContext.Provider value="Test">
392-
<Yield value="A" />
393-
<Yield value="B" />
394-
<LogCurrentRenderer />
395-
<Yield value="C" />
396-
</CurrentRendererContext.Provider>,
397-
);
398-
399-
await waitFor(['A']);
400-
401-
ReactDOM.render(
402-
<Surface>
403-
<LogCurrentRenderer />
404-
<CurrentRendererContext.Provider value="ART">
405-
<LogCurrentRenderer />
406-
</CurrentRendererContext.Provider>
407-
</Surface>,
408-
container,
409-
);
410-
411-
expect(ops).toEqual([null, 'ART']);
412-
413-
ops = [];
414-
await waitFor(['B', 'C']);
415-
416-
expect(ops).toEqual(['Test']);
417-
});
418360
});
419361

420362
describe('ReactARTComponents', () => {

packages/react-dom/src/__tests__/ReactDOMNativeEventHeuristic-test.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
312312
expect(container.textContent).toEqual('not hovered');
313313

314314
await waitFor(['hovered']);
315-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
316-
expect(container.textContent).toEqual('hovered');
317-
} else {
318-
expect(container.textContent).toEqual('not hovered');
319-
}
315+
expect(container.textContent).toEqual('hovered');
320316
});
321317
expect(container.textContent).toEqual('hovered');
322318
});

packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,14 +2036,7 @@ describe('ReactDOMServerPartialHydration', () => {
20362036
suspend = true;
20372037

20382038
await act(async () => {
2039-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
2040-
await waitFor(['Before', 'After']);
2041-
} else {
2042-
await waitFor(['Before']);
2043-
// This took a long time to render.
2044-
Scheduler.unstable_advanceTime(1000);
2045-
await waitFor(['After']);
2046-
}
2039+
await waitFor(['Before', 'After']);
20472040

20482041
// This will cause us to skip the second row completely.
20492042
});

packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,13 +1984,9 @@ describe('DOMPluginEventSystem', () => {
19841984
log.length = 0;
19851985

19861986
// Increase counter
1987-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
1988-
React.startTransition(() => {
1989-
root.render(<Test counter={1} />);
1990-
});
1991-
} else {
1987+
React.startTransition(() => {
19921988
root.render(<Test counter={1} />);
1993-
}
1989+
});
19941990
// Yield before committing
19951991
await waitFor(['Test']);
19961992

packages/react-reconciler/src/ReactFiber.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import {
3333
enableProfilerTimer,
3434
enableScopeAPI,
3535
enableLegacyHidden,
36-
enableSyncDefaultUpdates,
3736
allowConcurrentByDefault,
3837
enableTransitionTracing,
3938
enableDebugTracing,
@@ -459,11 +458,9 @@ export function createHostRootFiber(
459458
mode |= StrictLegacyMode | StrictEffectsMode;
460459
}
461460
if (
462-
// We only use this flag for our repo tests to check both behaviors.
463-
// TODO: Flip this flag and rename it something like "forceConcurrentByDefaultForTesting"
464-
!enableSyncDefaultUpdates ||
465461
// Only for internal experiments.
466-
(allowConcurrentByDefault && concurrentUpdatesByDefaultOverride)
462+
allowConcurrentByDefault &&
463+
concurrentUpdatesByDefaultOverride
467464
) {
468465
mode |= ConcurrentUpdatesByDefaultMode;
469466
}

0 commit comments

Comments
 (0)