Remove passive intervention flag (#19849)
Dan Abramov committed
Sep 17, 2020 at 15:37 UTC
6fddca27e75950adda92ab4f4946442907dc3bb7
13 files changed
+12
-37
packages/react-dom/src/events/DOMPluginEventSystem.js
+1
-2
@@ -51,7 +51,6 @@ import {
51
enableLegacyFBSupport,
52
enableCreateEventHandleAPI,
53
enableScopeAPI,
54
- enablePassiveEventIntervention,
54
enableEagerRootListeners,
55
} from 'shared/ReactFeatureFlags';
56
import {
@@ -481,7 +480,7 @@ function addTrappedEventListener(
480
// If passive option is not supported, then the event will be
481
// active and not passive.
482
let isPassiveListener = undefined;
484
- if (enablePassiveEventIntervention && passiveBrowserEventsSupported) {
483
+ if (passiveBrowserEventsSupported) {
484
// Browsers introduced an intervention, making these events
485
// passive by default on document. React doesn't bind them
486
// to document anymore, but changing this now would undo
packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js
+1
-9
@@ -3070,15 +3070,7 @@ describe('DOMPluginEventSystem', () => {
3070
3071
expect(allEvents).toEqual(['touchstart', 'touchmove', 'wheel']);
3072
// These events are passive by default, so we can't preventDefault.
3073
- if (gate(flags => flags.enablePassiveEventIntervention)) {
3074
- expect(defaultPreventedEvents).toEqual([]);
3075
- } else {
3076
- expect(defaultPreventedEvents).toEqual([
3077
- 'touchstart',
3078
- 'touchmove',
3079
- 'wheel',
3080
- ]);
3081
- }
3073
+ expect(defaultPreventedEvents).toEqual([]);
3074
});
3075
});
3076
});
packages/react-dom/src/events/plugins/__tests__/SimpleEventPlugin-test.js
+10
-14
@@ -534,21 +534,17 @@ describe('SimpleEventPlugin', function() {
534
container,
535
);
536
537
- if (gate(flags => flags.enablePassiveEventIntervention)) {
538
- if (gate(flags => flags.enableEagerRootListeners)) {
539
- expect(passiveEvents).toEqual([
540
- 'touchstart',
541
- 'touchstart',
542
- 'touchmove',
543
- 'touchmove',
544
- 'wheel',
545
- 'wheel',
546
- ]);
547
- } else {
548
- expect(passiveEvents).toEqual(['touchstart', 'touchmove', 'wheel']);
549
- }
537
+ if (gate(flags => flags.enableEagerRootListeners)) {
538
+ expect(passiveEvents).toEqual([
539
+ 'touchstart',
540
+ 'touchstart',
541
+ 'touchmove',
542
+ 'touchmove',
543
+ 'wheel',
544
+ 'wheel',
545
+ ]);
546
} else {
551
- expect(passiveEvents).toEqual([]);
547
+ expect(passiveEvents).toEqual(['touchstart', 'touchmove', 'wheel']);
548
}
549
});
550
});
packages/shared/ReactFeatureFlags.js
-3
@@ -133,9 +133,6 @@ export const decoupleUpdatePriorityFromScheduler = false;
133
134
export const enableDiscreteEventFlushingChange = false;
135
136
-// https://github.com/facebook/react/pull/19654
137
-export const enablePassiveEventIntervention = true;
138
-
136
export const enableEagerRootListeners = true;
137
138
export const disableSchedulerTimeoutInWorkLoop = false;
packages/shared/forks/ReactFeatureFlags.native-fb.js
-1
@@ -49,7 +49,6 @@ export const enableNewReconciler = false;
49
export const deferRenderPhaseUpdateToNextBatch = true;
50
export const decoupleUpdatePriorityFromScheduler = false;
51
export const enableDiscreteEventFlushingChange = false;
52
-export const enablePassiveEventIntervention = true;
52
export const enableEagerRootListeners = true;
53
export const disableSchedulerTimeoutInWorkLoop = false;
54
packages/shared/forks/ReactFeatureFlags.native-oss.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = false;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.test-renderer.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = false;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.test-renderer.native.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = false;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = false;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.testing.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = false;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.testing.www.js
-1
@@ -48,7 +48,6 @@ export const enableNewReconciler = false;
48
export const deferRenderPhaseUpdateToNextBatch = true;
49
export const decoupleUpdatePriorityFromScheduler = false;
50
export const enableDiscreteEventFlushingChange = true;
51
-export const enablePassiveEventIntervention = true;
51
export const enableEagerRootListeners = true;
52
export const disableSchedulerTimeoutInWorkLoop = false;
53
packages/shared/forks/ReactFeatureFlags.www-dynamic.js
-1
@@ -19,7 +19,6 @@ export const enableFilterEmptyStringAttributesDOM = __VARIANT__;
19
export const enableLegacyFBSupport = __VARIANT__;
20
export const decoupleUpdatePriorityFromScheduler = __VARIANT__;
21
export const skipUnmountedBoundaries = __VARIANT__;
22
-export const enablePassiveEventIntervention = __VARIANT__;
22
export const enableEagerRootListeners = !__VARIANT__;
23
24
// Enable this flag to help with concurrent mode debugging.
packages/shared/forks/ReactFeatureFlags.www.js
-1
@@ -27,7 +27,6 @@ export const {
27
decoupleUpdatePriorityFromScheduler,
28
enableDebugTracing,
29
skipUnmountedBoundaries,
30
- enablePassiveEventIntervention,
30
enableEagerRootListeners,
31
disableSchedulerTimeoutInWorkLoop,
32
} = dynamicFeatureFlags;