Address feedback

facebook · Jul 6, 2020 · 0709a3c · 0709a3c
1 parent 84b4b42
commit 0709a3c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/packages/react-dom/src/events/DOMModernPluginEventSystem.js b/packages/react-dom/src/events/DOMModernPluginEventSystem.js
@@ -632,7 +632,7 @@ function createDispatchQueueItem(
   };
 }
 
-export function accumulatePhaseListeners(
+export function accumulateTwoPhaseListeners(
   targetFiber: Fiber | null,
   dispatchQueue: DispatchQueue,
   event: ReactSyntheticEvent,
@@ -905,7 +905,7 @@ export function accumulateEnterLeaveListeners(
   }
 }
 
-export function accumulateEventTargetListeners(
+export function accumulateEventHandleTargetListeners(
   dispatchQueue: DispatchQueue,
   event: ReactSyntheticEvent,
   currentTarget: EventTarget,

diff --git a/packages/react-dom/src/events/plugins/ModernBeforeInputEventPlugin.js b/packages/react-dom/src/events/plugins/ModernBeforeInputEventPlugin.js
@@ -29,7 +29,7 @@ import {
 } from '../FallbackCompositionState';
 import SyntheticCompositionEvent from '../SyntheticCompositionEvent';
 import SyntheticInputEvent from '../SyntheticInputEvent';
-import {accumulatePhaseListeners} from '../DOMModernPluginEventSystem';
+import {accumulateTwoPhaseListeners} from '../DOMModernPluginEventSystem';
 
 const END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
 const START_KEYCODE = 229;
@@ -241,7 +241,7 @@ function extractCompositionEvent(
     nativeEvent,
     nativeEventTarget,
   );
-  accumulatePhaseListeners(targetInst, dispatchQueue, event);
+  accumulateTwoPhaseListeners(targetInst, dispatchQueue, event);
 
   if (fallbackData) {
     // Inject data generated from fallback path into the synthetic event.
@@ -411,7 +411,7 @@ function extractBeforeInputEvent(
     nativeEvent,
     nativeEventTarget,
   );
-  accumulatePhaseListeners(targetInst, dispatchQueue, event);
+  accumulateTwoPhaseListeners(targetInst, dispatchQueue, event);
   event.data = chars;
 }
 

diff --git a/packages/react-dom/src/events/plugins/ModernChangeEventPlugin.js b/packages/react-dom/src/events/plugins/ModernChangeEventPlugin.js
@@ -37,7 +37,7 @@ import {disableInputAttributeSyncing} from 'shared/ReactFeatureFlags';
 import {batchedUpdates} from '../ReactDOMUpdateBatching';
 import {
   dispatchEventsInBatch,
-  accumulatePhaseListeners,
+  accumulateTwoPhaseListeners,
 } from '../DOMModernPluginEventSystem';
 
 function registerEvents() {
@@ -63,7 +63,7 @@ function createAndAccumulateChangeEvent(
   event.type = 'change';
   // Flag this event loop as needing state restore.
   enqueueStateRestore(((target: any): Node));
-  accumulatePhaseListeners(inst, dispatchQueue, event);
+  accumulateTwoPhaseListeners(inst, dispatchQueue, event);
 }
 /**
  * For IE shims

diff --git a/packages/react-dom/src/events/plugins/ModernSelectEventPlugin.js b/packages/react-dom/src/events/plugins/ModernSelectEventPlugin.js
@@ -29,7 +29,7 @@ import {
 } from '../../client/ReactDOMComponentTree';
 import {hasSelectionCapabilities} from '../../client/ReactInputSelection';
 import {DOCUMENT_NODE} from '../../shared/HTMLNodeType';
-import {accumulatePhaseListeners} from '../DOMModernPluginEventSystem';
+import {accumulateTwoPhaseListeners} from '../DOMModernPluginEventSystem';
 
 const skipSelectionChangeEvent =
   canUseDOM && 'documentMode' in document && document.documentMode <= 11;
@@ -136,7 +136,11 @@ function constructSelectEvent(dispatchQueue, nativeEvent, nativeEventTarget) {
     syntheticEvent.type = 'select';
     syntheticEvent.target = activeElement;
 
-    accumulatePhaseListeners(activeElementInst, dispatchQueue, syntheticEvent);
+    accumulateTwoPhaseListeners(
+      activeElementInst,
+      dispatchQueue,
+      syntheticEvent,
+    );
   }
 }
 

diff --git a/packages/react-dom/src/events/plugins/ModernSimpleEventPlugin.js b/packages/react-dom/src/events/plugins/ModernSimpleEventPlugin.js
@@ -23,8 +23,8 @@ import {
   registerSimpleEvents,
 } from '../DOMEventProperties';
 import {
-  accumulatePhaseListeners,
-  accumulateEventTargetListeners,
+  accumulateTwoPhaseListeners,
+  accumulateEventHandleTargetListeners,
 } from '../DOMModernPluginEventSystem';
 import {IS_TARGET_PHASE_ONLY} from '../EventSystemFlags';
 import SyntheticAnimationEvent from '../SyntheticAnimationEvent';
@@ -159,14 +159,14 @@ function extractEvents(
     targetContainer != null
   ) {
     const inCapturePhase = (eventSystemFlags & IS_CAPTURE_PHASE) !== 0;
-    accumulateEventTargetListeners(
+    accumulateEventHandleTargetListeners(
       dispatchQueue,
       event,
       targetContainer,
       inCapturePhase,
     );
   } else {
-    accumulatePhaseListeners(targetInst, dispatchQueue, event, true);
+    accumulateTwoPhaseListeners(targetInst, dispatchQueue, event, true);
   }
   return event;
 }