Cleanup getListener and EventSystemFlags (#18469)

trueadm · web-flow · commit 8815e4cc7277 · 2020-04-02T23:17:10.000+01:00
diff --git a/packages/legacy-events/EventSystemFlags.js b/packages/legacy-events/EventSystemFlags.js
diff --git a/packages/legacy-events/PluginModuleType.js b/packages/legacy-events/PluginModuleType.js
@@ -13,22 +13,23 @@ import type {
   ReactSyntheticEvent,
 } from './ReactSyntheticEventType';
 import type {TopLevelType} from './TopLevelEventTypes';
-import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
 
 export type EventTypes = {[key: string]: DispatchConfig, ...};
 
 export type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | TouchEvent;
 
 export type PluginName = string;
 
+export type EventSystemFlags = number;
+
 export type PluginModule<NativeEvent> = {
   eventTypes: EventTypes,
   extractEvents: (
     topLevelType: TopLevelType,
     targetInst: null | Fiber,
     nativeTarget: NativeEvent,
     nativeEventTarget: null | EventTarget,
-    eventSystemFlags: EventSystemFlags,
+    eventSystemFlags?: number,
     container?: null | EventTarget,
   ) => ?ReactSyntheticEvent,
   tapMoveThreshold?: number,
diff --git a/packages/legacy-events/ResponderEventPlugin.js b/packages/legacy-events/ResponderEventPlugin.js
@@ -10,6 +10,7 @@ import {
   hasDispatches,
   executeDispatchesInOrderStopAtTrue,
   getInstanceFromNode,
+  getFiberCurrentPropsFromNode,
 } from './EventPluginUtils';
 import ResponderSyntheticEvent from './ResponderSyntheticEvent';
 import ResponderTouchHistoryStore from './ResponderTouchHistoryStore';
@@ -25,10 +26,10 @@ import {
   moveDependencies,
   endDependencies,
 } from './ResponderTopLevelEventTypes';
-import getListener from './getListener';
 import accumulateInto from './accumulateInto';
 import forEachAccumulated from './forEachAccumulated';
 import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
+import invariant from 'shared/invariant';
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -208,7 +209,7 @@ export function getLowestCommonAncestor(instA, instB) {
 /**
  * Return if A is an ancestor of B.
  */
-export function isAncestor(instA, instB) {
+function isAncestor(instA, instB) {
   while (instB) {
     if (instA === instB || instA === instB.alternate) {
       return true;
@@ -221,7 +222,7 @@ export function isAncestor(instA, instB) {
 /**
  * Simulates the traversal of a two-phase, capture/bubble event dispatch.
  */
-export function traverseTwoPhase(inst, fn, arg) {
+function traverseTwoPhase(inst, fn, arg) {
   const path = [];
   while (inst) {
     path.push(inst);
@@ -236,6 +237,27 @@ export function traverseTwoPhase(inst, fn, arg) {
   }
 }
 
+function getListener(inst, registrationName) {
+  const stateNode = inst.stateNode;
+  if (stateNode === null) {
+    // Work in progress (ex: onload events in incremental mode).
+    return null;
+  }
+  const props = getFiberCurrentPropsFromNode(stateNode);
+  if (props === null) {
+    // Work in progress.
+    return null;
+  }
+  const listener = props[registrationName];
+  invariant(
+    !listener || typeof listener === 'function',
+    'Expected `%s` listener to be a function, instead got a value of `%s` type.',
+    registrationName,
+    typeof listener,
+  );
+  return listener;
+}
+
 function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
   const registrationName =
     event.dispatchConfig.phasedRegistrationNames[propagationPhase];
diff --git a/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js b/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const {HostComponent} = require('react-reconciler/src/ReactWorkTags');
-const {PLUGIN_EVENT_SYSTEM} = require('legacy-events/EventSystemFlags');
+const {PLUGIN_EVENT_SYSTEM} = require('react-dom/src/events/EventSystemFlags');
 
 let EventBatching;
 let EventPluginUtils;
diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.internal.js
@@ -62,7 +62,8 @@ describe('ReactBrowserEventEmitter', () => {
     LISTENER.mockClear();
 
     ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    EventPluginGetListener = require('legacy-events/getListener').default;
+    EventPluginGetListener = require('react-dom/src/events/getListener')
+      .default;
     EventPluginRegistry = require('legacy-events/EventPluginRegistry');
     React = require('react');
     ReactDOM = require('react-dom');
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -78,7 +78,7 @@ import {
   IS_PASSIVE,
   PLUGIN_EVENT_SYSTEM,
   USE_EVENT_SYSTEM,
-} from 'legacy-events/EventSystemFlags';
+} from '../events/EventSystemFlags';
 import {
   isManagedDOMElement,
   isValidEventTarget,
@@ -102,6 +102,7 @@ export type Type = string;
 export type Props = {
   autoFocus?: boolean,
   children?: mixed,
+  disabled?: boolean,
   hidden?: boolean,
   suppressHydrationWarning?: boolean,
   dangerouslySetInnerHTML?: mixed,
diff --git a/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js b/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js
@@ -10,7 +10,7 @@
 import type {AnyNativeEvent} from 'legacy-events/PluginModuleType';
 import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
 import type {ElementListenerMap} from '../events/DOMEventListenerMap';
-import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
+import type {EventSystemFlags} from './EventSystemFlags';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {PluginModule} from 'legacy-events/PluginModuleType';
 import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
@@ -21,10 +21,7 @@ import {
   HostComponent,
   HostText,
 } from 'react-reconciler/src/ReactWorkTags';
-import {
-  IS_FIRST_ANCESTOR,
-  PLUGIN_EVENT_SYSTEM,
-} from 'legacy-events/EventSystemFlags';
+import {IS_FIRST_ANCESTOR, PLUGIN_EVENT_SYSTEM} from './EventSystemFlags';
 import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching';
 import {runEventsInBatch} from 'legacy-events/EventBatching';
 import {plugins} from 'legacy-events/EventPluginRegistry';
diff --git a/packages/react-dom/src/events/DOMModernPluginEventSystem.js b/packages/react-dom/src/events/DOMModernPluginEventSystem.js
@@ -13,7 +13,7 @@ import type {
   ElementListenerMap,
   ElementListenerMapEntry,
 } from '../events/DOMEventListenerMap';
-import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
+import type {EventSystemFlags} from './EventSystemFlags';
 import type {EventPriority, ReactScopeMethods} from 'shared/ReactTypes';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {PluginModule} from 'legacy-events/PluginModuleType';
@@ -32,7 +32,7 @@ import {
   IS_REPLAYED,
   IS_TARGET_PHASE_ONLY,
   USE_EVENT_SYSTEM,
-} from 'legacy-events/EventSystemFlags';
+} from './EventSystemFlags';
 
 import {HostRoot, HostPortal} from 'react-reconciler/src/ReactWorkTags';
 
diff --git a/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js b/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js
@@ -10,7 +10,7 @@ import {
   type EventSystemFlags,
   IS_PASSIVE,
   PASSIVE_NOT_SUPPORTED,
-} from 'legacy-events/EventSystemFlags';
+} from './EventSystemFlags';
 import type {AnyNativeEvent} from 'legacy-events/PluginModuleType';
 import {
   HostComponent,
diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js
@@ -11,7 +11,10 @@ import {
   TOP_POINTER_OUT,
   TOP_POINTER_OVER,
 } from './DOMTopLevelEventTypes';
-import {IS_REPLAYED, IS_FIRST_ANCESTOR} from 'legacy-events/EventSystemFlags';
+import {
+  IS_REPLAYED,
+  IS_FIRST_ANCESTOR,
+} from 'react-dom/src/events/EventSystemFlags';
 import SyntheticMouseEvent from './SyntheticMouseEvent';
 import SyntheticPointerEvent from './SyntheticPointerEvent';
 import {
diff --git a/packages/react-dom/src/events/EventSystemFlags.js b/packages/react-dom/src/events/EventSystemFlags.js
@@ -11,10 +11,10 @@ export type EventSystemFlags = number;
 
 export const PLUGIN_EVENT_SYSTEM = 1;
 export const RESPONDER_EVENT_SYSTEM = 1 << 1;
-export const IS_PASSIVE = 1 << 2;
-export const IS_ACTIVE = 1 << 3;
-export const PASSIVE_NOT_SUPPORTED = 1 << 4;
-export const IS_REPLAYED = 1 << 5;
-export const IS_FIRST_ANCESTOR = 1 << 6;
-export const IS_TARGET_EVENT_ONLY = 1 << 7;
+export const USE_EVENT_SYSTEM = 1 << 2;
+export const IS_TARGET_PHASE_ONLY = 1 << 3;
+export const IS_PASSIVE = 1 << 4;
+export const PASSIVE_NOT_SUPPORTED = 1 << 5;
+export const IS_REPLAYED = 1 << 6;
+export const IS_FIRST_ANCESTOR = 1 << 7;
 export const LEGACY_FB_SUPPORT = 1 << 8;
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -42,7 +42,7 @@ import {
   RESPONDER_EVENT_SYSTEM,
   IS_PASSIVE,
   PASSIVE_NOT_SUPPORTED,
-} from 'legacy-events/EventSystemFlags';
+} from './EventSystemFlags';
 
 import {
   addEventBubbleListener,
diff --git a/packages/react-dom/src/events/ReactDOMEventReplaying.js b/packages/react-dom/src/events/ReactDOMEventReplaying.js
@@ -11,7 +11,7 @@ import type {AnyNativeEvent} from 'legacy-events/PluginModuleType';
 import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
 import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
 import type {ElementListenerMap} from '../events/DOMEventListenerMap';
-import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
+import type {EventSystemFlags} from './EventSystemFlags';
 import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
 
 import {
@@ -118,7 +118,7 @@ import {
   TOP_FOCUS,
   TOP_BLUR,
 } from './DOMTopLevelEventTypes';
-import {IS_REPLAYED, PLUGIN_EVENT_SYSTEM} from 'legacy-events/EventSystemFlags';
+import {IS_REPLAYED, PLUGIN_EVENT_SYSTEM} from './EventSystemFlags';
 import {legacyListenToTopLevelEvent} from './DOMLegacyEventPluginSystem';
 import {listenToTopLevelEvent} from './DOMModernPluginEventSystem';
 
diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js
@@ -14,10 +14,10 @@ import type {
 import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {PluginModule} from 'legacy-events/PluginModuleType';
-import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
+import type {EventSystemFlags} from './EventSystemFlags';
 
 import SyntheticEvent from 'legacy-events/SyntheticEvent';
-import {IS_TARGET_PHASE_ONLY} from 'legacy-events/EventSystemFlags';
+import {IS_TARGET_PHASE_ONLY} from './EventSystemFlags';
 
 import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes';
 import {
@@ -86,7 +86,7 @@ const SimpleEventPlugin: PluginModule<MouseEvent> = {
     targetInst: null | Fiber,
     nativeEvent: MouseEvent,
     nativeEventTarget: null | EventTarget,
-    eventSystemFlags: EventSystemFlags,
+    eventSystemFlags?: EventSystemFlags,
     targetContainer?: null | EventTarget,
   ): null | ReactSyntheticEvent {
     const dispatchConfig = topLevelEventsToDispatchConfig.get(topLevelType);
diff --git a/packages/react-dom/src/events/accumulateEnterLeaveListeners.js b/packages/react-dom/src/events/accumulateEnterLeaveListeners.js
@@ -10,8 +10,8 @@
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
 
-import getListener from 'legacy-events/getListener';
 import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
+import getListener from './getListener';
 
 function getParent(inst: Fiber | null): Fiber | null {
   if (inst === null) {
diff --git a/packages/react-dom/src/events/accumulateTwoPhaseListeners.js b/packages/react-dom/src/events/accumulateTwoPhaseListeners.js
@@ -20,7 +20,7 @@ import {
   enableModernEventSystem,
 } from 'shared/ReactFeatureFlags';
 
-import getListener from 'legacy-events/getListener';
+import getListener from './getListener';
 import {getListenersFromTarget} from '../client/ReactDOMComponentTree';
 import {reactScopeListenerStore} from './DOMModernPluginEventSystem';
 
diff --git a/packages/react-dom/src/events/getListener.js b/packages/react-dom/src/events/getListener.js
@@ -7,12 +7,12 @@
  */
 
 import type {Fiber} from 'react-reconciler/src/ReactFiber';
+import type {Props} from '../client/ReactDOMHostConfig';
 
 import invariant from 'shared/invariant';
+import {getFiberCurrentPropsFromNode} from '../client/ReactDOMComponentTree';
 
-import {getFiberCurrentPropsFromNode} from './EventPluginUtils';
-
-function isInteractive(tag) {
+function isInteractive(tag: string): boolean {
   return (
     tag === 'button' ||
     tag === 'input' ||
@@ -21,7 +21,11 @@ function isInteractive(tag) {
   );
 }
 
-function shouldPreventMouseEvent(name, type, props) {
+function shouldPreventMouseEvent(
+  name: string,
+  type: string,
+  props: Props,
+): boolean {
   switch (name) {
     case 'onClick':
     case 'onClickCapture':
@@ -45,16 +49,17 @@ function shouldPreventMouseEvent(name, type, props) {
  * @param {string} registrationName Name of listener (e.g. `onClick`).
  * @return {?function} The stored callback.
  */
-export default function getListener(inst: Fiber, registrationName: string) {
-  // TODO: shouldPreventMouseEvent is DOM-specific and definitely should not
-  // live here; needs to be moved to a better place soon
+export default function getListener(
+  inst: Fiber,
+  registrationName: string,
+): Function | null {
   const stateNode = inst.stateNode;
-  if (!stateNode) {
+  if (stateNode === null) {
     // Work in progress (ex: onload events in incremental mode).
     return null;
   }
   const props = getFiberCurrentPropsFromNode(stateNode);
-  if (!props) {
+  if (props === null) {
     // Work in progress.
     return null;
   }
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -19,7 +19,6 @@ import SyntheticEvent from 'legacy-events/SyntheticEvent';
 import invariant from 'shared/invariant';
 import {ELEMENT_NODE} from '../shared/HTMLNodeType';
 import * as DOMTopLevelEventTypes from '../events/DOMTopLevelEventTypes';
-import {PLUGIN_EVENT_SYSTEM} from 'legacy-events/EventSystemFlags';
 import act from './ReactTestUtilsAct';
 import forEachAccumulated from 'legacy-events/forEachAccumulated';
 import accumulateInto from 'legacy-events/accumulateInto';
@@ -62,6 +61,7 @@ let hasWarnedAboutDeprecatedMockComponent = false;
  */
 function simulateNativeEventOnNode(topLevelType, node, fakeNativeEvent) {
   fakeNativeEvent.target = node;
+  const PLUGIN_EVENT_SYSTEM = 1;
   dispatchEvent(topLevelType, PLUGIN_EVENT_SYSTEM, null, fakeNativeEvent);
 }
 
diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js
diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js
diff --git a/packages/react-native-renderer/src/ReactNativeGetListener.js b/packages/react-native-renderer/src/ReactNativeGetListener.js
