{"commit":{"shortRevision":"8815e4cc72","authorName":"Dominic Gannaway","authoredAt":"2020-04-02T23:17:10+01:00","revision":"8815e4cc7277012c196d4a89db4e2b6c80065e33","authorEmail":"trueadm@users.noreply.github.com","subject":"Cleanup getListener and EventSystemFlags (#18469)"},"parents":["5e464546af4a32c5ae5e704f68bcf4b98a4c440a"],"patch":"diff --git a\/packages\/legacy-events\/EventSystemFlags.js b\/packages\/legacy-events\/EventSystemFlags.js\ndeleted file mode 100644\nindex 585519c117..0000000000\n--- a\/packages\/legacy-events\/EventSystemFlags.js\n+++ \/dev\/null\n@@ -1,20 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @flow\n- *\/\n-\n-export type EventSystemFlags = number;\n-\n-export const PLUGIN_EVENT_SYSTEM = 1;\n-export const RESPONDER_EVENT_SYSTEM = 1 << 1;\n-export const USE_EVENT_SYSTEM = 1 << 2;\n-export const IS_TARGET_PHASE_ONLY = 1 << 3;\n-export const IS_PASSIVE = 1 << 4;\n-export const PASSIVE_NOT_SUPPORTED = 1 << 5;\n-export const IS_REPLAYED = 1 << 6;\n-export const IS_FIRST_ANCESTOR = 1 << 7;\n-export const LEGACY_FB_SUPPORT = 1 << 8;\ndiff --git a\/packages\/legacy-events\/PluginModuleType.js b\/packages\/legacy-events\/PluginModuleType.js\nindex bcab860cc9..98d45b1ca8 100644\n--- a\/packages\/legacy-events\/PluginModuleType.js\n+++ b\/packages\/legacy-events\/PluginModuleType.js\n@@ -13,7 +13,6 @@ import type {\n ReactSyntheticEvent,\n } from '.\/ReactSyntheticEventType';\n import type {TopLevelType} from '.\/TopLevelEventTypes';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n \n export type EventTypes = {[key: string]: DispatchConfig, ...};\n \n@@ -21,6 +20,8 @@ export type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | TouchEvent;\n \n export type PluginName = string;\n \n+export type EventSystemFlags = number;\n+\n export type PluginModule = {\n eventTypes: EventTypes,\n extractEvents: (\n@@ -28,7 +29,7 @@ export type PluginModule = {\n targetInst: null | Fiber,\n nativeTarget: NativeEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n+ eventSystemFlags?: number,\n container?: null | EventTarget,\n ) => ?ReactSyntheticEvent,\n tapMoveThreshold?: number,\ndiff --git a\/packages\/legacy-events\/ResponderEventPlugin.js b\/packages\/legacy-events\/ResponderEventPlugin.js\nindex a986989c80..78bef3bbce 100644\n--- a\/packages\/legacy-events\/ResponderEventPlugin.js\n+++ b\/packages\/legacy-events\/ResponderEventPlugin.js\n@@ -10,6 +10,7 @@ import {\n hasDispatches,\n executeDispatchesInOrderStopAtTrue,\n getInstanceFromNode,\n+ getFiberCurrentPropsFromNode,\n } from '.\/EventPluginUtils';\n import ResponderSyntheticEvent from '.\/ResponderSyntheticEvent';\n import ResponderTouchHistoryStore from '.\/ResponderTouchHistoryStore';\n@@ -25,10 +26,10 @@ import {\n moveDependencies,\n endDependencies,\n } from '.\/ResponderTopLevelEventTypes';\n-import getListener from '.\/getListener';\n import accumulateInto from '.\/accumulateInto';\n import forEachAccumulated from '.\/forEachAccumulated';\n import {HostComponent} from 'react-reconciler\/src\/ReactWorkTags';\n+import invariant from 'shared\/invariant';\n \n \/**\n * Instance of element that should respond to touch\/move types of interactions,\n@@ -208,7 +209,7 @@ export function getLowestCommonAncestor(instA, instB) {\n \/**\n * Return if A is an ancestor of B.\n *\/\n-export function isAncestor(instA, instB) {\n+function isAncestor(instA, instB) {\n while (instB) {\n if (instA === instB || instA === instB.alternate) {\n return true;\n@@ -221,7 +222,7 @@ export function isAncestor(instA, instB) {\n \/**\n * Simulates the traversal of a two-phase, capture\/bubble event dispatch.\n *\/\n-export function traverseTwoPhase(inst, fn, arg) {\n+function traverseTwoPhase(inst, fn, arg) {\n const path = [];\n while (inst) {\n path.push(inst);\n@@ -236,6 +237,27 @@ export function traverseTwoPhase(inst, fn, arg) {\n }\n }\n \n+function getListener(inst, registrationName) {\n+ const stateNode = inst.stateNode;\n+ if (stateNode === null) {\n+ \/\/ Work in progress (ex: onload events in incremental mode).\n+ return null;\n+ }\n+ const props = getFiberCurrentPropsFromNode(stateNode);\n+ if (props === null) {\n+ \/\/ Work in progress.\n+ return null;\n+ }\n+ const listener = props[registrationName];\n+ invariant(\n+ !listener || typeof listener === 'function',\n+ 'Expected `%s` listener to be a function, instead got a value of `%s` type.',\n+ registrationName,\n+ typeof listener,\n+ );\n+ return listener;\n+}\n+\n function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {\n const registrationName =\n event.dispatchConfig.phasedRegistrationNames[propagationPhase];\ndiff --git a\/packages\/legacy-events\/__tests__\/ResponderEventPlugin-test.internal.js b\/packages\/legacy-events\/__tests__\/ResponderEventPlugin-test.internal.js\nindex dd3f27cbb4..8234f6144e 100644\n--- a\/packages\/legacy-events\/__tests__\/ResponderEventPlugin-test.internal.js\n+++ b\/packages\/legacy-events\/__tests__\/ResponderEventPlugin-test.internal.js\n@@ -10,7 +10,7 @@\n 'use strict';\n \n const {HostComponent} = require('react-reconciler\/src\/ReactWorkTags');\n-const {PLUGIN_EVENT_SYSTEM} = require('legacy-events\/EventSystemFlags');\n+const {PLUGIN_EVENT_SYSTEM} = require('react-dom\/src\/events\/EventSystemFlags');\n \n let EventBatching;\n let EventPluginUtils;\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\nindex 44c94a4cff..f4a8071fbf 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n@@ -62,7 +62,8 @@ describe('ReactBrowserEventEmitter', () => {\n LISTENER.mockClear();\n \n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n- EventPluginGetListener = require('legacy-events\/getListener').default;\n+ EventPluginGetListener = require('react-dom\/src\/events\/getListener')\n+ .default;\n EventPluginRegistry = require('legacy-events\/EventPluginRegistry');\n React = require('react');\n ReactDOM = require('react-dom');\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex a8dae35dc8..05b6f50ebe 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -78,7 +78,7 @@ import {\n IS_PASSIVE,\n PLUGIN_EVENT_SYSTEM,\n USE_EVENT_SYSTEM,\n-} from 'legacy-events\/EventSystemFlags';\n+} from '..\/events\/EventSystemFlags';\n import {\n isManagedDOMElement,\n isValidEventTarget,\n@@ -102,6 +102,7 @@ export type Type = string;\n export type Props = {\n autoFocus?: boolean,\n children?: mixed,\n+ disabled?: boolean,\n hidden?: boolean,\n suppressHydrationWarning?: boolean,\n dangerouslySetInnerHTML?: mixed,\ndiff --git a\/packages\/react-dom\/src\/events\/DOMLegacyEventPluginSystem.js b\/packages\/react-dom\/src\/events\/DOMLegacyEventPluginSystem.js\nindex 7a76374160..e1e554a69a 100644\n--- a\/packages\/react-dom\/src\/events\/DOMLegacyEventPluginSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMLegacyEventPluginSystem.js\n@@ -10,7 +10,7 @@\n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n import type {ElementListenerMap} from '..\/events\/DOMEventListenerMap';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {EventSystemFlags} from '.\/EventSystemFlags';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n@@ -21,10 +21,7 @@ import {\n HostComponent,\n HostText,\n } from 'react-reconciler\/src\/ReactWorkTags';\n-import {\n- IS_FIRST_ANCESTOR,\n- PLUGIN_EVENT_SYSTEM,\n-} from 'legacy-events\/EventSystemFlags';\n+import {IS_FIRST_ANCESTOR, PLUGIN_EVENT_SYSTEM} from '.\/EventSystemFlags';\n import {batchedEventUpdates} from 'legacy-events\/ReactGenericBatching';\n import {runEventsInBatch} from 'legacy-events\/EventBatching';\n import {plugins} from 'legacy-events\/EventPluginRegistry';\ndiff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex 6ad5f5e43a..2642d9f349 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -13,7 +13,7 @@ import type {\n ElementListenerMap,\n ElementListenerMapEntry,\n } from '..\/events\/DOMEventListenerMap';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {EventSystemFlags} from '.\/EventSystemFlags';\n import type {EventPriority, ReactScopeMethods} from 'shared\/ReactTypes';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n@@ -32,7 +32,7 @@ import {\n IS_REPLAYED,\n IS_TARGET_PHASE_ONLY,\n USE_EVENT_SYSTEM,\n-} from 'legacy-events\/EventSystemFlags';\n+} from '.\/EventSystemFlags';\n \n import {HostRoot, HostPortal} from 'react-reconciler\/src\/ReactWorkTags';\n \ndiff --git a\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\nindex 5ba08e378a..47eb5ca68f 100644\n--- a\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\n@@ -10,7 +10,7 @@ import {\n type EventSystemFlags,\n IS_PASSIVE,\n PASSIVE_NOT_SUPPORTED,\n-} from 'legacy-events\/EventSystemFlags';\n+} from '.\/EventSystemFlags';\n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n import {\n HostComponent,\ndiff --git a\/packages\/react-dom\/src\/events\/EnterLeaveEventPlugin.js b\/packages\/react-dom\/src\/events\/EnterLeaveEventPlugin.js\nindex 96db4908d0..3af4e2a9e1 100644\n--- a\/packages\/react-dom\/src\/events\/EnterLeaveEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/EnterLeaveEventPlugin.js\n@@ -11,7 +11,10 @@ import {\n TOP_POINTER_OUT,\n TOP_POINTER_OVER,\n } from '.\/DOMTopLevelEventTypes';\n-import {IS_REPLAYED, IS_FIRST_ANCESTOR} from 'legacy-events\/EventSystemFlags';\n+import {\n+ IS_REPLAYED,\n+ IS_FIRST_ANCESTOR,\n+} from 'react-dom\/src\/events\/EventSystemFlags';\n import SyntheticMouseEvent from '.\/SyntheticMouseEvent';\n import SyntheticPointerEvent from '.\/SyntheticPointerEvent';\n import {\ndiff --git a\/packages\/react-dom\/src\/events\/EventSystemFlags.js b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\nindex e31af6bae3..585519c117 100644\n--- a\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n+++ b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n@@ -11,10 +11,10 @@ export type EventSystemFlags = number;\n \n export const PLUGIN_EVENT_SYSTEM = 1;\n export const RESPONDER_EVENT_SYSTEM = 1 << 1;\n-export const IS_PASSIVE = 1 << 2;\n-export const IS_ACTIVE = 1 << 3;\n-export const PASSIVE_NOT_SUPPORTED = 1 << 4;\n-export const IS_REPLAYED = 1 << 5;\n-export const IS_FIRST_ANCESTOR = 1 << 6;\n-export const IS_TARGET_EVENT_ONLY = 1 << 7;\n+export const USE_EVENT_SYSTEM = 1 << 2;\n+export const IS_TARGET_PHASE_ONLY = 1 << 3;\n+export const IS_PASSIVE = 1 << 4;\n+export const PASSIVE_NOT_SUPPORTED = 1 << 5;\n+export const IS_REPLAYED = 1 << 6;\n+export const IS_FIRST_ANCESTOR = 1 << 7;\n export const LEGACY_FB_SUPPORT = 1 << 8;\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\nindex 4b1bfd3830..2d6e5c3296 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n@@ -42,7 +42,7 @@ import {\n RESPONDER_EVENT_SYSTEM,\n IS_PASSIVE,\n PASSIVE_NOT_SUPPORTED,\n-} from 'legacy-events\/EventSystemFlags';\n+} from '.\/EventSystemFlags';\n \n import {\n addEventBubbleListener,\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\nindex 9e39586ecf..b45fe37d8b 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n@@ -11,7 +11,7 @@ import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n import type {Container, SuspenseInstance} from '..\/client\/ReactDOMHostConfig';\n import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n import type {ElementListenerMap} from '..\/events\/DOMEventListenerMap';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {EventSystemFlags} from '.\/EventSystemFlags';\n import type {FiberRoot} from 'react-reconciler\/src\/ReactFiberRoot';\n \n import {\n@@ -118,7 +118,7 @@ import {\n TOP_FOCUS,\n TOP_BLUR,\n } from '.\/DOMTopLevelEventTypes';\n-import {IS_REPLAYED, PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n+import {IS_REPLAYED, PLUGIN_EVENT_SYSTEM} from '.\/EventSystemFlags';\n import {legacyListenToTopLevelEvent} from '.\/DOMLegacyEventPluginSystem';\n import {listenToTopLevelEvent} from '.\/DOMModernPluginEventSystem';\n \ndiff --git a\/packages\/react-dom\/src\/events\/SimpleEventPlugin.js b\/packages\/react-dom\/src\/events\/SimpleEventPlugin.js\nindex f394c3dc75..b9e7528af9 100644\n--- a\/packages\/react-dom\/src\/events\/SimpleEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/SimpleEventPlugin.js\n@@ -14,10 +14,10 @@ import type {\n import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {EventSystemFlags} from '.\/EventSystemFlags';\n \n import SyntheticEvent from 'legacy-events\/SyntheticEvent';\n-import {IS_TARGET_PHASE_ONLY} from 'legacy-events\/EventSystemFlags';\n+import {IS_TARGET_PHASE_ONLY} from '.\/EventSystemFlags';\n \n import * as DOMTopLevelEventTypes from '.\/DOMTopLevelEventTypes';\n import {\n@@ -86,7 +86,7 @@ const SimpleEventPlugin: PluginModule = {\n targetInst: null | Fiber,\n nativeEvent: MouseEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n+ eventSystemFlags?: EventSystemFlags,\n targetContainer?: null | EventTarget,\n ): null | ReactSyntheticEvent {\n const dispatchConfig = topLevelEventsToDispatchConfig.get(topLevelType);\ndiff --git a\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js b\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js\nindex 80d1f3484c..58a55fc9b4 100644\n--- a\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js\n+++ b\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js\n@@ -10,8 +10,8 @@\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n \n-import getListener from 'legacy-events\/getListener';\n import {HostComponent} from 'react-reconciler\/src\/ReactWorkTags';\n+import getListener from '.\/getListener';\n \n function getParent(inst: Fiber | null): Fiber | null {\n if (inst === null) {\ndiff --git a\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js b\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js\nindex 30237bf0a0..cc2ecc96c5 100644\n--- a\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js\n+++ b\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js\n@@ -20,7 +20,7 @@ import {\n enableModernEventSystem,\n } from 'shared\/ReactFeatureFlags';\n \n-import getListener from 'legacy-events\/getListener';\n+import getListener from '.\/getListener';\n import {getListenersFromTarget} from '..\/client\/ReactDOMComponentTree';\n import {reactScopeListenerStore} from '.\/DOMModernPluginEventSystem';\n \ndiff --git a\/packages\/legacy-events\/getListener.js b\/packages\/react-dom\/src\/events\/getListener.js\nsimilarity index 78%\nrename from packages\/legacy-events\/getListener.js\nrename to packages\/react-dom\/src\/events\/getListener.js\nindex 5be8ccceaf..3cdbd55184 100644\n--- a\/packages\/legacy-events\/getListener.js\n+++ b\/packages\/react-dom\/src\/events\/getListener.js\n@@ -7,12 +7,12 @@\n *\/\n \n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+import type {Props} from '..\/client\/ReactDOMHostConfig';\n \n import invariant from 'shared\/invariant';\n+import {getFiberCurrentPropsFromNode} from '..\/client\/ReactDOMComponentTree';\n \n-import {getFiberCurrentPropsFromNode} from '.\/EventPluginUtils';\n-\n-function isInteractive(tag) {\n+function isInteractive(tag: string): boolean {\n return (\n tag === 'button' ||\n tag === 'input' ||\n@@ -21,7 +21,11 @@ function isInteractive(tag) {\n );\n }\n \n-function shouldPreventMouseEvent(name, type, props) {\n+function shouldPreventMouseEvent(\n+ name: string,\n+ type: string,\n+ props: Props,\n+): boolean {\n switch (name) {\n case 'onClick':\n case 'onClickCapture':\n@@ -45,16 +49,17 @@ function shouldPreventMouseEvent(name, type, props) {\n * @param {string} registrationName Name of listener (e.g. `onClick`).\n * @return {?function} The stored callback.\n *\/\n-export default function getListener(inst: Fiber, registrationName: string) {\n- \/\/ TODO: shouldPreventMouseEvent is DOM-specific and definitely should not\n- \/\/ live here; needs to be moved to a better place soon\n+export default function getListener(\n+ inst: Fiber,\n+ registrationName: string,\n+): Function | null {\n const stateNode = inst.stateNode;\n- if (!stateNode) {\n+ if (stateNode === null) {\n \/\/ Work in progress (ex: onload events in incremental mode).\n return null;\n }\n const props = getFiberCurrentPropsFromNode(stateNode);\n- if (!props) {\n+ if (props === null) {\n \/\/ Work in progress.\n return null;\n }\ndiff --git a\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js b\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\nindex 2ce109de9f..c03100c689 100644\n--- a\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\n+++ b\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\n@@ -19,7 +19,6 @@ import SyntheticEvent from 'legacy-events\/SyntheticEvent';\n import invariant from 'shared\/invariant';\n import {ELEMENT_NODE} from '..\/shared\/HTMLNodeType';\n import * as DOMTopLevelEventTypes from '..\/events\/DOMTopLevelEventTypes';\n-import {PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n import act from '.\/ReactTestUtilsAct';\n import forEachAccumulated from 'legacy-events\/forEachAccumulated';\n import accumulateInto from 'legacy-events\/accumulateInto';\n@@ -62,6 +61,7 @@ let hasWarnedAboutDeprecatedMockComponent = false;\n *\/\n function simulateNativeEventOnNode(topLevelType, node, fakeNativeEvent) {\n fakeNativeEvent.target = node;\n+ const PLUGIN_EVENT_SYSTEM = 1;\n dispatchEvent(topLevelType, PLUGIN_EVENT_SYSTEM, null, fakeNativeEvent);\n }\n \ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js b\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\nindex 0804f37c4b..9152544c50 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\n@@ -8,19 +8,17 @@\n *\/\n \n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n \n-import {PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n import {registrationNameModules} from 'legacy-events\/EventPluginRegistry';\n import {batchedUpdates} from 'legacy-events\/ReactGenericBatching';\n import accumulateInto from 'legacy-events\/accumulateInto';\n \n import {plugins} from 'legacy-events\/EventPluginRegistry';\n-import getListener from 'legacy-events\/getListener';\n+import getListener from '.\/ReactNativeGetListener';\n import {runEventsInBatch} from 'legacy-events\/EventBatching';\n \n export {getListener, registrationNameModules as registrationNames};\n@@ -37,7 +35,6 @@ function extractPluginEvents(\n targetInst: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n ): Array | ReactSyntheticEvent | null {\n let events = null;\n for (let i = 0; i < plugins.length; i++) {\n@@ -49,7 +46,6 @@ function extractPluginEvents(\n targetInst,\n nativeEvent,\n nativeEventTarget,\n- eventSystemFlags,\n );\n if (extractedEvents) {\n events = accumulateInto(events, extractedEvents);\n@@ -64,14 +60,12 @@ function runExtractedPluginEventsInBatch(\n targetInst: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n ) {\n const events = extractPluginEvents(\n topLevelType,\n targetInst,\n nativeEvent,\n nativeEventTarget,\n- eventSystemFlags,\n );\n runEventsInBatch(events);\n }\n@@ -99,7 +93,6 @@ export function dispatchEvent(\n targetFiber,\n nativeEvent,\n eventTarget,\n- PLUGIN_EVENT_SYSTEM,\n );\n });\n \/\/ React Native doesn't use ReactControlledComponent but if it did, here's\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js b\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\nindex 5e2c768db9..f64355b26e 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\n@@ -8,7 +8,6 @@\n *\/\n \n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n import SyntheticEvent from 'legacy-events\/SyntheticEvent';\n import invariant from 'shared\/invariant';\n@@ -16,7 +15,7 @@ import invariant from 'shared\/invariant';\n \/\/ Module provided by RN:\n import {ReactNativeViewConfigRegistry} from 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface';\n import accumulateInto from 'legacy-events\/accumulateInto';\n-import getListener from 'legacy-events\/getListener';\n+import getListener from '.\/ReactNativeGetListener';\n import forEachAccumulated from 'legacy-events\/forEachAccumulated';\n import {HostComponent} from 'react-reconciler\/src\/ReactWorkTags';\n \n@@ -142,7 +141,6 @@ const ReactNativeBridgeEventPlugin = {\n targetInst: null | Object,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | Object,\n- eventSystemFlags: EventSystemFlags,\n ): ?Object {\n if (targetInst == null) {\n \/\/ Probably a node belonging to another renderer's tree.\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js b\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\nindex ae7f8e8927..eef66ce4ea 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\n@@ -8,18 +8,16 @@\n *\/\n \n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n \n-import {PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n import {registrationNameModules} from 'legacy-events\/EventPluginRegistry';\n import {batchedUpdates} from 'legacy-events\/ReactGenericBatching';\n import {runEventsInBatch} from 'legacy-events\/EventBatching';\n import {plugins} from 'legacy-events\/EventPluginRegistry';\n-import getListener from 'legacy-events\/getListener';\n+import getListener from '.\/ReactNativeGetListener';\n import accumulateInto from 'legacy-events\/accumulateInto';\n \n import {getInstanceFromNode} from '.\/ReactNativeComponentTree';\n@@ -108,13 +106,7 @@ function _receiveRootNodeIDEvent(\n }\n \n batchedUpdates(function() {\n- runExtractedPluginEventsInBatch(\n- topLevelType,\n- inst,\n- nativeEvent,\n- target,\n- PLUGIN_EVENT_SYSTEM,\n- );\n+ runExtractedPluginEventsInBatch(topLevelType, inst, nativeEvent, target);\n });\n \/\/ React Native doesn't use ReactControlledComponent but if it did, here's\n \/\/ where it would do it.\n@@ -132,7 +124,6 @@ function extractPluginEvents(\n targetInst: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n ): Array | ReactSyntheticEvent | null {\n let events = null;\n for (let i = 0; i < plugins.length; i++) {\n@@ -144,7 +135,6 @@ function extractPluginEvents(\n targetInst,\n nativeEvent,\n nativeEventTarget,\n- eventSystemFlags,\n );\n if (extractedEvents) {\n events = accumulateInto(events, extractedEvents);\n@@ -159,14 +149,12 @@ function runExtractedPluginEventsInBatch(\n targetInst: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n ) {\n const events = extractPluginEvents(\n topLevelType,\n targetInst,\n nativeEvent,\n nativeEventTarget,\n- eventSystemFlags,\n );\n runEventsInBatch(events);\n }\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeGetListener.js b\/packages\/react-native-renderer\/src\/ReactNativeGetListener.js\nnew file mode 100644\nindex 0000000000..c07392faf9\n--- \/dev\/null\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeGetListener.js\n@@ -0,0 +1,36 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ * @flow\n+ *\/\n+\n+import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+\n+import invariant from 'shared\/invariant';\n+import {getFiberCurrentPropsFromNode} from 'legacy-events\/EventPluginUtils';\n+\n+export default function getListener(\n+ inst: Fiber,\n+ registrationName: string,\n+): Function | null {\n+ const stateNode = inst.stateNode;\n+ if (stateNode === null) {\n+ \/\/ Work in progress (ex: onload events in incremental mode).\n+ return null;\n+ }\n+ const props = getFiberCurrentPropsFromNode(stateNode);\n+ if (props === null) {\n+ \/\/ Work in progress.\n+ return null;\n+ }\n+ const listener = props[registrationName];\n+ invariant(\n+ !listener || typeof listener === 'function',\n+ 'Expected `%s` listener to be a function, instead got a value of `%s` type.',\n+ registrationName,\n+ typeof listener,\n+ );\n+ return listener;\n+}\n","body":"","files":[{"path":"packages\/legacy-events\/EventSystemFlags.js","status":"D"},{"path":"packages\/legacy-events\/PluginModuleType.js","status":"M"},{"path":"packages\/legacy-events\/ResponderEventPlugin.js","status":"M"},{"path":"packages\/legacy-events\/__tests__\/ResponderEventPlugin-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMLegacyEventPluginSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/EnterLeaveEventPlugin.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/EventSystemFlags.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventListener.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/SimpleEventPlugin.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/getListener.js","status":"R078","previousPath":"packages\/legacy-events\/getListener.js"},{"path":"packages\/react-dom\/src\/test-utils\/ReactTestUtils.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeGetListener.js","status":"A"}]}

dillon1000/react

Files changed