{"patch":"diff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 33fb2281c2..39e22e88b6 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -45,8 +45,10 @@ import {\n import dangerousStyleValue from '..\/shared\/dangerousStyleValue';\n \n import type {DOMContainer} from '.\/ReactDOM';\n-import type {ReactEventComponentInstance} from 'shared\/ReactTypes';\n-import type {ReactDOMEventResponder} from 'shared\/ReactDOMTypes';\n+import type {\n+ ReactDOMEventResponder,\n+ ReactDOMEventComponentInstance,\n+} from 'shared\/ReactDOMTypes';\n import {\n mountEventResponder,\n unmountEventResponder,\n@@ -102,7 +104,6 @@ export type UpdatePayload = Array;\n export type ChildSet = void; \/\/ Unused\n export type TimeoutHandle = TimeoutID;\n export type NoTimeout = -1;\n-export type EventResponder = ReactDOMEventResponder;\n \n import {\n enableSuspenseServerRenderer,\n@@ -900,7 +901,7 @@ export function didNotFindHydratableSuspenseInstance(\n }\n \n export function mountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n if (enableEventAPI) {\n const rootContainerInstance = ((eventComponentInstance.rootInstance: any): Container);\n@@ -926,13 +927,13 @@ export function mountEventComponent(\n }\n \n export function updateEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n \/\/ NO-OP, why might use this in the future\n }\n \n export function unmountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n if (enableEventAPI) {\n \/\/ TODO stop listening to targetEventTypes\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\nindex a6b8706f49..9436f58573 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n@@ -18,12 +18,10 @@ import {\n HostComponent,\n FunctionComponent,\n } from 'shared\/ReactWorkTags';\n-import type {\n- ReactEventComponentInstance,\n- EventPriority,\n-} from 'shared\/ReactTypes';\n+import type {EventPriority} from 'shared\/ReactTypes';\n import type {\n ReactDOMEventResponder,\n+ ReactDOMEventComponentInstance,\n ReactDOMEventResponderEventType,\n ReactDOMResponderContext,\n ReactDOMResponderEvent,\n@@ -86,7 +84,7 @@ type ResponderTimeout = {|\n |};\n \n type ResponderTimer = {|\n- instance: ReactEventComponentInstance,\n+ instance: ReactDOMEventComponentInstance,\n func: () => void,\n id: number,\n timeStamp: number,\n@@ -95,13 +93,13 @@ type ResponderTimer = {|\n const activeTimeouts: Map = new Map();\n const rootEventTypesToEventComponentInstances: Map<\n DOMTopLevelEventType | string,\n- Set,\n+ Set,\n > = new Map();\n const targetEventTypeCached: Map<\n Array,\n Set,\n > = new Map();\n-const ownershipChangeListeners: Set = new Set();\n+const ownershipChangeListeners: Set = new Set();\n const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n const eventListeners:\n | WeakMap\n@@ -115,7 +113,7 @@ let continueLocalPropagation = false;\n \n let currentTimeStamp = 0;\n let currentTimers = new Map();\n-let currentInstance: null | ReactEventComponentInstance = null;\n+let currentInstance: null | ReactDOMEventComponentInstance = null;\n let currentEventQueue: null | EventQueue = null;\n let currentTimerIDCounter = 0;\n let currentDocument: null | Document = null;\n@@ -215,7 +213,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n validateResponderContext();\n if (target != null) {\n let fiber = getClosestInstanceFromNode(target);\n- const currentFiber = ((currentInstance: any): ReactEventComponentInstance)\n+ const currentFiber = ((currentInstance: any): ReactDOMEventComponentInstance)\n .currentFiber;\n \n while (fiber !== null) {\n@@ -233,12 +231,12 @@ const eventResponderContext: ReactDOMResponderContext = {\n },\n isTargetWithinEventResponderScope(target: Element | Document): boolean {\n validateResponderContext();\n- const componentInstance = ((currentInstance: any): ReactEventComponentInstance);\n+ const componentInstance = ((currentInstance: any): ReactDOMEventComponentInstance);\n const responder = componentInstance.responder;\n \n if (target != null) {\n let fiber = getClosestInstanceFromNode(target);\n- const currentFiber = ((currentInstance: any): ReactEventComponentInstance)\n+ const currentFiber = ((currentInstance: any): ReactDOMEventComponentInstance)\n .currentFiber;\n while (fiber !== null) {\n if (fiber.tag === EventComponent) {\n@@ -284,7 +282,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n listenToResponderEventTypesImpl(rootEventTypes, activeDocument);\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n- const eventComponentInstance = ((currentInstance: any): ReactEventComponentInstance);\n+ const eventComponentInstance = ((currentInstance: any): ReactDOMEventComponentInstance);\n registerRootEventType(rootEventType, eventComponentInstance);\n }\n },\n@@ -315,14 +313,14 @@ const eventResponderContext: ReactDOMResponderContext = {\n let rootEventComponents = rootEventTypesToEventComponentInstances.get(\n listeningName,\n );\n- let rootEventTypesSet = ((currentInstance: any): ReactEventComponentInstance)\n+ let rootEventTypesSet = ((currentInstance: any): ReactDOMEventComponentInstance)\n .rootEventTypes;\n if (rootEventTypesSet !== null) {\n rootEventTypesSet.delete(listeningName);\n }\n if (rootEventComponents !== undefined) {\n rootEventComponents.delete(\n- ((currentInstance: any): ReactEventComponentInstance),\n+ ((currentInstance: any): ReactDOMEventComponentInstance),\n );\n }\n }\n@@ -343,7 +341,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n releaseOwnership(): boolean {\n validateResponderContext();\n return releaseOwnershipForEventComponentInstance(\n- ((currentInstance: any): ReactEventComponentInstance),\n+ ((currentInstance: any): ReactDOMEventComponentInstance),\n );\n },\n setTimeout(func: () => void, delay): number {\n@@ -366,7 +364,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n currentTimers.set(delay, timeout);\n }\n timeout.timers.set(timerId, {\n- instance: ((currentInstance: any): ReactEventComponentInstance),\n+ instance: ((currentInstance: any): ReactDOMEventComponentInstance),\n func,\n id: timerId,\n timeStamp: currentTimeStamp,\n@@ -389,7 +387,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n getFocusableElementsInScope(): Array {\n validateResponderContext();\n const focusableElements = [];\n- const eventComponentInstance = ((currentInstance: any): ReactEventComponentInstance);\n+ const eventComponentInstance = ((currentInstance: any): ReactDOMEventComponentInstance);\n const child = ((eventComponentInstance.currentFiber: any): Fiber).child;\n \n if (child !== null) {\n@@ -404,7 +402,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n const target = event.target;\n let fiber = getClosestInstanceFromNode(target);\n let hostComponent = target;\n- const currentResponder = ((currentInstance: any): ReactEventComponentInstance)\n+ const currentResponder = ((currentInstance: any): ReactDOMEventComponentInstance)\n .responder;\n \n while (fiber !== null) {\n@@ -433,7 +431,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n ): boolean {\n validateResponderContext();\n let fiber = getClosestInstanceFromNode(target);\n- const currentResponder = ((currentInstance: any): ReactEventComponentInstance)\n+ const currentResponder = ((currentInstance: any): ReactDOMEventComponentInstance)\n .responder;\n \n while (fiber !== null) {\n@@ -490,7 +488,7 @@ function getActiveDocument(): Document {\n }\n \n function releaseOwnershipForEventComponentInstance(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): boolean {\n if (globalOwner === eventComponentInstance) {\n globalOwner = null;\n@@ -679,8 +677,8 @@ function getDOMTargetEventTypesSet(\n \n function storeTargetEventResponderInstance(\n listeningName: string,\n- eventComponentInstance: ReactEventComponentInstance,\n- eventResponderInstances: Array,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n+ eventResponderInstances: Array,\n eventComponentResponders: null | Set,\n ): void {\n const responder = eventComponentInstance.responder;\n@@ -700,7 +698,7 @@ function storeTargetEventResponderInstance(\n function getTargetEventResponderInstances(\n listeningName: string,\n targetFiber: null | Fiber,\n-): Array {\n+): Array {\n \/\/ We use this to know if we should check add hooks. If there are\n \/\/ no event targets, then we don't add the hook forms.\n const eventComponentResponders = new Set();\n@@ -743,7 +741,7 @@ function getTargetEventResponderInstances(\n \n function getRootEventResponderInstances(\n listeningName: string,\n-): Array {\n+): Array {\n const eventResponderInstances = [];\n const rootEventInstances = rootEventTypesToEventComponentInstances.get(\n listeningName,\n@@ -760,7 +758,7 @@ function getRootEventResponderInstances(\n }\n \n function shouldSkipEventComponent(\n- eventResponderInstance: ReactEventComponentInstance,\n+ eventResponderInstance: ReactDOMEventComponentInstance,\n responder: ReactDOMEventResponder,\n propagatedEventResponders: null | Set,\n localPropagation: boolean,\n@@ -841,7 +839,7 @@ function traverseAndHandleEventResponderInstances(\n if (\n shouldSkipEventComponent(\n targetEventResponderInstance,\n- responder,\n+ ((responder: any): ReactDOMEventResponder),\n propagatedEventResponders,\n localPropagation,\n )\n@@ -874,7 +872,7 @@ function traverseAndHandleEventResponderInstances(\n if (\n shouldSkipEventComponent(\n targetEventResponderInstance,\n- responder,\n+ ((responder: any): ReactDOMEventResponder),\n propagatedEventResponders,\n localPropagation,\n )\n@@ -933,7 +931,8 @@ function triggerOwnershipListeners(): void {\n const instance = listeningInstances[i];\n const {props, responder, state} = instance;\n currentInstance = instance;\n- const onOwnershipChange = responder.onOwnershipChange;\n+ const onOwnershipChange = ((responder: any): ReactDOMEventResponder)\n+ .onOwnershipChange;\n if (onOwnershipChange !== undefined) {\n onOwnershipChange(eventResponderContext, props, state);\n }\n@@ -944,9 +943,9 @@ function triggerOwnershipListeners(): void {\n }\n \n export function mountEventResponder(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ) {\n- const responder = eventComponentInstance.responder;\n+ const responder = ((eventComponentInstance.responder: any): ReactDOMEventResponder);\n if (responder.onOwnershipChange !== undefined) {\n ownershipChangeListeners.add(eventComponentInstance);\n }\n@@ -966,9 +965,9 @@ export function mountEventResponder(\n }\n \n export function unmountEventResponder(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n- const responder = eventComponentInstance.responder;\n+ const responder = ((eventComponentInstance.responder: any): ReactDOMEventResponder);\n const onUnmount = responder.onUnmount;\n if (onUnmount !== undefined) {\n let {props, state} = eventComponentInstance;\n@@ -1054,7 +1053,7 @@ export function dispatchEventForResponderEventSystem(\n }\n \n export function addRootEventTypesForComponentInstance(\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n rootEventTypes: Array,\n ): void {\n for (let i = 0; i < rootEventTypes.length; i++) {\n@@ -1065,7 +1064,7 @@ export function addRootEventTypesForComponentInstance(\n \n function registerRootEventType(\n rootEventType: ReactDOMEventResponderEventType,\n- eventComponentInstance: ReactEventComponentInstance,\n+ eventComponentInstance: ReactDOMEventComponentInstance,\n ): void {\n let name = rootEventType;\n let passive = true;\ndiff --git a\/packages\/react-events\/src\/Drag.js b\/packages\/react-events\/src\/Drag.js\nindex ebe489b279..4f1bcbf6da 100644\n--- a\/packages\/react-events\/src\/Drag.js\n+++ b\/packages\/react-events\/src\/Drag.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n } from 'shared\/ReactDOMTypes';\n@@ -84,7 +85,7 @@ function dispatchDragEvent(\n context.dispatchEvent(syntheticEvent, listener, eventPriority);\n }\n \n-const DragResponder = {\n+const DragResponder: ReactDOMEventResponder = {\n displayName: 'Drag',\n targetEventTypes,\n createInitialState(): DragState {\ndiff --git a\/packages\/react-events\/src\/Focus.js b\/packages\/react-events\/src\/Focus.js\nindex 6f80e48221..0a41e66ed7 100644\n--- a\/packages\/react-events\/src\/Focus.js\n+++ b\/packages\/react-events\/src\/Focus.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n PointerType,\n@@ -216,7 +217,7 @@ function handleRootPointerEvent(\n \n let isGlobalFocusVisible = true;\n \n-const FocusResponder = {\n+const FocusResponder: ReactDOMEventResponder = {\n displayName: 'Focus',\n targetEventTypes,\n rootEventTypes,\ndiff --git a\/packages\/react-events\/src\/FocusScope.js b\/packages\/react-events\/src\/FocusScope.js\nindex 2f6cf4cb25..43a2a05f86 100644\n--- a\/packages\/react-events\/src\/FocusScope.js\n+++ b\/packages\/react-events\/src\/FocusScope.js\n@@ -7,6 +7,7 @@\n * @flow\n *\/\n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n } from 'shared\/ReactDOMTypes';\n@@ -45,7 +46,7 @@ function getFirstFocusableElement(\n }\n }\n \n-const FocusScopeResponder = {\n+const FocusScopeResponder: ReactDOMEventResponder = {\n displayName: 'FocusScope',\n targetEventTypes,\n rootEventTypes,\ndiff --git a\/packages\/react-events\/src\/Hover.js b\/packages\/react-events\/src\/Hover.js\nindex 23df751240..11b89382ae 100644\n--- a\/packages\/react-events\/src\/Hover.js\n+++ b\/packages\/react-events\/src\/Hover.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n } from 'shared\/ReactDOMTypes';\n@@ -273,7 +274,7 @@ function isEmulatedMouseEvent(event, state) {\n );\n }\n \n-const HoverResponder = {\n+const HoverResponder: ReactDOMEventResponder = {\n displayName: 'Hover',\n targetEventTypes,\n createInitialState() {\ndiff --git a\/packages\/react-events\/src\/Press.js b\/packages\/react-events\/src\/Press.js\nindex 0b120519da..9e07109b52 100644\n--- a\/packages\/react-events\/src\/Press.js\n+++ b\/packages\/react-events\/src\/Press.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n PointerType,\n@@ -622,7 +623,7 @@ function updateIsPressWithinResponderRegion(\n state.isPressWithinResponderRegion = isPressWithinResponderRegion;\n }\n \n-const PressResponder = {\n+const PressResponder: ReactDOMEventResponder = {\n displayName: 'Press',\n targetEventTypes,\n createInitialState(): PressState {\ndiff --git a\/packages\/react-events\/src\/Scroll.js b\/packages\/react-events\/src\/Scroll.js\nindex d66f976703..8fb6fa4f45 100644\n--- a\/packages\/react-events\/src\/Scroll.js\n+++ b\/packages\/react-events\/src\/Scroll.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n PointerType,\n@@ -116,7 +117,7 @@ function dispatchEvent(\n context.dispatchEvent(syntheticEvent, listener, eventPriority);\n }\n \n-const ScrollResponder = {\n+const ScrollResponder: ReactDOMEventResponder = {\n displayName: 'Scroll',\n targetEventTypes,\n createInitialState() {\ndiff --git a\/packages\/react-events\/src\/Swipe.js b\/packages\/react-events\/src\/Swipe.js\nindex 509cffd324..88d15aff88 100644\n--- a\/packages\/react-events\/src\/Swipe.js\n+++ b\/packages\/react-events\/src\/Swipe.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ ReactDOMEventResponder,\n ReactDOMResponderEvent,\n ReactDOMResponderContext,\n } from 'shared\/ReactDOMTypes';\n@@ -88,7 +89,7 @@ type SwipeState = {\n y: number,\n };\n \n-const SwipeResponder = {\n+const SwipeResponder: ReactDOMEventResponder = {\n displayName: 'Scroll',\n targetEventTypes,\n createInitialState(): SwipeState {\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\nindex 99b60bb4d6..6611f8dbbb 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n@@ -436,19 +436,19 @@ export function replaceContainerChildren(\n ): void {}\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-native-renderer\/src\/ReactNativeHostConfig.js b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\nindex 9f9a6a941a..d03914170c 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n@@ -497,19 +497,19 @@ export function unhideTextInstance(\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-reconciler\/src\/ReactFiber.js b\/packages\/react-reconciler\/src\/ReactFiber.js\nindex 12ff5ee55e..78f0f38d7e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.js\n@@ -106,7 +106,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\n@@ -682,7 +682,7 @@ export function createFiberFromFragment(\n }\n \n export function createFiberFromEventComponent(\n- eventComponent: ReactEventComponent,\n+ eventComponent: ReactEventComponent,\n pendingProps: any,\n mode: TypeOfMode,\n expirationTime: ExpirationTime,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex 4b2699d38c..5f7cef164b 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -1013,7 +1013,11 @@ function completeWork(\n popHostContext(workInProgress);\n const rootContainerInstance = getRootHostContainer();\n const responder = workInProgress.type.responder;\n- let eventComponentInstance: ReactEventComponentInstance | null =\n+ let eventComponentInstance: ReactEventComponentInstance<\n+ any,\n+ any,\n+ any,\n+ > | null =\n workInProgress.stateNode;\n \n if (eventComponentInstance === null) {\n@@ -1036,7 +1040,7 @@ function completeWork(\n newProps,\n responder,\n rootContainerInstance,\n- responderState,\n+ responderState || {},\n true,\n );\n markUpdate(workInProgress);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberEvents.js b\/packages\/react-reconciler\/src\/ReactFiberEvents.js\nindex 2c9a9bdef9..c9c35f0477 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberEvents.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberEvents.js\n@@ -8,8 +8,10 @@\n *\/\n \n import type {Fiber, Dependencies} from '.\/ReactFiber';\n-import type {ReactEventComponentInstance} from 'shared\/ReactTypes';\n-import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';\n+import type {\n+ ReactEventResponder,\n+ ReactEventComponentInstance,\n+} from 'shared\/ReactTypes';\n \n import {\n HostComponent,\n@@ -29,9 +31,9 @@ export function prepareToReadEventComponents(workInProgress: Fiber): void {\n currentEventComponentInstanceIndex = 0;\n }\n \n-export function updateEventComponentInstance(\n- responder: EventResponder,\n- props: null | Object,\n+export function updateEventComponentInstance(\n+ responder: ReactEventResponder,\n+ props: Object,\n ): void {\n invariant(\n responder.allowEventHooks,\n@@ -64,7 +66,7 @@ export function updateEventComponentInstance(\n props,\n responder,\n null,\n- responderState,\n+ responderState || {},\n false,\n );\n events.push(eventComponentInstance);\n@@ -77,14 +79,14 @@ export function updateEventComponentInstance(\n }\n }\n \n-export function createEventComponentInstance(\n+export function createEventComponentInstance(\n currentFiber: Fiber,\n- props: null | Object,\n- responder: EventResponder,\n+ props: Object,\n+ responder: ReactEventResponder,\n rootInstance: mixed,\n- state: null | Object,\n+ state: Object,\n localPropagation: boolean,\n-): ReactEventComponentInstance {\n+): ReactEventComponentInstance {\n return {\n currentFiber,\n localPropagation,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex 1a74bda0f5..7f9372bdc7 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -7,13 +7,12 @@\n * @flow\n *\/\n \n-import type {ReactContext} from 'shared\/ReactTypes';\n+import type {ReactEventResponder, ReactContext} from 'shared\/ReactTypes';\n import type {SideEffectTag} from 'shared\/ReactSideEffectTags';\n import type {Fiber} from '.\/ReactFiber';\n import type {ExpirationTime} from '.\/ReactFiberExpirationTime';\n import type {HookEffectTag} from '.\/ReactHookEffectTags';\n import type {SuspenseConfig} from '.\/ReactFiberSuspenseConfig';\n-import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';\n \n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n \n@@ -83,7 +82,10 @@ export type Dispatcher = {\n deps: Array | void | null,\n ): void,\n useDebugValue(value: T, formatterFn: ?(value: T) => mixed): void,\n- useEvent(responder: EventResponder, props: null | Object): void,\n+ useEvent(\n+ responder: ReactEventResponder,\n+ props: Object,\n+ ): void,\n };\n \n type Update = {\n@@ -1397,7 +1399,7 @@ if (__DEV__) {\n mountHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(responder, props) {\n+ useEvent(responder: ReactEventResponder, props) {\n currentHookNameInDev = 'useEvent';\n mountHookTypesDev();\n updateEventComponentInstance(responder, props);\n@@ -1499,7 +1501,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(responder, props) {\n+ useEvent(responder: ReactEventResponder, props) {\n currentHookNameInDev = 'useEvent';\n updateHookTypesDev();\n updateEventComponentInstance(responder, props);\n@@ -1601,7 +1603,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return updateDebugValue(value, formatterFn);\n },\n- useEvent(responder, props) {\n+ useEvent(responder: ReactEventResponder, props) {\n currentHookNameInDev = 'useEvent';\n updateHookTypesDev();\n updateEventComponentInstance(responder, props);\n@@ -1714,7 +1716,7 @@ if (__DEV__) {\n mountHookTypesDev();\n return mountDebugValue(value, formatterFn);\n },\n- useEvent(responder, props) {\n+ useEvent(responder: ReactEventResponder, props) {\n currentHookNameInDev = 'useEvent';\n warnInvalidHookAccess();\n mountHookTypesDev();\n@@ -1828,7 +1830,7 @@ if (__DEV__) {\n updateHookTypesDev();\n return updateDebugValue(value, formatterFn);\n },\n- useEvent(responder, props) {\n+ useEvent(responder: ReactEventResponder, 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 ea1b86bcbb..cf2ce070e5 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n@@ -329,19 +329,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 3227dda3f1..55da95160a 100644\n--- a\/packages\/react\/src\/ReactHooks.js\n+++ b\/packages\/react\/src\/ReactHooks.js\n@@ -7,8 +7,7 @@\n * @flow\n *\/\n \n-import type {ReactContext} from 'shared\/ReactTypes';\n-import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';\n+import type {ReactEventResponder, ReactContext} from 'shared\/ReactTypes';\n import invariant from 'shared\/invariant';\n import warning from 'shared\/warning';\n \n@@ -137,7 +136,12 @@ export function useDebugValue(value: any, formatterFn: ?(value: any) => any) {\n }\n }\n \n-export function useEvent(responder: EventResponder, props: null | Object) {\n+export const emptyObject = {};\n+\n+export function useEvent(\n+ responder: ReactEventResponder,\n+ props: null | Object,\n+) {\n const dispatcher = resolveDispatcher();\n- return dispatcher.useEvent(responder, props);\n+ return dispatcher.useEvent(responder, props || emptyObject);\n }\ndiff --git a\/packages\/shared\/ReactDOMTypes.js b\/packages\/shared\/ReactDOMTypes.js\nindex e2383f6ad7..d5612c5503 100644\n--- a\/packages\/shared\/ReactDOMTypes.js\n+++ b\/packages\/shared\/ReactDOMTypes.js\n@@ -7,7 +7,11 @@\n * @flow\n *\/\n \n-import type {EventPriority} from 'shared\/ReactTypes';\n+import type {\n+ ReactEventResponder,\n+ ReactEventComponentInstance,\n+ EventPriority,\n+} from 'shared\/ReactTypes';\n \n type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;\n \n@@ -33,47 +37,17 @@ export type ReactDOMResponderEvent = {\n type: string,\n };\n \n-export type ReactDOMEventResponder = {\n- displayName: string,\n- targetEventTypes?: Array,\n- rootEventTypes?: Array,\n- createInitialState?: (props: null | Object) => Object,\n- allowMultipleHostChildren: boolean,\n- allowEventHooks: boolean,\n- onEvent?: (\n- event: ReactDOMResponderEvent,\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\n- onEventCapture?: (\n- event: ReactDOMResponderEvent,\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\n- onRootEvent?: (\n- event: ReactDOMResponderEvent,\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\n- onMount?: (\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\n- onUnmount?: (\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\n- onOwnershipChange?: (\n- context: ReactDOMResponderContext,\n- props: null | Object,\n- state: null | Object,\n- ) => void,\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 \n export type ReactDOMResponderContext = {\n dispatchEvent: (\ndiff --git a\/packages\/shared\/ReactTypes.js b\/packages\/shared\/ReactTypes.js\nindex 5242226053..f74111ab0e 100644\n--- a\/packages\/shared\/ReactTypes.js\n+++ b\/packages\/shared\/ReactTypes.js\n@@ -7,9 +7,6 @@\n * @flow\n *\/\n \n-\/\/ NOTE: this line is changed in the RN build, see: copyRNShims in packaging.js\n-import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';\n-\n export type ReactNode =\n | React$Element\n | ReactPortal\n@@ -17,7 +14,7 @@ export type ReactNode =\n | ReactFragment\n | ReactProvider\n | ReactConsumer\n- | ReactEventComponent\n+ | ReactEventComponent\n | ReactEventTarget;\n \n export type ReactEmpty = null | void | boolean;\n@@ -84,20 +81,34 @@ export type RefObject = {|\n current: any,\n |};\n \n-export type ReactEventComponentInstance = {|\n+export type ReactEventComponentInstance = {|\n currentFiber: mixed,\n localPropagation: boolean,\n- props: null | Object,\n- responder: EventResponder,\n+ props: Object,\n+ responder: ReactEventResponder,\n rootEventTypes: null | Set,\n rootInstance: null | mixed,\n- state: null | Object,\n+ state: Object,\n |};\n \n-export type ReactEventComponent = {|\n+export type ReactEventResponder = {\n+ displayName: string,\n+ targetEventTypes?: Array,\n+ rootEventTypes?: Array,\n+ createInitialState?: (props: Object) => Object,\n+ allowMultipleHostChildren: boolean,\n+ allowEventHooks: boolean,\n+ onEvent?: (event: E, context: C, props: Object, state: Object) => void,\n+ onEventCapture?: (event: E, context: C, props: Object, state: Object) => void,\n+ onRootEvent?: (event: E, context: C, props: Object, state: Object) => void,\n+ onMount?: (context: C, props: Object, state: Object) => void,\n+ onUnmount?: (context: C, props: Object, state: Object) => void,\n+ onOwnershipChange?: (context: C, props: Object, state: Object) => void,\n+};\n+\n+export type ReactEventComponent = {|\n $$typeof: Symbol | number,\n- props: null | Object,\n- responder: EventResponder,\n+ responder: ReactEventResponder,\n |};\n \n export type ReactEventTarget = {|\ndiff --git a\/packages\/shared\/createEventComponent.js b\/packages\/shared\/createEventComponent.js\nindex 9398e39fe1..faea980806 100644\n--- a\/packages\/shared\/createEventComponent.js\n+++ b\/packages\/shared\/createEventComponent.js\n@@ -6,8 +6,7 @@\n * @flow\n *\/\n \n-import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';\n-import type {ReactEventComponent} from 'shared\/ReactTypes';\n+import type {ReactEventResponder, ReactEventComponent} from 'shared\/ReactTypes';\n import {REACT_EVENT_COMPONENT_TYPE} from 'shared\/ReactSymbols';\n \n let hasBadMapPolyfill;\n@@ -29,9 +28,9 @@ if (__DEV__) {\n }\n }\n \n-export default function createEventComponent(\n- responder: EventResponder,\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.\n@@ -40,7 +39,6 @@ export default function createEventComponent(\n }\n const eventComponent = {\n $$typeof: REACT_EVENT_COMPONENT_TYPE,\n- props: null,\n responder: responder,\n };\n if (__DEV__) {\ndiff --git a\/packages\/shared\/getComponentName.js b\/packages\/shared\/getComponentName.js\nindex 1727f43cc6..573dbdc2ea 100644\n--- a\/packages\/shared\/getComponentName.js\n+++ b\/packages\/shared\/getComponentName.js\n@@ -27,7 +27,7 @@ import {\n REACT_EVENT_TARGET_TOUCH_HIT,\n } from 'shared\/ReactSymbols';\n import {refineResolvedLazyComponent} from 'shared\/ReactLazyComponent';\n-import type {ReactEventComponent, ReactEventTarget} from 'shared\/ReactTypes';\n+import type {ReactEventTarget} from 'shared\/ReactTypes';\n \n import {enableEventAPI} from '.\/ReactFeatureFlags';\n \n@@ -97,8 +97,7 @@ function getComponentName(type: mixed): string | null {\n }\n case REACT_EVENT_COMPONENT_TYPE: {\n if (enableEventAPI) {\n- const eventComponent = ((type: any): ReactEventComponent);\n- return eventComponent.responder.displayName;\n+ return (type: any).responder.displayName;\n }\n break;\n }\ndiff --git a\/scripts\/rollup\/packaging.js b\/scripts\/rollup\/packaging.js\nindex e3dda6955c..840e290f23 100644\n--- a\/scripts\/rollup\/packaging.js\n+++ b\/scripts\/rollup\/packaging.js\n@@ -1,12 +1,6 @@\n 'use strict';\n \n-const {\n- existsSync,\n- readdirSync,\n- unlinkSync,\n- readFileSync,\n- writeFileSync,\n-} = require('fs');\n+const {existsSync, readdirSync, unlinkSync} = require('fs');\n const Bundles = require('.\/bundles');\n const {\n asyncCopyTo,\n@@ -103,12 +97,6 @@ async function copyRNShims() {\n 'build\/react-native\/shims\/ReactNativeTypes.js'\n ),\n ]);\n- \/\/ Modify the EventResponder type in ReactTypes\n- const reactTypesSource = readFileSync(reactTypesBuildTarget, 'utf8');\n- const original = `import type {EventResponder} from 'react-reconciler\/src\/ReactFiberHostConfig';`;\n- const changeTo = `import type {ReactNativeEventResponder as EventResponder} from '.\/ReactNativeTypes';`;\n- const modifiedSource = reactTypesSource.replace(original, changeTo);\n- writeFileSync(reactTypesBuildTarget, modifiedSource);\n }\n \n async function copyAllShims() {\n","body":"","parents":["4f92fbce5cc409436ec7625ac08d3a709a4d8f31"],"commit":{"authorEmail":"trueadm@users.noreply.github.com","subject":"[Flare] Refine flow type annotations (#15950)","shortRevision":"34ce57ae75","authorName":"Dominic Gannaway","authoredAt":"2019-06-21T12:32:43+01:00","revision":"34ce57ae751e0952fd12ab532a3e5694445897ea"},"files":[{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMEventResponderSystem.js","status":"M"},{"path":"packages\/react-events\/src\/Drag.js","status":"M"},{"path":"packages\/react-events\/src\/Focus.js","status":"M"},{"path":"packages\/react-events\/src\/FocusScope.js","status":"M"},{"path":"packages\/react-events\/src\/Hover.js","status":"M"},{"path":"packages\/react-events\/src\/Press.js","status":"M"},{"path":"packages\/react-events\/src\/Scroll.js","status":"M"},{"path":"packages\/react-events\/src\/Swipe.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-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\/getComponentName.js","status":"M"},{"path":"scripts\/rollup\/packaging.js","status":"M"}]}

dillon1000/react

Files changed