Revert "Revert "Remove onScroll bubbling flag (#19535)" (#19655)" (#1…

…9761) This reverts commit 64ddef4.
facebook · Sep 3, 2020 · bcc0aa4 · bcc0aa4
1 parent e945489
commit bcc0aa4
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 45 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
@@ -743,23 +743,12 @@ describe('ReactDOMEventListener', () => {
  bubbles: false,
  }),
  );
- if (gate(flags => flags.disableOnScrollBubbling)) {
- expect(log).toEqual([
- ['capture', 'grand'],
- ['capture', 'parent'],
- ['capture', 'child'],
- ['bubble', 'child'],
- ]);
- } else {
- expect(log).toEqual([
- ['capture', 'grand'],
- ['capture', 'parent'],
- ['capture', 'child'],
- ['bubble', 'child'],
- ['bubble', 'parent'],
- ['bubble', 'grand'],
- ]);
- }
+ expect(log).toEqual([
+ ['capture', 'grand'],
+ ['capture', 'parent'],
+ ['capture', 'child'],
+ ['bubble', 'child'],
+ ]);
  } finally {
  document.body.removeChild(container);
  }

diff --git a/packages/react-dom/src/__tests__/ReactDOMEventPropagation-test.js b/packages/react-dom/src/__tests__/ReactDOMEventPropagation-test.js
@@ -1225,12 +1225,6 @@ describe('ReactDOMEventListener', () => {
  });
 
  describe('non-bubbling events that do not bubble in React', () => {
- // This test will fail outside of the no-bubbling flag
- // because its bubbling emulation is currently broken.
- // In particular, if the target itself doesn't have
- // a handler, it will not emulate bubbling correctly.
- // Instead of fixing this, we'll just turn this flag on.
- // @gate disableOnScrollBubbling
  it('onScroll', () => {
  testNonBubblingEvent({
  type: 'div',

diff --git a/packages/react-dom/src/events/plugins/SimpleEventPlugin.js b/packages/react-dom/src/events/plugins/SimpleEventPlugin.js
@@ -47,10 +47,7 @@ import {IS_EVENT_HANDLE_NON_MANAGED_NODE} from '../EventSystemFlags';
 import getEventCharCode from '../getEventCharCode';
 import {IS_CAPTURE_PHASE} from '../EventSystemFlags';
 
-import {
- enableCreateEventHandleAPI,
- disableOnScrollBubbling,
-} from 'shared/ReactFeatureFlags';
+import {enableCreateEventHandleAPI} from 'shared/ReactFeatureFlags';
 
 function extractEvents(
  dispatchQueue: DispatchQueue,
@@ -185,15 +182,13 @@ function extractEvents(
  // In the past, React has always bubbled them, but this can be surprising.
  // We're going to try aligning closer to the browser behavior by not bubbling
  // them in React either. We'll start by not bubbling onScroll, and then expand.
- let accumulateTargetOnly = false;
- if (disableOnScrollBubbling) {
- accumulateTargetOnly =
- !inCapturePhase &&
- // TODO: ideally, we'd eventually add all events from
- // nonDelegatedEvents list in DOMPluginEventSystem.
- // Then we can remove this special list.
- domEventName === 'scroll';
- }
+ const accumulateTargetOnly =
+ !inCapturePhase &&
+ // TODO: ideally, we'd eventually add all events from
+ // nonDelegatedEvents list in DOMPluginEventSystem.
+ // Then we can remove this special list.
+ // This is a breaking change that can wait until React 18.
+ domEventName === 'scroll';
 
  accumulateSinglePhaseListeners(
  targetInst,

diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
@@ -135,6 +135,5 @@ export const enableDiscreteEventFlushingChange = false;
 
 // https://github.com/facebook/react/pull/19654
 export const enablePassiveEventIntervention = true;
-export const disableOnScrollBubbling = true;
 
 export const enableEagerRootListeners = true;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -44,7 +44,6 @@ export const enableComponentStackLocations = false;
 export const enableLegacyFBSupport = false;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = false;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -43,7 +43,6 @@ export const enableComponentStackLocations = false;
 export const enableLegacyFBSupport = false;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = false;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -43,7 +43,6 @@ export const enableComponentStackLocations = true;
 export const enableLegacyFBSupport = false;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = false;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -43,7 +43,6 @@ export const enableComponentStackLocations = true;
 export const enableLegacyFBSupport = false;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = false;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js
@@ -43,7 +43,6 @@ export const enableComponentStackLocations = true;
 export const enableLegacyFBSupport = false;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = false;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js
@@ -43,7 +43,6 @@ export const enableComponentStackLocations = true;
 export const enableLegacyFBSupport = !__EXPERIMENTAL__;
 export const enableFilterEmptyStringAttributesDOM = false;
 export const skipUnmountedBoundaries = __EXPERIMENTAL__;
-export const disableOnScrollBubbling = true;
 
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;

diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js
@@ -20,7 +20,6 @@ export const enableLegacyFBSupport = __VARIANT__;
 export const decoupleUpdatePriorityFromScheduler = __VARIANT__;
 export const skipUnmountedBoundaries = __VARIANT__;
 export const enablePassiveEventIntervention = __VARIANT__;
-export const disableOnScrollBubbling = __VARIANT__;
 export const enableEagerRootListeners = !__VARIANT__;
 
 // Enable this flag to help with concurrent mode debugging.

diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -28,7 +28,6 @@ export const {
  enableDebugTracing,
  skipUnmountedBoundaries,
  enablePassiveEventIntervention,
- disableOnScrollBubbling,
  enableEagerRootListeners,
 } = dynamicFeatureFlags;