{"body":"","parents":["a2b4db05bc8ac1ff92ed914008260875e4c11284"],"files":[{"path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMEventHandle.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/EventSystemFlags.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/PluginModuleType.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/legacy-events\/EventPluginRegistry.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/legacy-events\/PluginModuleType.js","status":"M"}],"commit":{"shortRevision":"61dd00db24","revision":"61dd00db24bec6305bd72908d3617b9f2a5183da","subject":"Extract some of the tidy up changes from 19278 (#19315)","authorName":"Dominic Gannaway","authoredAt":"2020-07-10T22:33:42+01:00","authorEmail":"trueadm@users.noreply.github.com"},"patch":"diff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex 71a90cd3e6..acd4c4a4d9 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -85,7 +85,7 @@ import {\n enableDeprecatedFlareAPI,\n enableTrustedTypesIntegration,\n } from 'shared\/ReactFeatureFlags';\n-import {listenToReactPropEvent} from '..\/events\/DOMModernPluginEventSystem';\n+import {listenToReactEvent} from '..\/events\/DOMModernPluginEventSystem';\n import {getEventListenerMap} from '.\/ReactDOMComponentTree';\n \n let didWarnInvalidHydration = false;\n@@ -282,10 +282,7 @@ export function ensureListeningTo(\n 'ensureListeningTo(): received a container that was not an element node. ' +\n 'This is likely a bug in React.',\n );\n- listenToReactPropEvent(\n- reactPropEvent,\n- ((rootContainerElement: any): Element),\n- );\n+ listenToReactEvent(reactPropEvent, ((rootContainerElement: any): Element));\n }\n \n function getOwnerDocumentFromRootContainer(\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js b\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\nindex 3118d85c1e..9312c19bb3 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\n@@ -24,14 +24,14 @@ import {\n } from '.\/ReactDOMComponentTree';\n import {ELEMENT_NODE} from '..\/shared\/HTMLNodeType';\n import {\n- listenToTopLevelEvent,\n+ listenToNativeEvent,\n addEventTypeToDispatchConfig,\n } from '..\/events\/DOMModernPluginEventSystem';\n \n import {HostRoot, HostPortal} from 'react-reconciler\/src\/ReactWorkTags';\n import {\n PLUGIN_EVENT_SYSTEM,\n- IS_TARGET_PHASE_ONLY,\n+ IS_EVENT_HANDLE_NON_MANAGED_NODE,\n } from '..\/events\/EventSystemFlags';\n \n import {\n@@ -71,12 +71,12 @@ function isReactScope(target: EventTarget | ReactScopeInstance): boolean {\n \n function createEventHandleListener(\n type: DOMTopLevelEventType,\n- capture: boolean,\n+ isCapturePhaseListener: boolean,\n callback: (SyntheticEvent) => void,\n ): ReactDOMEventHandleListener {\n return {\n callback,\n- capture,\n+ capture: isCapturePhaseListener,\n type,\n };\n }\n@@ -84,9 +84,9 @@ function createEventHandleListener(\n function registerEventOnNearestTargetContainer(\n targetFiber: Fiber,\n topLevelType: DOMTopLevelEventType,\n- passive: boolean | void,\n- priority: EventPriority | void,\n- capture: boolean,\n+ isPassiveListener: boolean | void,\n+ listenerPriority: EventPriority | void,\n+ isCapturePhaseListener: boolean,\n ): void {\n \/\/ If it is, find the nearest root or portal and make it\n \/\/ our event handle target container.\n@@ -99,23 +99,23 @@ function registerEventOnNearestTargetContainer(\n );\n }\n const listenerMap = getEventListenerMap(targetContainer);\n- listenToTopLevelEvent(\n+ listenToNativeEvent(\n topLevelType,\n targetContainer,\n listenerMap,\n PLUGIN_EVENT_SYSTEM,\n- capture,\n- passive,\n- priority,\n+ isCapturePhaseListener,\n+ isPassiveListener,\n+ listenerPriority,\n );\n }\n \n function registerReactDOMEvent(\n target: EventTarget | ReactScopeInstance,\n topLevelType: DOMTopLevelEventType,\n- passive: boolean | void,\n- capture: boolean,\n- priority: EventPriority | void,\n+ isPassiveListener: boolean | void,\n+ isCapturePhaseListener: boolean,\n+ listenerPriority: EventPriority | void,\n ): void {\n \/\/ Check if the target is a DOM element.\n if ((target: any).nodeType === ELEMENT_NODE) {\n@@ -132,9 +132,9 @@ function registerReactDOMEvent(\n registerEventOnNearestTargetContainer(\n targetFiber,\n topLevelType,\n- passive,\n- priority,\n- capture,\n+ isPassiveListener,\n+ listenerPriority,\n+ isCapturePhaseListener,\n );\n } else if (enableScopeAPI && isReactScope(target)) {\n const scopeTarget = ((target: any): ReactScopeInstance);\n@@ -146,21 +146,21 @@ function registerReactDOMEvent(\n registerEventOnNearestTargetContainer(\n targetFiber,\n topLevelType,\n- passive,\n- priority,\n- capture,\n+ isPassiveListener,\n+ listenerPriority,\n+ isCapturePhaseListener,\n );\n } else if (isValidEventTarget(target)) {\n const eventTarget = ((target: any): EventTarget);\n const listenerMap = getEventListenerMap(eventTarget);\n- listenToTopLevelEvent(\n+ listenToNativeEvent(\n topLevelType,\n eventTarget,\n listenerMap,\n- PLUGIN_EVENT_SYSTEM | IS_TARGET_PHASE_ONLY,\n- capture,\n- passive,\n- priority,\n+ PLUGIN_EVENT_SYSTEM | IS_EVENT_HANDLE_NON_MANAGED_NODE,\n+ isCapturePhaseListener,\n+ isPassiveListener,\n+ listenerPriority,\n );\n } else {\n invariant(\n@@ -177,9 +177,9 @@ export function createEventHandle(\n ): ReactDOMEventHandle {\n if (enableCreateEventHandleAPI) {\n const topLevelType = ((type: any): DOMTopLevelEventType);\n- let capture = false;\n- let passive = undefined; \/\/ Undefined means to use the browser default\n- let priority;\n+ let isCapturePhaseListener = false;\n+ let isPassiveListener = undefined; \/\/ Undefined means to use the browser default\n+ let listenerPriority;\n \n if (options != null) {\n const optionsCapture = options.capture;\n@@ -187,17 +187,17 @@ export function createEventHandle(\n const optionsPriority = options.priority;\n \n if (typeof optionsCapture === 'boolean') {\n- capture = optionsCapture;\n+ isCapturePhaseListener = optionsCapture;\n }\n if (typeof optionsPassive === 'boolean') {\n- passive = optionsPassive;\n+ isPassiveListener = optionsPassive;\n }\n if (typeof optionsPriority === 'number') {\n- priority = optionsPriority;\n+ listenerPriority = optionsPriority;\n }\n }\n- if (priority === undefined) {\n- priority = getEventPriorityForListenerSystem(topLevelType);\n+ if (listenerPriority === undefined) {\n+ listenerPriority = getEventPriorityForListenerSystem(topLevelType);\n }\n \n const registeredReactDOMEvents = new PossiblyWeakSet();\n@@ -213,13 +213,19 @@ export function createEventHandle(\n );\n if (!registeredReactDOMEvents.has(target)) {\n registeredReactDOMEvents.add(target);\n- registerReactDOMEvent(target, topLevelType, passive, capture, priority);\n+ registerReactDOMEvent(\n+ target,\n+ topLevelType,\n+ isPassiveListener,\n+ isCapturePhaseListener,\n+ listenerPriority,\n+ );\n \/\/ Add the event to our known event types list.\n addEventTypeToDispatchConfig(topLevelType);\n }\n const listener = createEventHandleListener(\n topLevelType,\n- capture,\n+ isCapturePhaseListener,\n callback,\n );\n let targetListeners = getEventHandlerListeners(target);\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex a06abe7614..3aaf0b577c 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -80,7 +80,7 @@ import {\n } from 'shared\/ReactFeatureFlags';\n import {HostComponent, HostText} from 'react-reconciler\/src\/ReactWorkTags';\n import {TOP_BEFORE_BLUR, TOP_AFTER_BLUR} from '..\/events\/DOMTopLevelEventTypes';\n-import {listenToReactPropEvent} from '..\/events\/DOMModernPluginEventSystem';\n+import {listenToReactEvent} from '..\/events\/DOMModernPluginEventSystem';\n \n export type Type = string;\n export type Props = {\n@@ -1111,7 +1111,7 @@ export function makeOpaqueHydratingObject(\n }\n \n export function preparePortalMount(portalInstance: Instance): void {\n- listenToReactPropEvent('onMouseEnter', portalInstance);\n+ listenToReactEvent('onMouseEnter', portalInstance);\n }\n \n export function prepareScopeUpdate(\ndiff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex f6100d8a38..e41072dec4 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -9,13 +9,7 @@\n \n import type {TopLevelType, DOMTopLevelEventType} from '.\/TopLevelEventTypes';\n import type {EventSystemFlags} from '.\/EventSystemFlags';\n-import type {\n- AnyNativeEvent,\n- DispatchQueue,\n- DispatchQueueItem,\n- DispatchQueueItemPhase,\n- DispatchQueueItemPhaseEntry,\n-} from '.\/PluginModuleType';\n+import type {AnyNativeEvent} from '.\/PluginModuleType';\n import type {ReactSyntheticEvent} from '.\/ReactSyntheticEventType';\n import type {\n ElementListenerMap,\n@@ -30,7 +24,7 @@ import {\n LEGACY_FB_SUPPORT,\n IS_REPLAYED,\n IS_CAPTURE_PHASE,\n- IS_TARGET_PHASE_ONLY,\n+ IS_EVENT_HANDLE_NON_MANAGED_NODE,\n } from '.\/EventSystemFlags';\n \n import {\n@@ -115,6 +109,19 @@ import * as ModernEnterLeaveEventPlugin from '.\/plugins\/ModernEnterLeaveEventPlu\n import * as ModernSelectEventPlugin from '.\/plugins\/ModernSelectEventPlugin';\n import * as ModernSimpleEventPlugin from '.\/plugins\/ModernSimpleEventPlugin';\n \n+type DispatchListener = {|\n+ instance: null | Fiber,\n+ listener: Function,\n+ currentTarget: EventTarget,\n+|};\n+\n+type DispatchEntry = {|\n+ event: ReactSyntheticEvent,\n+ listeners: Array,\n+|};\n+\n+export type DispatchQueue = Array;\n+\n \/\/ TODO: remove top-level side effect.\n ModernSimpleEventPlugin.registerEvents();\n ModernEnterLeaveEventPlugin.registerEvents();\n@@ -129,7 +136,7 @@ function extractEvents(\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n eventSystemFlags: EventSystemFlags,\n- targetContainer: null | EventTarget,\n+ targetContainer: EventTarget,\n ) {\n \/\/ TODO: we should remove the concept of a \"SimpleEventPlugin\".\n \/\/ This is the basic functionality of the event system. All\n@@ -259,13 +266,13 @@ function executeDispatch(\n \n function processDispatchQueueItemsInOrder(\n event: ReactSyntheticEvent,\n- phase: DispatchQueueItemPhase,\n+ dispatchListeners: Array,\n inCapturePhase: boolean,\n ): void {\n let previousInstance;\n if (inCapturePhase) {\n- for (let i = phase.length - 1; i >= 0; i--) {\n- const {instance, currentTarget, listener} = phase[i];\n+ for (let i = dispatchListeners.length - 1; i >= 0; i--) {\n+ const {instance, currentTarget, listener} = dispatchListeners[i];\n if (instance !== previousInstance && event.isPropagationStopped()) {\n return;\n }\n@@ -273,8 +280,8 @@ function processDispatchQueueItemsInOrder(\n previousInstance = instance;\n }\n } else {\n- for (let i = 0; i < phase.length; i++) {\n- const {instance, currentTarget, listener} = phase[i];\n+ for (let i = 0; i < dispatchListeners.length; i++) {\n+ const {instance, currentTarget, listener} = dispatchListeners[i];\n if (instance !== previousInstance && event.isPropagationStopped()) {\n return;\n }\n@@ -290,9 +297,8 @@ export function processDispatchQueue(\n ): void {\n const inCapturePhase = (eventSystemFlags & IS_CAPTURE_PHASE) !== 0;\n for (let i = 0; i < dispatchQueue.length; i++) {\n- const dispatchQueueItem: DispatchQueueItem = dispatchQueue[i];\n- const {event, phase} = dispatchQueueItem;\n- processDispatchQueueItemsInOrder(event, phase, inCapturePhase);\n+ const {event, listeners} = dispatchQueue[i];\n+ processDispatchQueueItemsInOrder(event, listeners, inCapturePhase);\n \/\/ Modern event system doesn't use pooling.\n }\n \/\/ This would be a good time to rethrow if any of the event handlers threw.\n@@ -329,13 +335,13 @@ function shouldUpgradeListener(\n );\n }\n \n-export function listenToTopLevelEvent(\n+export function listenToNativeEvent(\n topLevelType: DOMTopLevelEventType,\n target: EventTarget,\n listenerMap: ElementListenerMap,\n eventSystemFlags: EventSystemFlags,\n- capture: boolean,\n- passive?: boolean,\n+ isCapturePhaseListener: boolean,\n+ isPassiveListener?: boolean,\n priority?: EventPriority,\n ): void {\n \/\/ TOP_SELECTION_CHANGE needs to be attached to the document\n@@ -345,11 +351,14 @@ export function listenToTopLevelEvent(\n target = (target: any).ownerDocument || target;\n listenerMap = getEventListenerMap(target);\n }\n- const listenerMapKey = getListenerMapKey(topLevelType, capture);\n+ const listenerMapKey = getListenerMapKey(\n+ topLevelType,\n+ isCapturePhaseListener,\n+ );\n const listenerEntry = ((listenerMap.get(\n listenerMapKey,\n ): any): ElementListenerMapEntry | void);\n- const shouldUpgrade = shouldUpgradeListener(listenerEntry, passive);\n+ const shouldUpgrade = shouldUpgradeListener(listenerEntry, isPassiveListener);\n \n \/\/ If the listener entry is empty or we should upgrade, then\n \/\/ we need to trap an event listener onto the target.\n@@ -360,23 +369,23 @@ export function listenToTopLevelEvent(\n removeTrappedEventListener(\n target,\n topLevelType,\n- capture,\n+ isCapturePhaseListener,\n ((listenerEntry: any): ElementListenerMapEntry).listener,\n );\n }\n- if (capture) {\n+ if (isCapturePhaseListener) {\n eventSystemFlags |= IS_CAPTURE_PHASE;\n }\n const listener = addTrappedEventListener(\n target,\n topLevelType,\n eventSystemFlags,\n- capture,\n+ isCapturePhaseListener,\n false,\n- passive,\n+ isPassiveListener,\n priority,\n );\n- listenerMap.set(listenerMapKey, {passive, listener});\n+ listenerMap.set(listenerMapKey, {passive: isPassiveListener, listener});\n }\n }\n \n@@ -385,7 +394,7 @@ function isCaptureRegistrationName(registrationName: string): boolean {\n return registrationName.substr(len - 7) === 'Capture';\n }\n \n-export function listenToReactPropEvent(\n+export function listenToReactEvent(\n reactPropEvent: string,\n rootContainerElement: Element,\n ): void {\n@@ -412,7 +421,7 @@ export function listenToReactPropEvent(\n const dependency = dependencies[i];\n const capture =\n capturePhaseEvents.has(dependency) || registrationCapturePhase;\n- listenToTopLevelEvent(\n+ listenToNativeEvent(\n dependency,\n rootContainerElement,\n listenerMap,\n@@ -426,21 +435,21 @@ function addTrappedEventListener(\n targetContainer: EventTarget,\n topLevelType: DOMTopLevelEventType,\n eventSystemFlags: EventSystemFlags,\n- capture: boolean,\n+ isCapturePhaseListener: boolean,\n isDeferredListenerForLegacyFBSupport?: boolean,\n- passive?: boolean,\n- priority?: EventPriority,\n+ isPassiveListener?: boolean,\n+ listenerPriority?: EventPriority,\n ): any => void {\n let listener = createEventListenerWrapperWithPriority(\n targetContainer,\n topLevelType,\n eventSystemFlags,\n- priority,\n+ listenerPriority,\n );\n \/\/ If passive option is not supported, then the event will be\n \/\/ active and not passive.\n- if (passive === true && !passiveBrowserEventsSupported) {\n- passive = false;\n+ if (isPassiveListener === true && !passiveBrowserEventsSupported) {\n+ isPassiveListener = false;\n }\n \n targetContainer =\n@@ -472,18 +481,18 @@ function addTrappedEventListener(\n targetContainer,\n rawEventName,\n unsubscribeListener,\n- capture,\n+ isCapturePhaseListener,\n );\n }\n };\n }\n- if (capture) {\n- if (enableCreateEventHandleAPI && passive !== undefined) {\n+ if (isCapturePhaseListener) {\n+ if (enableCreateEventHandleAPI && isPassiveListener !== undefined) {\n unsubscribeListener = addEventCaptureListenerWithPassiveFlag(\n targetContainer,\n rawEventName,\n listener,\n- passive,\n+ isPassiveListener,\n );\n } else {\n unsubscribeListener = addEventCaptureListener(\n@@ -493,12 +502,12 @@ function addTrappedEventListener(\n );\n }\n } else {\n- if (enableCreateEventHandleAPI && passive !== undefined) {\n+ if (enableCreateEventHandleAPI && isPassiveListener !== undefined) {\n unsubscribeListener = addEventBubbleListenerWithPassiveFlag(\n targetContainer,\n rawEventName,\n listener,\n- passive,\n+ isPassiveListener,\n );\n } else {\n unsubscribeListener = addEventBubbleListener(\n@@ -551,7 +560,7 @@ export function dispatchEventForPluginEventSystem(\n targetContainer: EventTarget,\n ): void {\n let ancestorInst = targetInst;\n- if (eventSystemFlags & IS_TARGET_PHASE_ONLY) {\n+ if (eventSystemFlags & IS_EVENT_HANDLE_NON_MANAGED_NODE) {\n \/\/ For TargetEvent nodes (i.e. document, window)\n ancestorInst = null;\n } else {\n@@ -655,11 +664,11 @@ export function dispatchEventForPluginEventSystem(\n );\n }\n \n-function createDispatchQueueItemPhaseEntry(\n+function createDispatchListener(\n instance: null | Fiber,\n listener: Function,\n currentTarget: EventTarget,\n-): DispatchQueueItemPhaseEntry {\n+): DispatchListener {\n return {\n instance,\n listener,\n@@ -667,13 +676,13 @@ function createDispatchQueueItemPhaseEntry(\n };\n }\n \n-function createDispatchQueueItem(\n+function createDispatchEntry(\n event: ReactSyntheticEvent,\n- phase: DispatchQueueItemPhase,\n-): DispatchQueueItem {\n+ listeners: Array,\n+): DispatchEntry {\n return {\n event,\n- phase,\n+ listeners,\n };\n }\n \n@@ -685,7 +694,7 @@ export function accumulateSinglePhaseListeners(\n ): void {\n const bubbled = event._reactName;\n const captured = bubbled !== null ? bubbled + 'Capture' : null;\n- const phase: DispatchQueueItemPhase = [];\n+ const listeners: Array = [];\n \n \/\/ If we are not handling EventTarget only phase, then we're doing the\n \/\/ usual two phase accumulation using the React fiber tree to pick up\n@@ -708,32 +717,31 @@ export function accumulateSinglePhaseListeners(\n lastHostComponent = currentTarget;\n \/\/ For Event Handle listeners\n if (enableCreateEventHandleAPI) {\n- const listeners = getEventHandlerListeners(currentTarget);\n+ const eventHandlerlisteners = getEventHandlerListeners(currentTarget);\n \n- if (listeners !== null) {\n- const listenersArr = Array.from(listeners);\n- for (let i = 0; i < listenersArr.length; i++) {\n- const listener = listenersArr[i];\n- const {callback, capture, type} = listener;\n+ if (eventHandlerlisteners !== null) {\n+ const eventHandlerlistenersArr = Array.from(eventHandlerlisteners);\n+ for (let i = 0; i < eventHandlerlistenersArr.length; i++) {\n+ const {\n+ callback,\n+ capture: isCapturePhaseListener,\n+ type,\n+ } = eventHandlerlistenersArr[i];\n if (type === targetType) {\n- if (capture && inCapturePhase) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- callback,\n- currentTarget,\n- ),\n+ if (isCapturePhaseListener && inCapturePhase) {\n+ listeners.push(\n+ createDispatchListener(instance, callback, currentTarget),\n );\n- } else if (!capture) {\n- const entry = createDispatchQueueItemPhaseEntry(\n+ } else if (!isCapturePhaseListener) {\n+ const entry = createDispatchListener(\n instance,\n callback,\n currentTarget,\n );\n if (shouldEmulateTwoPhase) {\n- phase.unshift(entry);\n+ listeners.unshift(entry);\n } else if (!inCapturePhase) {\n- phase.push(entry);\n+ listeners.push(entry);\n }\n }\n }\n@@ -744,27 +752,23 @@ export function accumulateSinglePhaseListeners(\n if (captured !== null && inCapturePhase) {\n const captureListener = getListener(instance, captured);\n if (captureListener != null) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- captureListener,\n- currentTarget,\n- ),\n+ listeners.push(\n+ createDispatchListener(instance, captureListener, currentTarget),\n );\n }\n }\n if (bubbled !== null) {\n const bubbleListener = getListener(instance, bubbled);\n if (bubbleListener != null) {\n- const entry = createDispatchQueueItemPhaseEntry(\n+ const entry = createDispatchListener(\n instance,\n bubbleListener,\n currentTarget,\n );\n if (shouldEmulateTwoPhase) {\n- phase.unshift(entry);\n+ listeners.unshift(entry);\n } else if (!inCapturePhase) {\n- phase.push(entry);\n+ listeners.push(entry);\n }\n }\n }\n@@ -775,33 +779,34 @@ export function accumulateSinglePhaseListeners(\n lastHostComponent !== null\n ) {\n const reactScopeInstance = stateNode;\n- const listeners = getEventHandlerListeners(reactScopeInstance);\n+ const eventHandlerlisteners = getEventHandlerListeners(\n+ reactScopeInstance,\n+ );\n const lastCurrentTarget = ((lastHostComponent: any): Element);\n \n- if (listeners !== null) {\n- const listenersArr = Array.from(listeners);\n- for (let i = 0; i < listenersArr.length; i++) {\n- const listener = listenersArr[i];\n- const {callback, capture, type} = listener;\n+ if (eventHandlerlisteners !== null) {\n+ const eventHandlerlistenersArr = Array.from(eventHandlerlisteners);\n+ for (let i = 0; i < eventHandlerlistenersArr.length; i++) {\n+ const {\n+ callback,\n+ capture: isCapturePhaseListener,\n+ type,\n+ } = eventHandlerlistenersArr[i];\n if (type === targetType) {\n- if (capture && inCapturePhase) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- callback,\n- lastCurrentTarget,\n- ),\n+ if (isCapturePhaseListener && inCapturePhase) {\n+ listeners.push(\n+ createDispatchListener(instance, callback, lastCurrentTarget),\n );\n- } else if (!capture) {\n- const entry = createDispatchQueueItemPhaseEntry(\n+ } else if (!isCapturePhaseListener) {\n+ const entry = createDispatchListener(\n instance,\n callback,\n lastCurrentTarget,\n );\n if (shouldEmulateTwoPhase) {\n- phase.unshift(entry);\n+ listeners.unshift(entry);\n } else if (!inCapturePhase) {\n- phase.push(entry);\n+ listeners.push(entry);\n }\n }\n }\n@@ -810,8 +815,8 @@ export function accumulateSinglePhaseListeners(\n }\n instance = instance.return;\n }\n- if (phase.length !== 0) {\n- dispatchQueue.push(createDispatchQueueItem(event, phase));\n+ if (listeners.length !== 0) {\n+ dispatchQueue.push(createDispatchEntry(event, listeners));\n }\n }\n \n@@ -829,7 +834,7 @@ export function accumulateTwoPhaseListeners(\n ): void {\n const bubbled = event._reactName;\n const captured = bubbled !== null ? bubbled + 'Capture' : null;\n- const phase: DispatchQueueItemPhase = [];\n+ const listeners: Array = [];\n let instance = targetFiber;\n \n \/\/ Accumulate all instances and listeners via the target -> root path.\n@@ -842,32 +847,24 @@ export function accumulateTwoPhaseListeners(\n if (captured !== null) {\n const captureListener = getListener(instance, captured);\n if (captureListener != null) {\n- phase.unshift(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- captureListener,\n- currentTarget,\n- ),\n+ listeners.unshift(\n+ createDispatchListener(instance, captureListener, currentTarget),\n );\n }\n }\n if (bubbled !== null) {\n const bubbleListener = getListener(instance, bubbled);\n if (bubbleListener != null) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- bubbleListener,\n- currentTarget,\n- ),\n+ listeners.push(\n+ createDispatchListener(instance, bubbleListener, currentTarget),\n );\n }\n }\n }\n instance = instance.return;\n }\n- if (phase.length !== 0) {\n- dispatchQueue.push(createDispatchQueueItem(event, phase));\n+ if (listeners.length !== 0) {\n+ dispatchQueue.push(createDispatchEntry(event, listeners));\n }\n }\n \n@@ -934,13 +931,13 @@ function accumulateEnterLeaveListenersForEvent(\n event: ReactSyntheticEvent,\n target: Fiber,\n common: Fiber | null,\n- capture: boolean,\n+ inCapturePhase: boolean,\n ): void {\n const registrationName = event._reactName;\n if (registrationName === undefined) {\n return;\n }\n- const phase: DispatchQueueItemPhase = [];\n+ const listeners: Array = [];\n \n let instance = target;\n while (instance !== null) {\n@@ -953,34 +950,26 @@ function accumulateEnterLeaveListenersForEvent(\n }\n if (tag === HostComponent && stateNode !== null) {\n const currentTarget = stateNode;\n- if (capture) {\n+ if (inCapturePhase) {\n const captureListener = getListener(instance, registrationName);\n if (captureListener != null) {\n- phase.unshift(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- captureListener,\n- currentTarget,\n- ),\n+ listeners.unshift(\n+ createDispatchListener(instance, captureListener, currentTarget),\n );\n }\n- } else if (!capture) {\n+ } else if (!inCapturePhase) {\n const bubbleListener = getListener(instance, registrationName);\n if (bubbleListener != null) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(\n- instance,\n- bubbleListener,\n- currentTarget,\n- ),\n+ listeners.push(\n+ createDispatchListener(instance, bubbleListener, currentTarget),\n );\n }\n }\n }\n instance = instance.return;\n }\n- if (phase.length !== 0) {\n- dispatchQueue.push(createDispatchQueueItem(event, phase));\n+ if (listeners.length !== 0) {\n+ dispatchQueue.push(createDispatchEntry(event, listeners));\n }\n }\n \n@@ -1018,13 +1007,13 @@ export function accumulateEnterLeaveTwoPhaseListeners(\n }\n }\n \n-export function accumulateEventHandleTargetListeners(\n+export function accumulateEventHandleNonManagedNodeListeners(\n dispatchQueue: DispatchQueue,\n event: ReactSyntheticEvent,\n currentTarget: EventTarget,\n inCapturePhase: boolean,\n ): void {\n- const phase: DispatchQueueItemPhase = [];\n+ const listeners: Array = [];\n \n const eventListeners = getEventHandlerListeners(currentTarget);\n if (eventListeners !== null) {\n@@ -1033,22 +1022,18 @@ export function accumulateEventHandleTargetListeners(\n \n for (let i = 0; i < listenersArr.length; i++) {\n const listener = listenersArr[i];\n- const {callback, capture, type} = listener;\n+ const {callback, capture: isCapturePhaseListener, type} = listener;\n if (type === targetType) {\n- if (inCapturePhase && capture) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(null, callback, currentTarget),\n- );\n- } else if (!inCapturePhase && !capture) {\n- phase.push(\n- createDispatchQueueItemPhaseEntry(null, callback, currentTarget),\n- );\n+ if (inCapturePhase && isCapturePhaseListener) {\n+ listeners.push(createDispatchListener(null, callback, currentTarget));\n+ } else if (!inCapturePhase && !isCapturePhaseListener) {\n+ listeners.push(createDispatchListener(null, callback, currentTarget));\n }\n }\n }\n }\n- if (phase.length !== 0) {\n- dispatchQueue.push(createDispatchQueueItem(event, phase));\n+ if (listeners.length !== 0) {\n+ dispatchQueue.push(createDispatchEntry(event, listeners));\n }\n }\n \ndiff --git a\/packages\/react-dom\/src\/events\/EventSystemFlags.js b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\nindex 35af32c3b2..38cb9196b5 100644\n--- a\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n+++ b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n@@ -11,7 +11,7 @@ export type EventSystemFlags = number;\n \n export const PLUGIN_EVENT_SYSTEM = 1;\n export const RESPONDER_EVENT_SYSTEM = 1 << 1;\n-export const IS_TARGET_PHASE_ONLY = 1 << 2;\n+export const IS_EVENT_HANDLE_NON_MANAGED_NODE = 1 << 2;\n export const IS_CAPTURE_PHASE = 1 << 3;\n export const IS_PASSIVE = 1 << 4;\n export const PASSIVE_NOT_SUPPORTED = 1 << 5;\ndiff --git a\/packages\/react-dom\/src\/events\/PluginModuleType.js b\/packages\/react-dom\/src\/events\/PluginModuleType.js\nindex f8f20995b6..52b99c8568 100644\n--- a\/packages\/react-dom\/src\/events\/PluginModuleType.js\n+++ b\/packages\/react-dom\/src\/events\/PluginModuleType.js\n@@ -7,26 +7,8 @@\n * @flow\n *\/\n \n-import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n-import type {ReactSyntheticEvent} from '.\/ReactSyntheticEventType';\n-\n export type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | TouchEvent;\n \n export type PluginName = string;\n \n export type EventSystemFlags = number;\n-\n-export type DispatchQueueItemPhaseEntry = {|\n- instance: null | Fiber,\n- listener: Function,\n- currentTarget: EventTarget,\n-|};\n-\n-export type DispatchQueueItemPhase = Array;\n-\n-export type DispatchQueueItem = {|\n- event: ReactSyntheticEvent,\n- phase: DispatchQueueItemPhase,\n-|};\n-\n-export type DispatchQueue = Array;\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\nindex 91eb3f5e06..5f138bcbe3 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n@@ -136,7 +136,7 @@ import {\n } from '.\/DOMTopLevelEventTypes';\n import {IS_REPLAYED, PLUGIN_EVENT_SYSTEM} from '.\/EventSystemFlags';\n import {\n- listenToTopLevelEvent,\n+ listenToNativeEvent,\n capturePhaseEvents,\n } from '.\/DOMModernPluginEventSystem';\n import {addResponderEventSystemEvent} from '.\/DeprecatedDOMEventResponderSystem';\n@@ -240,7 +240,7 @@ function trapReplayableEventForContainer(\n listenerMap: ElementListenerMap,\n ) {\n const capture = capturePhaseEvents.has(topLevelType);\n- listenToTopLevelEvent(\n+ listenToNativeEvent(\n topLevelType,\n ((container: any): Element),\n listenerMap,\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\nindex ce9b87ba6b..c7890018af 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\n@@ -8,7 +8,7 @@\n *\/\n import type {AnyNativeEvent} from '..\/PluginModuleType';\n import type {TopLevelType} from '..\/TopLevelEventTypes';\n-import type {DispatchQueue} from '..\/PluginModuleType';\n+import type {DispatchQueue} from '..\/DOMModernPluginEventSystem';\n import type {EventSystemFlags} from '..\/EventSystemFlags';\n \n import {registerTwoPhaseEvent} from '..\/EventRegistry';\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\nindex 44daae1c50..d77345e830 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n@@ -9,10 +9,8 @@\n \n import type {TopLevelType} from '..\/..\/events\/TopLevelEventTypes';\n import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n-import type {\n- AnyNativeEvent,\n- DispatchQueue,\n-} from '..\/..\/events\/PluginModuleType';\n+import type {AnyNativeEvent} from '..\/..\/events\/PluginModuleType';\n+import type {DispatchQueue} from '..\/DOMModernPluginEventSystem';\n import type {EventSystemFlags} from '..\/EventSystemFlags';\n \n import SyntheticEvent from '..\/..\/events\/SyntheticEvent';\n@@ -24,9 +22,9 @@ import {\n } from '..\/DOMEventProperties';\n import {\n accumulateSinglePhaseListeners,\n- accumulateEventHandleTargetListeners,\n+ accumulateEventHandleNonManagedNodeListeners,\n } from '..\/DOMModernPluginEventSystem';\n-import {IS_TARGET_PHASE_ONLY} from '..\/EventSystemFlags';\n+import {IS_EVENT_HANDLE_NON_MANAGED_NODE} from '..\/EventSystemFlags';\n import SyntheticAnimationEvent from '..\/SyntheticAnimationEvent';\n import SyntheticClipboardEvent from '..\/SyntheticClipboardEvent';\n import SyntheticFocusEvent from '..\/SyntheticFocusEvent';\n@@ -50,7 +48,7 @@ function extractEvents(\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: null | EventTarget,\n eventSystemFlags: EventSystemFlags,\n- targetContainer: null | EventTarget,\n+ targetContainer: EventTarget,\n ): void {\n const reactName = topLevelEventsToReactNames.get(topLevelType);\n if (reactName === undefined) {\n@@ -155,11 +153,9 @@ function extractEvents(\n const inCapturePhase = (eventSystemFlags & IS_CAPTURE_PHASE) !== 0;\n if (\n enableCreateEventHandleAPI &&\n- eventSystemFlags !== undefined &&\n- eventSystemFlags & IS_TARGET_PHASE_ONLY &&\n- targetContainer != null\n+ eventSystemFlags & IS_EVENT_HANDLE_NON_MANAGED_NODE\n ) {\n- accumulateEventHandleTargetListeners(\n+ accumulateEventHandleNonManagedNodeListeners(\n dispatchQueue,\n event,\n targetContainer,\ndiff --git a\/packages\/react-native-renderer\/src\/legacy-events\/EventPluginRegistry.js b\/packages\/react-native-renderer\/src\/legacy-events\/EventPluginRegistry.js\nindex 7c22ebbcbc..ee3d9c53a3 100644\n--- a\/packages\/react-native-renderer\/src\/legacy-events\/EventPluginRegistry.js\n+++ b\/packages\/react-native-renderer\/src\/legacy-events\/EventPluginRegistry.js\n@@ -12,15 +12,12 @@ import type {\n AnyNativeEvent,\n PluginName,\n LegacyPluginModule,\n- ModernPluginModule,\n } from '.\/PluginModuleType';\n \n import invariant from 'shared\/invariant';\n \n type NamesToPlugins = {\n- [key: PluginName]:\n- | LegacyPluginModule\n- | ModernPluginModule,\n+ [key: PluginName]: LegacyPluginModule,\n ...,\n };\n type EventPluginOrder = null | Array;\n@@ -90,9 +87,7 @@ function recomputePluginOrdering(): void {\n *\/\n function publishEventForPlugin(\n dispatchConfig: DispatchConfig,\n- pluginModule:\n- | LegacyPluginModule\n- | ModernPluginModule,\n+ pluginModule: LegacyPluginModule,\n eventName: string,\n ): boolean {\n invariant(\n@@ -136,9 +131,7 @@ function publishEventForPlugin(\n *\/\n function publishRegistrationName(\n registrationName: string,\n- pluginModule:\n- | LegacyPluginModule\n- | ModernPluginModule,\n+ pluginModule: LegacyPluginModule,\n eventName: string,\n ): void {\n invariant(\n@@ -251,20 +244,3 @@ export function injectEventPluginsByName(\n recomputePluginOrdering();\n }\n }\n-\n-export function injectEventPlugins(\n- eventPlugins: [ModernPluginModule],\n-): void {\n- for (let i = 0; i < eventPlugins.length; i++) {\n- const pluginModule = eventPlugins[i];\n- plugins.push(pluginModule);\n- const publishedEvents = pluginModule.eventTypes;\n- for (const eventName in publishedEvents) {\n- publishEventForPlugin(\n- publishedEvents[eventName],\n- pluginModule,\n- eventName,\n- );\n- }\n- }\n-}\ndiff --git a\/packages\/react-native-renderer\/src\/legacy-events\/PluginModuleType.js b\/packages\/react-native-renderer\/src\/legacy-events\/PluginModuleType.js\nindex b7d2e32520..9488629dca 100644\n--- a\/packages\/react-native-renderer\/src\/legacy-events\/PluginModuleType.js\n+++ b\/packages\/react-native-renderer\/src\/legacy-events\/PluginModuleType.js\n@@ -34,31 +34,3 @@ export type LegacyPluginModule = {\n ) => ?ReactSyntheticEvent,\n tapMoveThreshold?: number,\n };\n-\n-export type DispatchQueueItemPhaseEntry = {|\n- instance: null | Fiber,\n- listener: Function,\n- currentTarget: EventTarget,\n-|};\n-\n-export type DispatchQueueItemPhase = Array;\n-\n-export type DispatchQueueItem = {|\n- event: ReactSyntheticEvent,\n- phase: DispatchQueueItemPhase,\n-|};\n-\n-export type DispatchQueue = Array;\n-\n-export type ModernPluginModule = {\n- eventTypes: EventTypes,\n- extractEvents: (\n- dispatchQueue: DispatchQueue,\n- topLevelType: TopLevelType,\n- targetInst: null | Fiber,\n- nativeTarget: NativeEvent,\n- nativeEventTarget: null | EventTarget,\n- eventSystemFlags: number,\n- container: null | EventTarget,\n- ) => void,\n-};\n"}

dillon1000/react

Files changed