{"patch":"diff --git a\/packages\/react-art\/src\/ReactARTHostConfig.js b\/packages\/react-art\/src\/ReactARTHostConfig.js\nindex be516fe343..58580f1f5c 100644\n--- a\/packages\/react-art\/src\/ReactARTHostConfig.js\n+++ b\/packages\/react-art\/src\/ReactARTHostConfig.js\n@@ -428,19 +428,19 @@ export function unhideTextInstance(textInstance, text): void {\n }\n \n export function mountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ) {\n throw new Error('Not yet implemented.');\n }\n \n export function updateEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ) {\n throw new Error('Not yet implemented.');\n }\n \n export function unmountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ): void {\n throw new Error('Not yet implemented.');\n }\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex fa77a2ef35..af580be510 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -13,12 +13,9 @@ import {registrationNameModules} from 'events\/EventPluginRegistry';\n import warning from 'shared\/warning';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n import warningWithoutStack from 'shared\/warningWithoutStack';\n-import type {ReactDOMEventResponderEventType} from 'shared\/ReactDOMTypes';\n+import endsWith from 'shared\/endsWith';\n import type {DOMTopLevelEventType} from 'events\/TopLevelEventTypes';\n-import {\n- setListenToResponderEventTypes,\n- generateListeningKey,\n-} from '..\/events\/DOMEventResponderSystem';\n+import {setListenToResponderEventTypes} from '..\/events\/DOMEventResponderSystem';\n \n import {\n getValueForAttribute,\n@@ -1284,7 +1281,7 @@ export function restoreControlledState(\n }\n \n export function listenToEventResponderEventTypes(\n- eventTypes: Array,\n+ eventTypes: Array,\n element: Element | Document,\n ): void {\n if (enableFlareAPI) {\n@@ -1294,40 +1291,19 @@ export function listenToEventResponderEventTypes(\n \n \/\/ Go through each target event type of the event responder\n for (let i = 0, length = eventTypes.length; i < length; ++i) {\n- const targetEventType = eventTypes[i];\n- let topLevelType;\n- let passive = true;\n-\n- \/\/ If no event config object is provided (i.e. - only a string),\n- \/\/ we default to enabling passive and not capture.\n- if (typeof targetEventType === 'string') {\n- topLevelType = targetEventType;\n- } else {\n- if (__DEV__) {\n- warning(\n- typeof targetEventType === 'object' && targetEventType !== null,\n- 'Event Responder: invalid entry in event types array. ' +\n- 'Entry must be string or an object. Instead, got %s.',\n- targetEventType,\n- );\n- }\n- const targetEventConfigObject = ((targetEventType: any): {\n- name: string,\n- passive?: boolean,\n- });\n- topLevelType = targetEventConfigObject.name;\n- if (targetEventConfigObject.passive !== undefined) {\n- passive = targetEventConfigObject.passive;\n- }\n- }\n- const listeningName = generateListeningKey(topLevelType, passive);\n- if (!listeningSet.has(listeningName)) {\n+ const eventType = eventTypes[i];\n+ const isPassive = !endsWith(eventType, '_active');\n+ const eventKey = isPassive ? eventType + '_passive' : eventType;\n+ const targetEventType = isPassive\n+ ? eventType\n+ : eventType.substring(0, eventType.length - 7);\n+ if (!listeningSet.has(eventKey)) {\n trapEventForResponderEventSystem(\n element,\n- ((topLevelType: any): DOMTopLevelEventType),\n- passive,\n+ ((targetEventType: any): DOMTopLevelEventType),\n+ isPassive,\n );\n- listeningSet.add(listeningName);\n+ listeningSet.add(eventKey);\n }\n }\n }\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\nindex 9e4d66cafd..7097e9a27a 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n@@ -21,7 +21,6 @@ import type {EventPriority} from 'shared\/ReactTypes';\n import type {\n ReactDOMEventResponder,\n ReactDOMEventComponentInstance,\n- ReactDOMEventResponderEventType,\n ReactDOMResponderContext,\n ReactDOMResponderEvent,\n } from 'shared\/ReactDOMTypes';\n@@ -95,10 +94,6 @@ const rootEventTypesToEventComponentInstances: Map<\n DOMTopLevelEventType | string,\n Set,\n > = new Map();\n-const targetEventTypeCached: Map<\n- Array,\n- Set,\n-> = new Map();\n const ownershipChangeListeners: Set = new Set();\n const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n const eventListeners:\n@@ -248,9 +243,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n }\n return false;\n },\n- addRootEventTypes(\n- rootEventTypes: Array,\n- ): void {\n+ addRootEventTypes(rootEventTypes: Array): void {\n validateResponderContext();\n const activeDocument = getActiveDocument();\n listenToResponderEventTypesImpl(rootEventTypes, activeDocument);\n@@ -260,37 +253,17 @@ const eventResponderContext: ReactDOMResponderContext = {\n registerRootEventType(rootEventType, eventComponentInstance);\n }\n },\n- removeRootEventTypes(\n- rootEventTypes: Array,\n- ): void {\n+ removeRootEventTypes(rootEventTypes: Array): void {\n validateResponderContext();\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n- let name = rootEventType;\n- let passive = true;\n-\n- if (typeof rootEventType !== 'string') {\n- const targetEventConfigObject = ((rootEventType: any): {\n- name: string,\n- passive?: boolean,\n- });\n- name = targetEventConfigObject.name;\n- if (targetEventConfigObject.passive !== undefined) {\n- passive = targetEventConfigObject.passive;\n- }\n- }\n-\n- const listeningName = generateListeningKey(\n- ((name: any): string),\n- passive,\n- );\n let rootEventComponents = rootEventTypesToEventComponentInstances.get(\n- listeningName,\n+ rootEventType,\n );\n let rootEventTypesSet = ((currentInstance: any): ReactDOMEventComponentInstance)\n .rootEventTypes;\n if (rootEventTypesSet !== null) {\n- rootEventTypesSet.delete(listeningName);\n+ rootEventTypesSet.delete(rootEventType);\n }\n if (rootEventComponents !== undefined) {\n rootEventComponents.delete(\n@@ -595,41 +568,20 @@ function processEventQueue(): void {\n }\n }\n \n-function getDOMTargetEventTypesSet(\n- eventTypes: Array,\n-): Set {\n- let cachedSet = targetEventTypeCached.get(eventTypes);\n-\n- if (cachedSet === undefined) {\n- cachedSet = new Set();\n- for (let i = 0; i < eventTypes.length; i++) {\n- const eventType = eventTypes[i];\n- let name = eventType;\n- let passive = true;\n-\n- if (typeof eventType !== 'string') {\n- const targetEventConfigObject = ((eventType: any): {\n- name: string,\n- passive?: boolean,\n- });\n- name = targetEventConfigObject.name;\n- if (targetEventConfigObject.passive !== undefined) {\n- passive = targetEventConfigObject.passive;\n- }\n- }\n- const listeningName = generateListeningKey(\n- ((name: any): string),\n- passive,\n- );\n- cachedSet.add(listeningName);\n+function responderEventTypesContainType(\n+ eventTypes: Array,\n+ type: string,\n+): boolean {\n+ for (let i = 0, len = eventTypes.length; i < len; i++) {\n+ if (eventTypes[i] === type) {\n+ return true;\n }\n- targetEventTypeCached.set(eventTypes, cachedSet);\n }\n- return cachedSet;\n+ return false;\n }\n \n function handleTargetEventResponderInstance(\n- listeningName: string,\n+ eventType: string,\n responderEvent: ReactDOMResponderEvent,\n eventComponentInstance: ReactDOMEventComponentInstance,\n hookComponentResponderValidation: null | Set,\n@@ -639,8 +591,7 @@ function handleTargetEventResponderInstance(\n const targetEventTypes = responder.targetEventTypes;\n \/\/ Validate the target event type exists on the responder\n if (targetEventTypes !== undefined) {\n- const targetEventTypesSet = getDOMTargetEventTypesSet(targetEventTypes);\n- if (targetEventTypesSet.has(listeningName)) {\n+ if (responderEventTypesContainType(targetEventTypes, eventType)) {\n if (hookComponentResponderValidation !== null) {\n hookComponentResponderValidation.add(responder);\n }\n@@ -700,7 +651,7 @@ function checkForLocalPropagationContinuation(\n }\n \n function traverseAndHandleEventResponderInstances(\n- topLevelType: DOMTopLevelEventType,\n+ topLevelType: string,\n targetFiber: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: EventTarget,\n@@ -708,17 +659,15 @@ function traverseAndHandleEventResponderInstances(\n ): void {\n const isPassiveEvent = (eventSystemFlags & IS_PASSIVE) !== 0;\n const isPassiveSupported = (eventSystemFlags & PASSIVE_NOT_SUPPORTED) === 0;\n- const listeningName = generateListeningKey(\n- ((topLevelType: any): string),\n- isPassiveEvent || !isPassiveSupported,\n- );\n+ const isPassive = isPassiveEvent || !isPassiveSupported;\n+ const eventType = isPassive ? topLevelType : topLevelType + '_active';\n \n \/\/ Trigger event responders in this order:\n \/\/ - Bubble target phase\n \/\/ - Root phase\n \n const responderEvent = createDOMResponderEvent(\n- ((topLevelType: any): string),\n+ topLevelType,\n nativeEvent,\n ((nativeEventTarget: any): Element | Document),\n isPassiveEvent,\n@@ -743,7 +692,7 @@ function traverseAndHandleEventResponderInstances(\n \/\/ Switch to the current fiber tree\n node = eventComponentInstance.currentFiber;\n handleTargetEventResponderInstance(\n- listeningName,\n+ eventType,\n responderEvent,\n eventComponentInstance,\n hookComponentResponderValidation,\n@@ -760,7 +709,7 @@ function traverseAndHandleEventResponderInstances(\n )\n ) {\n handleTargetEventResponderInstance(\n- listeningName,\n+ eventType,\n responderEvent,\n eventComponentInstance,\n null,\n@@ -776,7 +725,7 @@ function traverseAndHandleEventResponderInstances(\n responderEvent.currentTarget = null;\n \/\/ Root phase\n const rootEventInstances = rootEventTypesToEventComponentInstances.get(\n- listeningName,\n+ eventType,\n );\n if (rootEventInstances !== undefined) {\n const rootEventComponentInstances = Array.from(rootEventInstances);\n@@ -906,7 +855,7 @@ function validateResponderContext(): void {\n }\n \n export function dispatchEventForResponderEventSystem(\n- topLevelType: DOMTopLevelEventType,\n+ topLevelType: string,\n targetFiber: null | Fiber,\n nativeEvent: AnyNativeEvent,\n nativeEventTarget: EventTarget,\n@@ -950,7 +899,7 @@ export function dispatchEventForResponderEventSystem(\n \n export function addRootEventTypesForComponentInstance(\n eventComponentInstance: ReactDOMEventComponentInstance,\n- rootEventTypes: Array,\n+ rootEventTypes: Array,\n ): void {\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n@@ -959,31 +908,16 @@ export function addRootEventTypesForComponentInstance(\n }\n \n function registerRootEventType(\n- rootEventType: ReactDOMEventResponderEventType,\n+ rootEventType: string,\n eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n- let name = rootEventType;\n- let passive = true;\n-\n- if (typeof rootEventType !== 'string') {\n- const targetEventConfigObject = ((rootEventType: any): {\n- name: string,\n- passive?: boolean,\n- });\n- name = targetEventConfigObject.name;\n- if (targetEventConfigObject.passive !== undefined) {\n- passive = targetEventConfigObject.passive;\n- }\n- }\n-\n- const listeningName = generateListeningKey(((name: any): string), passive);\n let rootEventComponentInstances = rootEventTypesToEventComponentInstances.get(\n- listeningName,\n+ rootEventType,\n );\n if (rootEventComponentInstances === undefined) {\n rootEventComponentInstances = new Set();\n rootEventTypesToEventComponentInstances.set(\n- listeningName,\n+ rootEventType,\n rootEventComponentInstances,\n );\n }\n@@ -992,23 +926,12 @@ function registerRootEventType(\n rootEventTypesSet = eventComponentInstance.rootEventTypes = new Set();\n }\n invariant(\n- !rootEventTypesSet.has(listeningName),\n+ !rootEventTypesSet.has(rootEventType),\n 'addRootEventTypes() found a duplicate root event ' +\n 'type of \"%s\". This might be because the event type exists in the event responder \"rootEventTypes\" ' +\n 'array or because of a previous addRootEventTypes() using this root event type.',\n- name,\n+ rootEventType,\n );\n- rootEventTypesSet.add(listeningName);\n+ rootEventTypesSet.add(rootEventType);\n rootEventComponentInstances.add(eventComponentInstance);\n }\n-\n-export function generateListeningKey(\n- topLevelType: string,\n- passive: boolean,\n-): string {\n- \/\/ Create a unique name for this event, plus its properties. We'll\n- \/\/ use this to ensure we don't listen to the same event with the same\n- \/\/ properties again.\n- const passiveKey = passive ? '_passive' : '_active';\n- return `${topLevelType}${passiveKey}`;\n-}\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\nindex 775519e11b..d9b0eabd75 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n@@ -334,7 +334,7 @@ export function dispatchEvent(\n } else {\n \/\/ React Flare event system\n dispatchEventForResponderEventSystem(\n- topLevelType,\n+ (topLevelType: any),\n targetInst,\n nativeEvent,\n nativeEventTarget,\ndiff --git a\/packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js b\/packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js\nindex e0f4f2fde0..c30a8cf9e6 100644\n--- a\/packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js\n@@ -627,7 +627,7 @@ describe('DOMEventResponderSystem', () => {\n const buttonRef = React.createRef();\n \n const ClickEventComponent1 = createReactEventComponent({\n- targetEventTypes: [{name: 'click', passive: false, capture: false}],\n+ targetEventTypes: ['click_active'],\n onEvent: event => {\n clickEventComponent1Fired++;\n eventLog.push({\n@@ -639,7 +639,7 @@ describe('DOMEventResponderSystem', () => {\n });\n \n const ClickEventComponent2 = createReactEventComponent({\n- targetEventTypes: [{name: 'click', passive: true, capture: false}],\n+ targetEventTypes: ['click'],\n onEvent: event => {\n clickEventComponent2Fired++;\n eventLog.push({\n@@ -686,7 +686,7 @@ describe('DOMEventResponderSystem', () => {\n let eventLog = [];\n \n const ClickEventComponent1 = createReactEventComponent({\n- rootEventTypes: [{name: 'click', passive: false, capture: false}],\n+ rootEventTypes: ['click_active'],\n onRootEvent: event => {\n clickEventComponent1Fired++;\n eventLog.push({\n@@ -698,7 +698,7 @@ describe('DOMEventResponderSystem', () => {\n });\n \n const ClickEventComponent2 = createReactEventComponent({\n- rootEventTypes: [{name: 'click', passive: true, capture: false}],\n+ rootEventTypes: ['click'],\n onRootEvent: event => {\n clickEventComponent2Fired++;\n eventLog.push({\ndiff --git a\/packages\/react-events\/src\/dom\/Drag.js b\/packages\/react-events\/src\/dom\/Drag.js\nindex 4b3847699c..7dc0d301b0 100644\n--- a\/packages\/react-events\/src\/dom\/Drag.js\n+++ b\/packages\/react-events\/src\/dom\/Drag.js\n@@ -18,11 +18,7 @@ import React from 'react';\n import {DiscreteEvent, UserBlockingEvent} from 'shared\/ReactTypes';\n \n const targetEventTypes = ['pointerdown'];\n-const rootEventTypes = [\n- 'pointerup',\n- 'pointercancel',\n- {name: 'pointermove', passive: false},\n-];\n+const rootEventTypes = ['pointerup', 'pointercancel', 'pointermove_active'];\n \n type DragState = {\n dragTarget: null | Element | Document,\n@@ -38,10 +34,13 @@ type DragState = {\n \/\/ too\n if (typeof window !== 'undefined' && window.PointerEvent === undefined) {\n targetEventTypes.push('touchstart', 'mousedown');\n- rootEventTypes.push('mouseup', 'mousemove', 'touchend', 'touchcancel', {\n- name: 'touchmove',\n- passive: false,\n- });\n+ rootEventTypes.push(\n+ 'mouseup',\n+ 'mousemove',\n+ 'touchend',\n+ 'touchcancel',\n+ 'touchmove_active',\n+ );\n }\n \n type EventData = {\ndiff --git a\/packages\/react-events\/src\/dom\/Focus.js b\/packages\/react-events\/src\/dom\/Focus.js\nindex 32c4101b4e..04ee90fc71 100644\n--- a\/packages\/react-events\/src\/dom\/Focus.js\n+++ b\/packages\/react-events\/src\/dom\/Focus.js\n@@ -46,10 +46,7 @@ const isMac =\n ? \/^Mac\/.test(window.navigator.platform)\n : false;\n \n-const targetEventTypes = [\n- {name: 'focus', passive: true},\n- {name: 'blur', passive: true},\n-];\n+const targetEventTypes = ['focus', 'blur'];\n \n const rootEventTypes = [\n 'keydown',\ndiff --git a\/packages\/react-events\/src\/dom\/FocusScope.js b\/packages\/react-events\/src\/dom\/FocusScope.js\nindex c91ea5ef9c..0d07639a23 100644\n--- a\/packages\/react-events\/src\/dom\/FocusScope.js\n+++ b\/packages\/react-events\/src\/dom\/FocusScope.js\n@@ -25,8 +25,8 @@ type FocusScopeState = {\n currentFocusedNode: null | HTMLElement,\n };\n \n-const targetEventTypes = [{name: 'keydown', passive: false}];\n-const rootEventTypes = [{name: 'focus', passive: true}];\n+const targetEventTypes = ['keydown_active'];\n+const rootEventTypes = ['focus'];\n \n function focusElement(element: ?HTMLElement) {\n if (element != null) {\ndiff --git a\/packages\/react-events\/src\/dom\/Press.js b\/packages\/react-events\/src\/dom\/Press.js\nindex 5ead8e9a97..75a85b9a46 100644\n--- a\/packages\/react-events\/src\/dom\/Press.js\n+++ b\/packages\/react-events\/src\/dom\/Press.js\n@@ -123,12 +123,12 @@ const DEFAULT_PRESS_RETENTION_OFFSET = {\n };\n \n const targetEventTypes = [\n- {name: 'keydown', passive: false},\n- {name: 'contextmenu', passive: false},\n+ 'keydown_active',\n+ 'contextmenu_active',\n \/\/ We need to preventDefault on pointerdown for mouse\/pen events\n \/\/ that are in hit target area but not the element area.\n- {name: 'pointerdown', passive: false},\n- {name: 'click', passive: false},\n+ 'pointerdown_active',\n+ 'click_active',\n ];\n const rootEventTypes = [\n 'click',\n@@ -139,7 +139,7 @@ const rootEventTypes = [\n 'pointercancel',\n \/\/ We listen to this here so stopPropagation can\n \/\/ block other mouseup events used internally\n- {name: 'mouseup', passive: false},\n+ 'mouseup_active',\n 'touchend',\n ];\n \ndiff --git a\/packages\/react-events\/src\/dom\/Swipe.js b\/packages\/react-events\/src\/dom\/Swipe.js\nindex 2ec90c3c36..f5d7ecf4b7 100644\n--- a\/packages\/react-events\/src\/dom\/Swipe.js\n+++ b\/packages\/react-events\/src\/dom\/Swipe.js\n@@ -18,20 +18,19 @@ import React from 'react';\n import {UserBlockingEvent, DiscreteEvent} from 'shared\/ReactTypes';\n \n const targetEventTypes = ['pointerdown'];\n-const rootEventTypes = [\n- 'pointerup',\n- 'pointercancel',\n- {name: 'pointermove', passive: false},\n-];\n+const rootEventTypes = ['pointerup', 'pointercancel', 'pointermove_active'];\n \n \/\/ In the case we don't have PointerEvents (Safari), we listen to touch events\n \/\/ too\n if (typeof window !== 'undefined' && window.PointerEvent === undefined) {\n targetEventTypes.push('touchstart', 'mousedown');\n- rootEventTypes.push('mouseup', 'mousemove', 'touchend', 'touchcancel', {\n- name: 'touchmove',\n- passive: false,\n- });\n+ rootEventTypes.push(\n+ 'mouseup',\n+ 'mousemove',\n+ 'touchend',\n+ 'touchcancel',\n+ 'touchmove_active',\n+ );\n }\n \n type EventData = {\ndiff --git a\/packages\/react-events\/src\/rn\/Press.js b\/packages\/react-events\/src\/rn\/Press.js\nindex 278f3622ce..726c36300a 100644\n--- a\/packages\/react-events\/src\/rn\/Press.js\n+++ b\/packages\/react-events\/src\/rn\/Press.js\n@@ -10,7 +10,6 @@\n import type {\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n- ReactNativeEventResponderEventType,\n ReactNativeEventTarget,\n PointerType,\n ReactFaricEventTouch,\n@@ -24,7 +23,6 @@ import {\n } from 'react-native-renderer\/src\/ReactNativeTypes';\n \n type ReactNativeEventResponder = ReactEventResponder<\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n >;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricEventResponderSystem.js b\/packages\/react-native-renderer\/src\/ReactFabricEventResponderSystem.js\nindex b670d75f2a..0a68466868 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricEventResponderSystem.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricEventResponderSystem.js\n@@ -23,7 +23,6 @@ import type {\n ReactEventComponentInstance,\n } from 'shared\/ReactTypes';\n import type {\n- ReactNativeEventResponderEventType,\n ReactNativeResponderContext,\n ReactNativeResponderEvent,\n EventPriority,\n@@ -74,13 +73,11 @@ type EventQueue = {\n };\n \n type ReactNativeEventResponder = ReactEventResponder<\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n >;\n \n type ReactNativeEventComponentInstance = ReactEventComponentInstance<\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n >;\n@@ -89,13 +86,9 @@ const {measureInWindow} = nativeFabricUIManager;\n \n const activeTimeouts: Map = new Map();\n const rootEventTypesToEventComponentInstances: Map<\n- ReactNativeEventResponderEventType | string,\n+ string,\n Set,\n > = new Map();\n-const targetEventTypeCached: Map<\n- Array,\n- Set,\n-> = new Map();\n const ownershipChangeListeners: Set<\n ReactNativeEventComponentInstance,\n > = new Set();\n@@ -214,9 +207,7 @@ const eventResponderContext: ReactNativeResponderContext = {\n });\n });\n },\n- addRootEventTypes(\n- rootEventTypes: Array,\n- ): void {\n+ addRootEventTypes(rootEventTypes: Array): void {\n validateResponderContext();\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n@@ -224,9 +215,7 @@ const eventResponderContext: ReactNativeResponderContext = {\n registerRootEventType(rootEventType, eventComponentInstance);\n }\n },\n- removeRootEventTypes(\n- rootEventTypes: Array,\n- ): void {\n+ removeRootEventTypes(rootEventTypes: Array): void {\n validateResponderContext();\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n@@ -330,7 +319,7 @@ function processTimers(\n }\n \n function createFabricResponderEvent(\n- topLevelType: ReactNativeEventResponderEventType,\n+ topLevelType: string,\n nativeEvent: ReactFaricEvent,\n target: null | ReactNativeEventTarget,\n ): ReactNativeResponderEvent {\n@@ -451,19 +440,18 @@ function processEvents(events: Array): void {\n }\n }\n \n-function getFabricTargetEventTypesSet(\n- eventTypes: Array,\n-): Set {\n- let cachedSet = targetEventTypeCached.get(eventTypes);\n-\n- if (cachedSet === undefined) {\n- cachedSet = new Set();\n- for (let i = 0; i < eventTypes.length; i++) {\n- cachedSet.add(eventTypes[i]);\n+\/\/ TODO this function is almost an exact copy of the DOM version, we should\n+\/\/ somehow share the logic\n+function responderEventTypesContainType(\n+ eventTypes: Array,\n+ type: string,\n+): boolean {\n+ for (let i = 0, len = eventTypes.length; i < len; i++) {\n+ if (eventTypes[i] === type) {\n+ return true;\n }\n- targetEventTypeCached.set(eventTypes, cachedSet);\n }\n- return cachedSet;\n+ return false;\n }\n \n \/\/ TODO this function is almost an exact copy of the DOM version, we should\n@@ -499,7 +487,7 @@ function checkForLocalPropagationContinuation(\n \/\/ TODO this function is almost an exact copy of the DOM version, we should\n \/\/ somehow share the logic\n function handleTargetEventResponderInstance(\n- topLevelType: ReactNativeEventResponderEventType,\n+ topLevelType: string,\n responderEvent: ReactNativeResponderEvent,\n eventComponentInstance: ReactNativeEventComponentInstance,\n hookComponentResponderValidation: null | Set,\n@@ -509,8 +497,7 @@ function handleTargetEventResponderInstance(\n const targetEventTypes = responder.targetEventTypes;\n \/\/ Validate the target event type exists on the responder\n if (targetEventTypes !== undefined) {\n- const targetEventTypesSet = getFabricTargetEventTypesSet(targetEventTypes);\n- if (targetEventTypesSet.has(topLevelType)) {\n+ if (responderEventTypesContainType(targetEventTypes, topLevelType)) {\n if (hookComponentResponderValidation !== null) {\n hookComponentResponderValidation.add(responder);\n }\n@@ -544,7 +531,7 @@ function handleTargetEventResponderInstance(\n \/\/ TODO this function is almost an exact copy of the DOM version, we should\n \/\/ somehow share the logic\n function traverseAndHandleEventResponderInstances(\n- topLevelType: ReactNativeEventResponderEventType,\n+ topLevelType: string,\n targetFiber: null | Fiber,\n nativeEvent: ReactFaricEvent,\n ): void {\n@@ -642,7 +629,7 @@ function traverseAndHandleEventResponderInstances(\n \/\/ TODO this function is almost an exact copy of the DOM version, we should\n \/\/ somehow share the logic\n export function dispatchEventForResponderEventSystem(\n- topLevelType: ReactNativeEventResponderEventType,\n+ topLevelType: string,\n targetFiber: null | Fiber,\n nativeEvent: ReactFaricEvent,\n ): void {\n@@ -745,7 +732,7 @@ export function unmountEventResponder(\n }\n \n function registerRootEventType(\n- rootEventType: ReactNativeEventResponderEventType,\n+ rootEventType: string,\n eventComponentInstance: ReactNativeEventComponentInstance,\n ) {\n let rootEventComponentInstances = rootEventTypesToEventComponentInstances.get(\n@@ -775,7 +762,7 @@ function registerRootEventType(\n \n export function addRootEventTypesForComponentInstance(\n eventComponentInstance: ReactNativeEventComponentInstance,\n- rootEventTypes: Array,\n+ rootEventTypes: Array,\n ): void {\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\nindex 2e096ea03c..49a26bc870 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n@@ -13,7 +13,6 @@ import type {\n MeasureOnSuccessCallback,\n NativeMethodsMixinType,\n ReactNativeBaseComponentViewConfig,\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n } from '.\/ReactNativeTypes';\n@@ -66,7 +65,6 @@ const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;\n let nextReactTag = 2;\n \n type ReactNativeEventComponentInstance = ReactEventComponentInstance<\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n >;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\nindex 1726f572db..fd8ba518ad 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n@@ -9,7 +9,6 @@\n \n import type {\n ReactNativeBaseComponentViewConfig,\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n } from '.\/ReactNativeTypes';\n@@ -35,7 +34,6 @@ import ReactNativeFiberHostComponent from '.\/ReactNativeFiberHostComponent';\n const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;\n \n type ReactNativeEventComponentInstance = ReactEventComponentInstance<\n- ReactNativeEventResponderEventType,\n ReactNativeResponderEvent,\n ReactNativeResponderContext,\n >;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\nindex 923915f11f..24b93a56c4 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n@@ -157,17 +157,6 @@ export type ReactFabricType = {\n __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsFabricType,\n };\n \n-export type ReactNativeEventResponderEventType =\n- | 'topMouseDown'\n- | 'topMouseMove'\n- | 'topMouseUp'\n- | 'topScroll'\n- | 'topSelectionChange'\n- | 'topTouchCancel'\n- | 'topTouchEnd'\n- | 'topTouchMove'\n- | 'topTouchStart';\n-\n export type ReactNativeEventTarget = {\n node: Object,\n canonical: {\n@@ -202,7 +191,7 @@ export type ReactNativeResponderEvent = {\n currentTarget: null | ReactNativeEventTarget,\n nativeEvent: ReactFaricEvent,\n target: null | ReactNativeEventTarget,\n- type: ReactNativeEventResponderEventType,\n+ type: string,\n };\n \n export type ReactNativeResponderContext = {\n@@ -224,12 +213,8 @@ export type ReactNativeResponderContext = {\n bottom: number,\n }) => void,\n ): void,\n- addRootEventTypes: (\n- rootEventTypes: Array,\n- ) => void,\n- removeRootEventTypes: (\n- rootEventTypes: Array,\n- ) => void,\n+ addRootEventTypes: (rootEventTypes: Array) => void,\n+ removeRootEventTypes: (rootEventTypes: Array) => void,\n setTimeout: (func: () => void, timeout: number) => number,\n clearTimeout: (timerId: number) => void,\n getTimeStamp: () => number,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.js b\/packages\/react-reconciler\/src\/ReactFiber.js\nindex 5188146701..4821f4205e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.js\n@@ -103,7 +103,7 @@ if (__DEV__) {\n export type Dependencies = {\n expirationTime: ExpirationTime,\n firstContext: ContextDependency | null,\n- events: Array> | null,\n+ events: Array> | null,\n };\n \n \/\/ A Fiber is work on a Component that needs to be done or was done. There can\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex 99dcf52d5d..d115261715 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -1126,7 +1126,6 @@ function completeWork(\n let eventComponentInstance: ReactEventComponentInstance<\n any,\n any,\n- any,\n > | null =\n workInProgress.stateNode;\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberEvents.js b\/packages\/react-reconciler\/src\/ReactFiberEvents.js\nindex 9a0e7f7a23..98f60789a0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberEvents.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberEvents.js\n@@ -32,8 +32,8 @@ export function prepareToReadEventComponents(workInProgress: Fiber): void {\n currentEventComponentInstanceIndex = 0;\n }\n \n-export function updateEventComponentInstance(\n- eventComponent: ReactEventComponent,\n+export function updateEventComponentInstance(\n+ eventComponent: ReactEventComponent,\n props: Object,\n ): void {\n const responder = eventComponent.responder;\n@@ -82,14 +82,14 @@ export function updateEventComponentInstance(\n }\n }\n \n-export function createEventComponentInstance(\n+export function createEventComponentInstance(\n currentFiber: Fiber,\n props: Object,\n- responder: ReactEventResponder,\n+ responder: ReactEventResponder,\n rootInstance: mixed,\n state: Object,\n isHook: boolean,\n-): ReactEventComponentInstance {\n+): ReactEventComponentInstance {\n return {\n currentFiber,\n isHook,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex 0f391c0b0c..451b8a9cda 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -83,8 +83,8 @@ export type Dispatcher = {\n deps: Array | void | null,\n ): void,\n useDebugValue(value: T, formatterFn: ?(value: T) => mixed): void,\n- useEvent(\n- eventComponent: ReactEventComponent,\n+ useEvent(\n+ eventComponent: ReactEventComponent,\n props: Object,\n ): void,\n };\n@@ -1416,7 +1416,7 @@ if (__DEV__) {\n mountHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(eventComponent: ReactEventComponent, props) {\n+ useEvent(eventComponent: ReactEventComponent, props) {\n currentHookNameInDev = 'useEvent';\n mountHookTypesDev();\n updateEventComponentInstance(eventComponent, props);\n@@ -1518,7 +1518,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(eventComponent: ReactEventComponent, props) {\n+ useEvent(eventComponent: ReactEventComponent, props) {\n currentHookNameInDev = 'useEvent';\n updateHookTypesDev();\n updateEventComponentInstance(eventComponent, props);\n@@ -1620,7 +1620,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return updateDebugValue(value, formatterFn);\n },\n- useEvent(eventComponent: ReactEventComponent, props) {\n+ useEvent(eventComponent: ReactEventComponent, props) {\n currentHookNameInDev = 'useEvent';\n updateHookTypesDev();\n updateEventComponentInstance(eventComponent, props);\n@@ -1733,7 +1733,7 @@ if (__DEV__) {\n mountHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(eventComponent: ReactEventComponent, props) {\n+ useEvent(eventComponent: ReactEventComponent, props) {\n currentHookNameInDev = 'useEvent';\n warnInvalidHookAccess();\n mountHookTypesDev();\n@@ -1847,7 +1847,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return updateDebugValue(value, formatterFn);\n },\n- useEvent(eventComponent: ReactEventComponent, props) {\n+ useEvent(eventComponent: ReactEventComponent, props) {\n currentHookNameInDev = 'useEvent';\n warnInvalidHookAccess();\n updateHookTypesDev();\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\nindex 512cd0eb0e..467fc4550c 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n@@ -286,19 +286,19 @@ export function unhideTextInstance(\n }\n \n export function mountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ): void {\n \/\/ noop\n }\n \n export function updateEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ): void {\n \/\/ noop\n }\n \n export function unmountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactEventComponentInstance,\n ): void {\n \/\/ noop\n }\ndiff --git a\/packages\/react\/src\/ReactHooks.js b\/packages\/react\/src\/ReactHooks.js\nindex 1f67171598..6744b9360a 100644\n--- a\/packages\/react\/src\/ReactHooks.js\n+++ b\/packages\/react\/src\/ReactHooks.js\n@@ -138,8 +138,8 @@ export function useDebugValue(value: any, formatterFn: ?(value: any) => any) {\n \n export const emptyObject = {};\n \n-export function useEvent(\n- eventComponent: ReactEventComponent,\n+export function useEvent(\n+ eventComponent: ReactEventComponent,\n props: null | Object,\n ) {\n const dispatcher = resolveDispatcher();\ndiff --git a\/packages\/shared\/ReactDOMTypes.js b\/packages\/shared\/ReactDOMTypes.js\nindex e13331ca2c..013ebed24d 100644\n--- a\/packages\/shared\/ReactDOMTypes.js\n+++ b\/packages\/shared\/ReactDOMTypes.js\n@@ -15,10 +15,6 @@ import type {\n \n type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;\n \n-export type ReactDOMEventResponderEventType =\n- | string\n- | {name: string, passive?: boolean};\n-\n export type PointerType =\n | ''\n | 'mouse'\n@@ -39,13 +35,11 @@ export type ReactDOMResponderEvent = {\n };\n \n export type ReactDOMEventResponder = ReactEventResponder<\n- ReactDOMEventResponderEventType,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n >;\n \n export type ReactDOMEventComponentInstance = ReactEventComponentInstance<\n- ReactDOMEventResponderEventType,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n >;\n@@ -62,12 +56,8 @@ export type ReactDOMResponderContext = {\n ) => boolean,\n isTargetWithinEventComponent: (Element | Document) => boolean,\n isTargetWithinEventResponderScope: (Element | Document) => boolean,\n- addRootEventTypes: (\n- rootEventTypes: Array,\n- ) => void,\n- removeRootEventTypes: (\n- rootEventTypes: Array,\n- ) => void,\n+ addRootEventTypes: (rootEventTypes: Array) => void,\n+ removeRootEventTypes: (rootEventTypes: Array) => void,\n hasOwnership: () => boolean,\n requestGlobalOwnership: () => boolean,\n releaseOwnership: () => boolean,\ndiff --git a\/packages\/shared\/ReactTypes.js b\/packages\/shared\/ReactTypes.js\nindex 1090d1a67a..ec6f83981d 100644\n--- a\/packages\/shared\/ReactTypes.js\n+++ b\/packages\/shared\/ReactTypes.js\n@@ -14,7 +14,7 @@ export type ReactNode =\n | ReactFragment\n | ReactProvider\n | ReactConsumer\n- | ReactEventComponent;\n+ | ReactEventComponent;\n \n export type ReactEmpty = null | void | boolean;\n \n@@ -80,20 +80,20 @@ export type RefObject = {|\n current: any,\n |};\n \n-export type ReactEventComponentInstance = {|\n+export type ReactEventComponentInstance = {|\n currentFiber: mixed,\n isHook: boolean,\n props: Object,\n- responder: ReactEventResponder,\n+ responder: ReactEventResponder,\n rootEventTypes: null | Set,\n rootInstance: null | mixed,\n state: Object,\n |};\n \n-export type ReactEventResponder = {\n+export type ReactEventResponder = {\n displayName: string,\n- targetEventTypes?: Array,\n- rootEventTypes?: Array,\n+ targetEventTypes?: Array,\n+ rootEventTypes?: Array,\n getInitialState?: (props: Object) => Object,\n allowMultipleHostChildren: boolean,\n allowEventHooks: boolean,\n@@ -104,9 +104,9 @@ export type ReactEventResponder = {\n onOwnershipChange?: (context: C, props: Object, state: Object) => void,\n };\n \n-export type ReactEventComponent = {|\n+export type ReactEventComponent = {|\n $$typeof: Symbol | number,\n- responder: ReactEventResponder,\n+ responder: ReactEventResponder,\n |};\n \n export opaque type EventPriority = 0 | 1 | 2;\ndiff --git a\/packages\/shared\/createEventComponent.js b\/packages\/shared\/createEventComponent.js\nindex faea980806..622e9d6b2f 100644\n--- a\/packages\/shared\/createEventComponent.js\n+++ b\/packages\/shared\/createEventComponent.js\n@@ -28,9 +28,9 @@ if (__DEV__) {\n }\n }\n \n-export default function createEventComponent(\n- responder: ReactEventResponder,\n-): ReactEventComponent {\n+export default function createEventComponent(\n+ responder: ReactEventResponder,\n+): ReactEventComponent {\n \/\/ We use responder as a Map key later on. When we have a bad\n \/\/ polyfill, then we can't use it as a key as the polyfill tries\n \/\/ to add a property to the object.\ndiff --git a\/packages\/shared\/endsWith.js b\/packages\/shared\/endsWith.js\nnew file mode 100644\nindex 0000000000..115e75a974\n--- \/dev\/null\n+++ b\/packages\/shared\/endsWith.js\n@@ -0,0 +1,13 @@\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 default function endsWith(subject: string, search: string): boolean {\n+ const length = subject.length;\n+ return subject.substring(length - search.length, length) === search;\n+}\n","parents":["2a0f6390ed657fa8e2c14c1cf6d9faa2f7b42525"],"files":[{"path":"packages\/react-art\/src\/ReactARTHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMEventResponderSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventListener.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Drag.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Focus.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/FocusScope.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Press.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Swipe.js","status":"M"},{"path":"packages\/react-events\/src\/rn\/Press.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactFabricEventResponderSystem.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactFabricHostConfig.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeHostConfig.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeTypes.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiber.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberEvents.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberHooks.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/ReactTestHostConfig.js","status":"M"},{"path":"packages\/react\/src\/ReactHooks.js","status":"M"},{"path":"packages\/shared\/ReactDOMTypes.js","status":"M"},{"path":"packages\/shared\/ReactTypes.js","status":"M"},{"path":"packages\/shared\/createEventComponent.js","status":"M"},{"path":"packages\/shared\/endsWith.js","status":"A"}],"commit":{"subject":"[Flare] Revise responder event types (#16081)","shortRevision":"67e3f3fb6e","authoredAt":"2019-07-08T14:35:59+01:00","authorName":"Dominic Gannaway","revision":"67e3f3fb6e342f95f00215c84d5d013d7b0e1b33","authorEmail":"trueadm@users.noreply.github.com"},"body":""}

dillon1000/react

Files changed