Skip to content

Commit 9d63784

Browse files
authored
Remove enableUserBlockingEvents flag (#16882)
Seems like this worked out. We can clean up the flag now.
1 parent fe31cc7 commit 9d63784

14 files changed

+11
-44
lines changed

packages/react-dom/src/events/DOMEventResponderSystem.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import {
3939
UserBlockingEvent,
4040
DiscreteEvent,
4141
} from 'shared/ReactTypes';
42-
import {enableUserBlockingEvents} from 'shared/ReactFeatureFlags';
4342

4443
// Intentionally not named imports because Rollup would use dynamic dispatch for
4544
// CommonJS interop named imports.
@@ -104,13 +103,9 @@ const eventResponderContext: ReactDOMResponderContext = {
104103
break;
105104
}
106105
case UserBlockingEvent: {
107-
if (enableUserBlockingEvents) {
108-
runWithPriority(UserBlockingPriority, () =>
109-
executeUserEventHandler(eventListener, eventValue),
110-
);
111-
} else {
112-
executeUserEventHandler(eventListener, eventValue);
113-
}
106+
runWithPriority(UserBlockingPriority, () =>
107+
executeUserEventHandler(eventListener, eventValue),
108+
);
114109
break;
115110
}
116111
case ContinuousEvent: {

packages/react-dom/src/events/ReactDOMEventListener.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ import SimpleEventPlugin from './SimpleEventPlugin';
6262
import {getRawEventName} from './DOMTopLevelEventTypes';
6363
import {passiveBrowserEventsSupported} from './checkPassiveEvents';
6464

65-
import {
66-
enableFlareAPI,
67-
enableUserBlockingEvents,
68-
} from 'shared/ReactFeatureFlags';
65+
import {enableFlareAPI} from 'shared/ReactFeatureFlags';
6966
import {
7067
UserBlockingEvent,
7168
ContinuousEvent,
@@ -298,14 +295,10 @@ function dispatchUserBlockingUpdate(
298295
eventSystemFlags,
299296
nativeEvent,
300297
) {
301-
if (enableUserBlockingEvents) {
302-
runWithPriority(
303-
UserBlockingPriority,
304-
dispatchEvent.bind(null, topLevelType, eventSystemFlags, nativeEvent),
305-
);
306-
} else {
307-
dispatchEvent(topLevelType, eventSystemFlags, nativeEvent);
308-
}
298+
runWithPriority(
299+
UserBlockingPriority,
300+
dispatchEvent.bind(null, topLevelType, eventSystemFlags, nativeEvent),
301+
);
309302
}
310303

311304
function dispatchEventForPluginEventSystem(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,6 @@ describe('ChangeEventPlugin', () => {
750750
it('mouse enter/leave should be user-blocking but not discrete', async () => {
751751
// This is currently behind a feature flag
752752
jest.resetModules();
753-
ReactFeatureFlags = require('shared/ReactFeatureFlags');
754-
ReactFeatureFlags.enableUserBlockingEvents = true;
755753
React = require('react');
756754
ReactDOM = require('react-dom');
757755
TestUtils = require('react-dom/test-utils');

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ function initializeModules(hasPointerEvents) {
2222
setPointerEvent(hasPointerEvents);
2323
ReactFeatureFlags = require('shared/ReactFeatureFlags');
2424
ReactFeatureFlags.enableFlareAPI = true;
25-
ReactFeatureFlags.enableUserBlockingEvents = true;
2625
React = require('react');
2726
ReactDOM = require('react-dom');
2827
HoverResponder = require('react-interactions/events/hover').HoverResponder;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const modulesInit = () => {
3535
ReactFeatureFlags = require('shared/ReactFeatureFlags');
3636
ReactFeatureFlags.enableFlareAPI = true;
3737
ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
38-
ReactFeatureFlags.enableUserBlockingEvents = true;
3938
React = require('react');
4039
ReactDOM = require('react-dom');
4140
Scheduler = require('scheduler');

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ describe('mixing responders with the heritage event system', () => {
236236
describe('mixing the Input and Press repsonders', () => {
237237
it('is async for non-input events', () => {
238238
ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
239-
ReactFeatureFlags.enableUserBlockingEvents = true;
240239
const useTap = require('react-interactions/events/tap').useTap;
241240
const useInput = require('react-interactions/events/input').useInput;
242241
const root = ReactDOM.unstable_createRoot(container);

packages/react-native-renderer/src/ReactFabricEventResponderSystem.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
UserBlockingEvent,
3232
DiscreteEvent,
3333
} from './ReactNativeTypes';
34-
import {enableUserBlockingEvents} from 'shared/ReactFeatureFlags';
3534
import warning from 'shared/warning';
3635
import invariant from 'shared/invariant';
3736

@@ -95,13 +94,9 @@ const eventResponderContext: ReactNativeResponderContext = {
9594
break;
9695
}
9796
case UserBlockingEvent: {
98-
if (enableUserBlockingEvents) {
99-
runWithPriority(UserBlockingPriority, () =>
100-
executeUserEventHandler(eventListener, eventValue),
101-
);
102-
} else {
103-
executeUserEventHandler(eventListener, eventValue);
104-
}
97+
runWithPriority(UserBlockingPriority, () =>
98+
executeUserEventHandler(eventListener, eventValue),
99+
);
105100
break;
106101
}
107102
case ContinuousEvent: {

packages/shared/ReactFeatureFlags.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ export const warnAboutUnmockedScheduler = false;
8080
// *except* in some of our own tests, where we test incremental loading states.
8181
export const flushSuspenseFallbacksInTests = true;
8282

83-
// Changes priority of some events like mousemove to user-blocking priority,
84-
// but without making them discrete. The flag exists in case it causes
85-
// starvation problems.
86-
export const enableUserBlockingEvents = false;
87-
8883
// Add a callback property to suspense to notify which promises are currently
8984
// in the update queue. This allows reporting and tracing of what is causing
9085
// the user to see a loading state.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export const enableScopeAPI = false;
3838
export const enableJSXTransformAPI = false;
3939
export const warnAboutUnmockedScheduler = true;
4040
export const flushSuspenseFallbacksInTests = true;
41-
export const enableUserBlockingEvents = false;
4241
export const enableSuspenseCallback = false;
4342
export const warnAboutDefaultPropsOnFunctionComponents = false;
4443
export const warnAboutStringRefs = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export const enableScopeAPI = false;
3333
export const enableJSXTransformAPI = false;
3434
export const warnAboutUnmockedScheduler = false;
3535
export const flushSuspenseFallbacksInTests = true;
36-
export const enableUserBlockingEvents = false;
3736
export const enableSuspenseCallback = false;
3837
export const warnAboutDefaultPropsOnFunctionComponents = false;
3938
export const warnAboutStringRefs = false;

packages/shared/forks/ReactFeatureFlags.persistent.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export const enableScopeAPI = false;
3333
export const enableJSXTransformAPI = false;
3434
export const warnAboutUnmockedScheduler = true;
3535
export const flushSuspenseFallbacksInTests = true;
36-
export const enableUserBlockingEvents = false;
3736
export const enableSuspenseCallback = false;
3837
export const warnAboutDefaultPropsOnFunctionComponents = false;
3938
export const warnAboutStringRefs = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export const enableScopeAPI = false;
3333
export const enableJSXTransformAPI = false;
3434
export const warnAboutUnmockedScheduler = false;
3535
export const flushSuspenseFallbacksInTests = true;
36-
export const enableUserBlockingEvents = false;
3736
export const enableSuspenseCallback = false;
3837
export const warnAboutDefaultPropsOnFunctionComponents = false;
3938
export const warnAboutStringRefs = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export const enableScopeAPI = true;
3131
export const enableJSXTransformAPI = true;
3232
export const warnAboutUnmockedScheduler = true;
3333
export const flushSuspenseFallbacksInTests = true;
34-
export const enableUserBlockingEvents = false;
3534
export const enableSuspenseCallback = true;
3635
export const warnAboutDefaultPropsOnFunctionComponents = false;
3736
export const warnAboutStringRefs = false;

packages/shared/forks/ReactFeatureFlags.www.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export const disableLegacyContext = false;
3939
export const warnAboutStringRefs = false;
4040
export const warnAboutDefaultPropsOnFunctionComponents = false;
4141
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
42-
export const enableUserBlockingEvents = true;
4342

4443
export const enableStableConcurrentModeAPIs = false;
4544

0 commit comments

Comments
 (0)