Skip to content

Commit 3eeb645

Browse files
authored
Remove flag that reverts #15650 (#16372)
The change in #15650 has fully rolled out, so we can remove the flag that reverts it.
1 parent 2716d91 commit 3eeb645

12 files changed

+3
-88
lines changed

packages/react-reconciler/src/ReactFiberClassComponent.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import {
5555
scheduleWork,
5656
flushPassiveEffects,
5757
} from './ReactFiberWorkLoop';
58-
import {revertPassiveEffectsChange} from 'shared/ReactFeatureFlags';
5958
import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig';
6059

6160
const fakeInternalInstance = {};
@@ -202,9 +201,6 @@ const classComponentUpdater = {
202201
update.callback = callback;
203202
}
204203

205-
if (revertPassiveEffectsChange) {
206-
flushPassiveEffects();
207-
}
208204
enqueueUpdate(fiber, update);
209205
scheduleWork(fiber, expirationTime);
210206
},
@@ -229,9 +225,6 @@ const classComponentUpdater = {
229225
update.callback = callback;
230226
}
231227

232-
if (revertPassiveEffectsChange) {
233-
flushPassiveEffects();
234-
}
235228
enqueueUpdate(fiber, update);
236229
scheduleWork(fiber, expirationTime);
237230
},
@@ -255,9 +248,6 @@ const classComponentUpdater = {
255248
update.callback = callback;
256249
}
257250

258-
if (revertPassiveEffectsChange) {
259-
flushPassiveEffects();
260-
}
261251
enqueueUpdate(fiber, update);
262252
scheduleWork(fiber, expirationTime);
263253
},

packages/react-reconciler/src/ReactFiberHooks.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import warning from 'shared/warning';
5151
import getComponentName from 'shared/getComponentName';
5252
import is from 'shared/objectIs';
5353
import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork';
54-
import {revertPassiveEffectsChange} from 'shared/ReactFeatureFlags';
5554
import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig';
5655
import {getCurrentPriorityLevel} from './SchedulerWithReactIntegration';
5756

@@ -1166,10 +1165,6 @@ function dispatchAction<S, A>(
11661165
lastRenderPhaseUpdate.next = update;
11671166
}
11681167
} else {
1169-
if (revertPassiveEffectsChange) {
1170-
flushPassiveEffects();
1171-
}
1172-
11731168
const currentTime = requestCurrentTime();
11741169
const suspenseConfig = requestCurrentSuspenseConfig();
11751170
const expirationTime = computeExpirationForFiber(

packages/react-reconciler/src/ReactFiberReconciler.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ import {
7070
} from './ReactCurrentFiber';
7171
import {StrictMode} from './ReactTypeOfMode';
7272
import {Sync} from './ReactFiberExpirationTime';
73-
import {revertPassiveEffectsChange} from 'shared/ReactFeatureFlags';
7473
import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig';
7574
import {
7675
scheduleRefresh,
@@ -167,9 +166,6 @@ function scheduleRootUpdate(
167166
update.callback = callback;
168167
}
169168

170-
if (revertPassiveEffectsChange) {
171-
flushPassiveEffects();
172-
}
173169
enqueueUpdate(current, update);
174170
scheduleWork(current, expirationTime);
175171

@@ -434,10 +430,6 @@ if (__DEV__) {
434430
id--;
435431
}
436432
if (currentHook !== null) {
437-
if (revertPassiveEffectsChange) {
438-
flushPassiveEffects();
439-
}
440-
441433
const newState = copyWithSet(currentHook.memoizedState, path, value);
442434
currentHook.memoizedState = newState;
443435
currentHook.baseState = newState;
@@ -455,9 +447,6 @@ if (__DEV__) {
455447

456448
// Support DevTools props for function components, forwardRef, memo, host components, etc.
457449
overrideProps = (fiber: Fiber, path: Array<string | number>, value: any) => {
458-
if (revertPassiveEffectsChange) {
459-
flushPassiveEffects();
460-
}
461450
fiber.pendingProps = copyWithSet(fiber.memoizedProps, path, value);
462451
if (fiber.alternate) {
463452
fiber.alternate.pendingProps = fiber.pendingProps;
@@ -466,9 +455,6 @@ if (__DEV__) {
466455
};
467456

468457
scheduleUpdate = (fiber: Fiber) => {
469-
if (revertPassiveEffectsChange) {
470-
flushPassiveEffects();
471-
}
472458
scheduleWork(fiber, Sync);
473459
};
474460

packages/react-reconciler/src/ReactFiberWorkLoop.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
replayFailedUnitOfWorkWithInvokeGuardedCallback,
2525
enableProfilerTimer,
2626
enableSchedulerTracing,
27-
revertPassiveEffectsChange,
2827
warnAboutUnmockedScheduler,
2928
flushSuspenseFallbacksInTests,
3029
disableSchedulerTimeoutBasedOnReactExpirationTime,
@@ -621,11 +620,9 @@ export function flushDiscreteUpdates() {
621620
return;
622621
}
623622
flushPendingDiscreteUpdates();
624-
if (!revertPassiveEffectsChange) {
625-
// If the discrete updates scheduled passive effects, flush them now so that
626-
// they fire before the next serial event.
627-
flushPassiveEffects();
628-
}
623+
// If the discrete updates scheduled passive effects, flush them now so that
624+
// they fire before the next serial event.
625+
flushPassiveEffects();
629626
}
630627

631628
function resolveLocksOnRoot(root: FiberRoot, expirationTime: ExpirationTime) {

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,47 +2170,4 @@ describe('ReactHooksWithNoopRenderer', () => {
21702170
expect(Scheduler).toHaveYielded(['Step: 5, Shadow: 5']);
21712171
expect(ReactNoop).toMatchRenderedOutput('5');
21722172
});
2173-
2174-
describe('revertPassiveEffectsChange', () => {
2175-
it('flushes serial effects before enqueueing work', () => {
2176-
jest.resetModules();
2177-
2178-
ReactFeatureFlags = require('shared/ReactFeatureFlags');
2179-
ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
2180-
ReactFeatureFlags.enableSchedulerTracing = true;
2181-
ReactFeatureFlags.revertPassiveEffectsChange = true;
2182-
React = require('react');
2183-
ReactNoop = require('react-noop-renderer');
2184-
Scheduler = require('scheduler');
2185-
SchedulerTracing = require('scheduler/tracing');
2186-
useState = React.useState;
2187-
useEffect = React.useEffect;
2188-
act = ReactNoop.act;
2189-
2190-
let _updateCount;
2191-
function Counter(props) {
2192-
const [count, updateCount] = useState(0);
2193-
_updateCount = updateCount;
2194-
useEffect(() => {
2195-
Scheduler.unstable_yieldValue(`Will set count to 1`);
2196-
updateCount(1);
2197-
}, []);
2198-
return <Text text={'Count: ' + count} />;
2199-
}
2200-
2201-
act(() => {
2202-
ReactNoop.render(<Counter count={0} />, () =>
2203-
Scheduler.unstable_yieldValue('Sync effect'),
2204-
);
2205-
expect(Scheduler).toFlushAndYieldThrough(['Count: 0', 'Sync effect']);
2206-
expect(ReactNoop.getChildren()).toEqual([span('Count: 0')]);
2207-
// Enqueuing this update forces the passive effect to be flushed --
2208-
// updateCount(1) happens first, so 2 wins.
2209-
act(() => _updateCount(2));
2210-
expect(Scheduler).toHaveYielded(['Will set count to 1']);
2211-
expect(Scheduler).toFlushAndYield(['Count: 2']);
2212-
expect(ReactNoop.getChildren()).toEqual([span('Count: 2')]);
2213-
});
2214-
});
2215-
});
22162173
});

packages/shared/ReactFeatureFlags.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ export const enableJSXTransformAPI = false;
7171
// We will enforce mocking scheduler with scheduler/unstable_mock at some point. (v17?)
7272
// Till then, we warn about the missing mock, but still fallback to a sync mode compatible version
7373
export const warnAboutUnmockedScheduler = false;
74-
// Temporary flag to revert the fix in #15650
75-
export const revertPassiveEffectsChange = false;
7674

7775
// For tests, we flush suspense fallbacks in an act scope;
7876
// *except* in some of our own tests, where we test incremental loading states.

packages/shared/forks/ReactFeatureFlags.native-fb.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const enableFlareAPI = false;
3535
export const enableFundamentalAPI = false;
3636
export const enableJSXTransformAPI = false;
3737
export const warnAboutUnmockedScheduler = true;
38-
export const revertPassiveEffectsChange = false;
3938
export const flushSuspenseFallbacksInTests = true;
4039
export const enableUserBlockingEvents = false;
4140
export const enableSuspenseCallback = false;

packages/shared/forks/ReactFeatureFlags.native-oss.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const enableFlareAPI = false;
3030
export const enableFundamentalAPI = false;
3131
export const enableJSXTransformAPI = false;
3232
export const warnAboutUnmockedScheduler = false;
33-
export const revertPassiveEffectsChange = false;
3433
export const flushSuspenseFallbacksInTests = true;
3534
export const enableUserBlockingEvents = false;
3635
export const enableSuspenseCallback = false;

packages/shared/forks/ReactFeatureFlags.persistent.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const enableFlareAPI = false;
3030
export const enableFundamentalAPI = false;
3131
export const enableJSXTransformAPI = false;
3232
export const warnAboutUnmockedScheduler = true;
33-
export const revertPassiveEffectsChange = false;
3433
export const flushSuspenseFallbacksInTests = true;
3534
export const enableUserBlockingEvents = false;
3635
export const enableSuspenseCallback = false;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const enableFlareAPI = false;
3030
export const enableFundamentalAPI = false;
3131
export const enableJSXTransformAPI = false;
3232
export const warnAboutUnmockedScheduler = false;
33-
export const revertPassiveEffectsChange = false;
3433
export const flushSuspenseFallbacksInTests = true;
3534
export const enableUserBlockingEvents = false;
3635
export const enableSuspenseCallback = false;

0 commit comments

Comments
 (0)