{"files":[{"path":"packages\/events\/ReactGenericBatching.js","status":"M"},{"path":"packages\/react-art\/src\/ReactARTHostConfig.js","status":"M"},{"path":"packages\/react-debug-tools\/src\/ReactDebugHooks.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMEventResponderSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/__tests__\/DOMEventResponderSystem-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactPartialRenderer.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactPartialRendererHooks.js","status":"M"},{"path":"packages\/react-dom\/src\/shared\/ReactControlledValuePropTypes.js","status":"M"},{"path":"packages\/react-events\/README.md","status":"M"},{"path":"packages\/react-events\/docs\/Press.md","status":"M"},{"path":"packages\/react-events\/focus-scope.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\/Hover.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Input.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Press.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Scroll.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/Swipe.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Drag-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Focus-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/FocusScope-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Hover-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Input-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Press-test.internal.js","status":"M"},{"path":"packages\/react-events\/src\/dom\/__tests__\/Scroll-test.internal.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-noop-renderer\/src\/createReactNoop.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiber.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCommitWork.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-reconciler\/src\/ReactFiberHostContext.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberNewContext.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberUnwindWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactFiberEvents-test.internal.js","status":"D"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactFiberHostContext-test.internal.js","status":"M"},{"path":"packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/ReactShallowRenderer.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/ReactTestHostConfig.js","status":"M"},{"path":"packages\/react\/src\/React.js","status":"M"},{"path":"packages\/react\/src\/ReactHooks.js","status":"M"},{"path":"packages\/shared\/ReactDOMTypes.js","status":"M"},{"path":"packages\/shared\/ReactSymbols.js","status":"M"},{"path":"packages\/shared\/ReactTypes.js","status":"M"},{"path":"packages\/shared\/ReactWorkTags.js","status":"M"},{"path":"packages\/shared\/createEventComponent.js","status":"D"},{"path":"packages\/shared\/createEventResponder.js","status":"A"},{"path":"packages\/shared\/getComponentName.js","status":"M"},{"path":"packages\/shared\/isValidElementType.js","status":"M"},{"path":"scripts\/error-codes\/codes.json","status":"M"}],"commit":{"shortRevision":"5098891193","authorEmail":"trueadm@users.noreply.github.com","authoredAt":"2019-07-23T23:46:44+01:00","subject":"[Flare] Redesign core event system (#16163)","revision":"509889119360ed83ca6ef3f83bcf01e5aa7dcd81","authorName":"Dominic Gannaway"},"parents":["19354db511e74d96a1c8b6d8b589a72f025da498"],"patch":"diff --git a\/packages\/events\/ReactGenericBatching.js b\/packages\/events\/ReactGenericBatching.js\nindex b65b40006e..e92f15b7af 100644\n--- a\/packages\/events\/ReactGenericBatching.js\n+++ b\/packages\/events\/ReactGenericBatching.js\n@@ -59,15 +59,15 @@ export function batchedUpdates(fn, bookkeeping) {\n }\n }\n \n-export function batchedEventUpdates(fn, bookkeeping) {\n+export function batchedEventUpdates(fn, a, b) {\n if (isInsideEventHandler) {\n \/\/ If we are currently inside another batch, we need to wait until it\n \/\/ fully completes before restoring state.\n- return fn(bookkeeping);\n+ return fn(a, b);\n }\n isInsideEventHandler = true;\n try {\n- return batchedEventUpdatesImpl(fn, bookkeeping);\n+ return batchedEventUpdatesImpl(fn, a, b);\n } finally {\n isInsideEventHandler = false;\n finishEventHandler();\ndiff --git a\/packages\/react-art\/src\/ReactARTHostConfig.js b\/packages\/react-art\/src\/ReactARTHostConfig.js\nindex 11df9690f7..231ee89205 100644\n--- a\/packages\/react-art\/src\/ReactARTHostConfig.js\n+++ b\/packages\/react-art\/src\/ReactARTHostConfig.js\n@@ -10,7 +10,10 @@ import Mode from 'art\/modes\/current';\n import invariant from 'shared\/invariant';\n \n import {TYPES, EVENT_TYPES, childrenAsString} from '.\/ReactARTInternals';\n-import type {ReactEventComponentInstance} from 'shared\/ReactTypes';\n+import type {\n+ ReactEventResponder,\n+ ReactEventResponderInstance,\n+} from 'shared\/ReactTypes';\n \n const pooledTransform = new Transform();\n \n@@ -329,10 +332,6 @@ export function getChildHostContext() {\n return NO_CONTEXT;\n }\n \n-export function getChildHostContextForEventComponent() {\n- return NO_CONTEXT;\n-}\n-\n export const scheduleTimeout = setTimeout;\n export const cancelTimeout = clearTimeout;\n export const noTimeout = -1;\n@@ -427,20 +426,19 @@ export function unhideTextInstance(textInstance, text): void {\n \/\/ Noop\n }\n \n-export function mountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n-) {\n- throw new Error('Not yet implemented.');\n-}\n-\n-export function updateEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+export function mountResponderInstance(\n+ responder: ReactEventResponder,\n+ responderInstance: ReactEventResponderInstance,\n+ props: Object,\n+ state: Object,\n+ instance: Object,\n+ rootContainerInstance: Object,\n ) {\n throw new Error('Not yet implemented.');\n }\n \n-export function unmountEventComponent(\n- eventComponentInstance: ReactEventComponentInstance,\n+export function unmountResponderInstance(\n+ responderInstance: ReactEventResponderInstance,\n ): void {\n throw new Error('Not yet implemented.');\n }\ndiff --git a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\nindex 2e029d382e..b49813d708 100644\n--- a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n+++ b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n@@ -215,7 +215,7 @@ function useMemo(\n return value;\n }\n \n-function useEvent() {\n+function useListener() {\n throw new Error('TODO: not yet implemented');\n }\n \n@@ -231,7 +231,7 @@ const Dispatcher: DispatcherType = {\n useReducer,\n useRef,\n useState,\n- useEvent,\n+ useListener,\n };\n \n \/\/ Inspect\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex af580be510..55db92a52f 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -98,6 +98,7 @@ const AUTOFOCUS = 'autoFocus';\n const CHILDREN = 'children';\n const STYLE = 'style';\n const HTML = '__html';\n+const RESPONDERS = 'responders';\n \n const {html: HTML_NAMESPACE} = Namespaces;\n \n@@ -340,6 +341,7 @@ function setInitialDOMProperties(\n setTextContent(domElement, '' + nextProp);\n }\n } else if (\n+ (enableFlareAPI && propKey === RESPONDERS) ||\n propKey === SUPPRESS_CONTENT_EDITABLE_WARNING ||\n propKey === SUPPRESS_HYDRATION_WARNING\n ) {\n@@ -696,6 +698,7 @@ export function diffProperties(\n } else if (propKey === DANGEROUSLY_SET_INNER_HTML || propKey === CHILDREN) {\n \/\/ Noop. This is handled by the clear text mechanism.\n } else if (\n+ (enableFlareAPI && propKey === RESPONDERS) ||\n propKey === SUPPRESS_CONTENT_EDITABLE_WARNING ||\n propKey === SUPPRESS_HYDRATION_WARNING\n ) {\n@@ -787,6 +790,7 @@ export function diffProperties(\n (updatePayload = updatePayload || []).push(propKey, '' + nextProp);\n }\n } else if (\n+ (enableFlareAPI && propKey === RESPONDERS) ||\n propKey === SUPPRESS_CONTENT_EDITABLE_WARNING ||\n propKey === SUPPRESS_HYDRATION_WARNING\n ) {\n@@ -1041,6 +1045,7 @@ export function diffHydratedProperties(\n if (suppressHydrationWarning) {\n \/\/ Don't bother comparing. We're ignoring all these warnings.\n } else if (\n+ (enableFlareAPI && propKey === RESPONDERS) ||\n propKey === SUPPRESS_CONTENT_EDITABLE_WARNING ||\n propKey === SUPPRESS_HYDRATION_WARNING ||\n \/\/ Controlled attributes are not validated\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 901b2413b9..48425c1c8d 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -44,11 +44,11 @@ import dangerousStyleValue from '..\/shared\/dangerousStyleValue';\n import type {DOMContainer} from '.\/ReactDOM';\n import type {\n ReactDOMEventResponder,\n- ReactDOMEventComponentInstance,\n+ ReactDOMEventResponderInstance,\n ReactDOMFundamentalComponentInstance,\n } from 'shared\/ReactDOMTypes';\n import {\n- addRootEventTypesForComponentInstance,\n+ addRootEventTypesForResponderInstance,\n mountEventResponder,\n unmountEventResponder,\n } from '..\/events\/DOMEventResponderSystem';\n@@ -90,9 +90,6 @@ export type PublicInstance = Element | Text;\n type HostContextDev = {\n namespace: string,\n ancestorInfo: mixed,\n- eventData: null | {|\n- isEventComponent?: boolean,\n- |},\n };\n type HostContextProd = string;\n export type HostContext = HostContextDev | HostContextProd;\n@@ -106,7 +103,6 @@ import {\n enableFlareAPI,\n enableFundamentalAPI,\n } from 'shared\/ReactFeatureFlags';\n-import warning from 'shared\/warning';\n \n let SUPPRESS_HYDRATION_WARNING;\n if (__DEV__) {\n@@ -164,7 +160,7 @@ export function getRootHostContext(\n if (__DEV__) {\n const validatedTag = type.toLowerCase();\n const ancestorInfo = updatedAncestorInfo(null, validatedTag);\n- return {namespace, ancestorInfo, eventData: null};\n+ return {namespace, ancestorInfo};\n }\n return namespace;\n }\n@@ -181,26 +177,12 @@ export function getChildHostContext(\n parentHostContextDev.ancestorInfo,\n type,\n );\n- return {namespace, ancestorInfo, eventData: null};\n+ return {namespace, ancestorInfo};\n }\n const parentNamespace = ((parentHostContext: any): HostContextProd);\n return getChildNamespace(parentNamespace, type);\n }\n \n-export function getChildHostContextForEventComponent(\n- parentHostContext: HostContext,\n-): HostContext {\n- if (__DEV__) {\n- const parentHostContextDev = ((parentHostContext: any): HostContextDev);\n- const {namespace, ancestorInfo} = parentHostContextDev;\n- const eventData = {\n- isEventComponent: true,\n- };\n- return {namespace, ancestorInfo, eventData};\n- }\n- return parentHostContext;\n-}\n-\n export function getPublicInstance(instance: Instance): * {\n return instance;\n }\n@@ -332,17 +314,6 @@ export function createTextInstance(\n if (__DEV__) {\n const hostContextDev = ((hostContext: any): HostContextDev);\n validateDOMNesting(null, text, hostContextDev.ancestorInfo);\n- if (enableFlareAPI) {\n- const eventData = hostContextDev.eventData;\n- if (eventData !== null) {\n- warning(\n- !eventData.isEventComponent,\n- 'validateDOMNesting: React event components cannot have text DOM nodes as children. ' +\n- 'Wrap the child text \"%s\" in an element.',\n- text,\n- );\n- }\n- }\n }\n const textNode: TextInstance = createTextNode(text, rootContainerInstance);\n precacheFiberNode(internalInstanceHandle, textNode);\n@@ -844,44 +815,43 @@ export function didNotFindHydratableSuspenseInstance(\n }\n }\n \n-export function mountEventComponent(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n-): void {\n- if (enableFlareAPI) {\n- const rootContainerInstance = ((eventComponentInstance.rootInstance: any): Container);\n- const doc = rootContainerInstance.ownerDocument;\n- const documentBody = doc.body || doc;\n- const responder = eventComponentInstance.responder;\n- const {\n- rootEventTypes,\n- targetEventTypes,\n- } = ((responder: any): ReactDOMEventResponder);\n- if (targetEventTypes !== undefined) {\n- listenToEventResponderEventTypes(targetEventTypes, documentBody);\n- }\n- if (rootEventTypes !== undefined) {\n- addRootEventTypesForComponentInstance(\n- eventComponentInstance,\n- rootEventTypes,\n- );\n- listenToEventResponderEventTypes(rootEventTypes, documentBody);\n- }\n- mountEventResponder(eventComponentInstance);\n- }\n-}\n-\n-export function updateEventComponent(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n-): void {\n- \/\/ NO-OP, why might use this in the future\n+export function mountResponderInstance(\n+ responder: ReactDOMEventResponder,\n+ responderInstance: ReactDOMEventResponderInstance,\n+ responderProps: Object,\n+ responderState: Object,\n+ instance: Instance,\n+ rootContainerInstance: Container,\n+): ReactDOMEventResponderInstance {\n+ \/\/ Listen to events\n+ const doc = rootContainerInstance.ownerDocument;\n+ const documentBody = doc.body || doc;\n+ const {\n+ rootEventTypes,\n+ targetEventTypes,\n+ } = ((responder: any): ReactDOMEventResponder);\n+ if (targetEventTypes !== null) {\n+ listenToEventResponderEventTypes(targetEventTypes, documentBody);\n+ }\n+ if (rootEventTypes !== null) {\n+ addRootEventTypesForResponderInstance(responderInstance, rootEventTypes);\n+ listenToEventResponderEventTypes(rootEventTypes, documentBody);\n+ }\n+ mountEventResponder(\n+ responder,\n+ responderInstance,\n+ responderProps,\n+ responderState,\n+ );\n+ return responderInstance;\n }\n \n-export function unmountEventComponent(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+export function unmountResponderInstance(\n+ responderInstance: ReactDOMEventResponderInstance,\n ): void {\n if (enableFlareAPI) {\n \/\/ TODO stop listening to targetEventTypes\n- unmountEventResponder(eventComponentInstance);\n+ unmountEventResponder(responderInstance);\n }\n }\n \ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\nindex a318f90ab2..5c8885ecb9 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n@@ -13,14 +13,15 @@ import {\n } from 'events\/EventSystemFlags';\n import type {AnyNativeEvent} from 'events\/PluginModuleType';\n import {\n- EventComponent,\n HostComponent,\n FunctionComponent,\n+ MemoComponent,\n+ ForwardRef,\n } from 'shared\/ReactWorkTags';\n import type {EventPriority} from 'shared\/ReactTypes';\n import type {\n ReactDOMEventResponder,\n- ReactDOMEventComponentInstance,\n+ ReactDOMEventResponderInstance,\n ReactDOMResponderContext,\n ReactDOMResponderEvent,\n } from 'shared\/ReactDOMTypes';\n@@ -65,17 +66,11 @@ export function setListenToResponderEventTypes(\n listenToResponderEventTypesImpl = _listenToResponderEventTypesImpl;\n }\n \n-type EventObjectType = $Shape;\n-\n-type EventQueue = {\n- events: Array,\n- eventPriority: EventPriority,\n-};\n-\n-type PartialEventObject = {\n- target: Element | Document,\n- type: string,\n-};\n+type EventQueueItem = {|\n+ listeners: Array<(val: any) => void>,\n+ value: any,\n+|};\n+type EventQueue = Array;\n \n type ResponderTimeout = {|\n id: TimeoutID,\n@@ -83,114 +78,59 @@ type ResponderTimeout = {|\n |};\n \n type ResponderTimer = {|\n- isHook: boolean,\n- instance: ReactDOMEventComponentInstance,\n+ instance: ReactDOMEventResponderInstance,\n func: () => void,\n id: number,\n timeStamp: number,\n |};\n \n const activeTimeouts: Map = new Map();\n-const rootEventTypesToEventComponentInstances: Map<\n+const rootEventTypesToEventResponderInstances: Map<\n DOMTopLevelEventType | string,\n- Set,\n+ Set,\n > = new Map();\n-const ownershipChangeListeners: Set = new Set();\n-const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n-const eventListeners:\n- | WeakMap\n- | Map<\n- $Shape,\n- ($Shape) => void,\n- > = new PossiblyWeakMap();\n+const ownershipChangeListeners: Set = new Set();\n \n let globalOwner = null;\n-let continueLocalPropagation = false;\n \n let currentTimeStamp = 0;\n let currentTimers = new Map();\n-let currentInstance: null | ReactDOMEventComponentInstance = null;\n+let currentInstance: null | ReactDOMEventResponderInstance = null;\n let currentEventQueue: null | EventQueue = null;\n+let currentEventQueuePriority: EventPriority = ContinuousEvent;\n let currentTimerIDCounter = 0;\n let currentDocument: null | Document = null;\n-let currentlyInHook = false;\n \n const eventResponderContext: ReactDOMResponderContext = {\n dispatchEvent(\n- possibleEventObject: Object,\n- listener: ($Shape) => void,\n+ eventProp: string,\n+ eventValue: any,\n eventPriority: EventPriority,\n ): void {\n validateResponderContext();\n- const {target, type, timeStamp} = possibleEventObject;\n-\n- if (target == null || type == null || timeStamp == null) {\n- throw new Error(\n- 'context.dispatchEvent: \"target\", \"timeStamp\", and \"type\" fields on event object are required.',\n+ validateEventValue(eventValue);\n+ if (eventPriority < currentEventQueuePriority) {\n+ currentEventQueuePriority = eventPriority;\n+ }\n+ const responderInstance = ((currentInstance: any): ReactDOMEventResponderInstance);\n+ const target = responderInstance.fiber;\n+ const responder = responderInstance.responder;\n+ const listeners = collectListeners(eventProp, responder, target);\n+ if (listeners.length !== 0) {\n+ ((currentEventQueue: any): EventQueue).push(\n+ createEventQueueItem(eventValue, listeners),\n );\n }\n- const showWarning = name => {\n- if (__DEV__) {\n- warning(\n- false,\n- '%s is not available on event objects created from event responder modules (React Flare). ' +\n- 'Try wrapping in a conditional, i.e. `if (event.type !== \"press\") { event.%s }`',\n- name,\n- name,\n- );\n- }\n- };\n- possibleEventObject.preventDefault = () => {\n- if (__DEV__) {\n- showWarning('preventDefault()');\n- }\n- };\n- possibleEventObject.stopPropagation = () => {\n- if (__DEV__) {\n- showWarning('stopPropagation()');\n- }\n- };\n- possibleEventObject.isDefaultPrevented = () => {\n- if (__DEV__) {\n- showWarning('isDefaultPrevented()');\n- }\n- };\n- possibleEventObject.isPropagationStopped = () => {\n- if (__DEV__) {\n- showWarning('isPropagationStopped()');\n- }\n- };\n- \/\/ $FlowFixMe: we don't need value, Flow thinks we do\n- Object.defineProperty(possibleEventObject, 'nativeEvent', {\n- get() {\n- if (__DEV__) {\n- showWarning('nativeEvent');\n- }\n- },\n- });\n-\n- const eventObject = ((possibleEventObject: any): $Shape<\n- PartialEventObject,\n- >);\n- const eventQueue = ((currentEventQueue: any): EventQueue);\n- eventQueue.eventPriority = eventPriority;\n- eventListeners.set(eventObject, listener);\n- eventQueue.events.push(eventObject);\n },\n- isTargetWithinEventComponent(target: Element | Document): boolean {\n+ isTargetWithinResponder(target: Element | Document): boolean {\n validateResponderContext();\n if (target != null) {\n let fiber = getClosestInstanceFromNode(target);\n- const currentFiber = ((currentInstance: any): ReactDOMEventComponentInstance)\n- .currentFiber;\n+ const responderFiber = ((currentInstance: any): ReactDOMEventResponderInstance)\n+ .fiber;\n \n while (fiber !== null) {\n- const stateNode = fiber.stateNode;\n- if (fiber.tag === EventComponent && stateNode !== null) {\n- \/\/ Switch to the current fiber tree\n- fiber = stateNode.currentFiber;\n- }\n- if (fiber === currentFiber || stateNode === currentInstance) {\n+ if (fiber === responderFiber || fiber.alternate === responderFiber) {\n return true;\n }\n fiber = fiber.return;\n@@ -198,28 +138,21 @@ const eventResponderContext: ReactDOMResponderContext = {\n }\n return false;\n },\n- isTargetWithinEventResponderScope(target: Element | Document): boolean {\n+ isTargetWithinResponderScope(target: Element | Document): boolean {\n validateResponderContext();\n- const componentInstance = ((currentInstance: any): ReactDOMEventComponentInstance);\n+ const componentInstance = ((currentInstance: any): ReactDOMEventResponderInstance);\n const responder = componentInstance.responder;\n \n if (target != null) {\n let fiber = getClosestInstanceFromNode(target);\n- const currentFiber = ((currentInstance: any): ReactDOMEventComponentInstance)\n- .currentFiber;\n+ const responderFiber = ((currentInstance: any): ReactDOMEventResponderInstance)\n+ .fiber;\n+\n while (fiber !== null) {\n- const stateNode = fiber.stateNode;\n- if (fiber.tag === EventComponent && stateNode !== null) {\n- \/\/ Switch to the current fiber tree\n- fiber = stateNode.currentFiber;\n- }\n- if (fiber === currentFiber || stateNode === currentInstance) {\n+ if (fiber === responderFiber || fiber.alternate === responderFiber) {\n return true;\n }\n- if (\n- fiber.tag === EventComponent &&\n- (stateNode === null || stateNode.responder === responder)\n- ) {\n+ if (doesFiberHaveResponder(fiber, responder)) {\n return false;\n }\n fiber = fiber.return;\n@@ -251,25 +184,25 @@ 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): ReactDOMEventComponentInstance);\n- registerRootEventType(rootEventType, eventComponentInstance);\n+ const eventResponderInstance = ((currentInstance: any): ReactDOMEventResponderInstance);\n+ registerRootEventType(rootEventType, eventResponderInstance);\n }\n },\n removeRootEventTypes(rootEventTypes: Array): void {\n validateResponderContext();\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n- let rootEventComponents = rootEventTypesToEventComponentInstances.get(\n+ let rootEventComponents = rootEventTypesToEventResponderInstances.get(\n rootEventType,\n );\n- let rootEventTypesSet = ((currentInstance: any): ReactDOMEventComponentInstance)\n+ let rootEventTypesSet = ((currentInstance: any): ReactDOMEventResponderInstance)\n .rootEventTypes;\n if (rootEventTypesSet !== null) {\n rootEventTypesSet.delete(rootEventType);\n }\n if (rootEventComponents !== undefined) {\n rootEventComponents.delete(\n- ((currentInstance: any): ReactDOMEventComponentInstance),\n+ ((currentInstance: any): ReactDOMEventResponderInstance),\n );\n }\n }\n@@ -289,8 +222,8 @@ const eventResponderContext: ReactDOMResponderContext = {\n },\n releaseOwnership(): boolean {\n validateResponderContext();\n- return releaseOwnershipForEventComponentInstance(\n- ((currentInstance: any): ReactDOMEventComponentInstance),\n+ return releaseOwnershipForEventResponderInstance(\n+ ((currentInstance: any): ReactDOMEventResponderInstance),\n );\n },\n setTimeout(func: () => void, delay): number {\n@@ -313,8 +246,7 @@ const eventResponderContext: ReactDOMResponderContext = {\n currentTimers.set(delay, timeout);\n }\n timeout.timers.set(timerId, {\n- isHook: currentlyInHook,\n- instance: ((currentInstance: any): ReactDOMEventComponentInstance),\n+ instance: ((currentInstance: any): ReactDOMEventResponderInstance),\n func,\n id: timerId,\n timeStamp: currentTimeStamp,\n@@ -334,11 +266,22 @@ const eventResponderContext: ReactDOMResponderContext = {\n }\n }\n },\n- getFocusableElementsInScope(): Array {\n+ getFocusableElementsInScope(deep: boolean): Array {\n validateResponderContext();\n const focusableElements = [];\n- const eventComponentInstance = ((currentInstance: any): ReactDOMEventComponentInstance);\n- const child = ((eventComponentInstance.currentFiber: any): Fiber).child;\n+ const eventResponderInstance = ((currentInstance: any): ReactDOMEventResponderInstance);\n+ const currentResponder = eventResponderInstance.responder;\n+ let focusScopeFiber = eventResponderInstance.fiber;\n+ if (deep) {\n+ let deepNode = focusScopeFiber.return;\n+ while (deepNode !== null) {\n+ if (doesFiberHaveResponder(deepNode, currentResponder)) {\n+ focusScopeFiber = deepNode;\n+ }\n+ deepNode = deepNode.return;\n+ }\n+ }\n+ const child = focusScopeFiber.child;\n \n if (child !== null) {\n collectFocusableElements(child, focusableElements);\n@@ -354,22 +297,11 @@ const eventResponderContext: ReactDOMResponderContext = {\n isTargetWithinHostComponent(\n target: Element | Document,\n elementType: string,\n- deep: boolean,\n ): boolean {\n validateResponderContext();\n let fiber = getClosestInstanceFromNode(target);\n- const currentResponder = ((currentInstance: any): ReactDOMEventComponentInstance)\n- .responder;\n \n while (fiber !== null) {\n- const stateNode = fiber.stateNode;\n- if (\n- !deep &&\n- (fiber.tag === EventComponent &&\n- (stateNode === null || stateNode.responder === currentResponder))\n- ) {\n- return false;\n- }\n if (fiber.tag === HostComponent && fiber.type === elementType) {\n return true;\n }\n@@ -377,16 +309,60 @@ const eventResponderContext: ReactDOMResponderContext = {\n }\n return false;\n },\n- continueLocalPropagation() {\n- validateResponderContext();\n- continueLocalPropagation = true;\n- },\n- isRespondingToHook() {\n- return currentlyInHook;\n- },\n enqueueStateRestore,\n };\n \n+function validateEventValue(eventValue: any): void {\n+ if (typeof eventValue === 'object' && eventValue !== null) {\n+ const {target, type, timeStamp} = eventValue;\n+\n+ if (target == null || type == null || timeStamp == null) {\n+ throw new Error(\n+ 'context.dispatchEvent: \"target\", \"timeStamp\", and \"type\" fields on event object are required.',\n+ );\n+ }\n+ const showWarning = name => {\n+ if (__DEV__) {\n+ warning(\n+ false,\n+ '%s is not available on event objects created from event responder modules (React Flare). ' +\n+ 'Try wrapping in a conditional, i.e. `if (event.type !== \"press\") { event.%s }`',\n+ name,\n+ name,\n+ );\n+ }\n+ };\n+ eventValue.preventDefault = () => {\n+ if (__DEV__) {\n+ showWarning('preventDefault()');\n+ }\n+ };\n+ eventValue.stopPropagation = () => {\n+ if (__DEV__) {\n+ showWarning('stopPropagation()');\n+ }\n+ };\n+ eventValue.isDefaultPrevented = () => {\n+ if (__DEV__) {\n+ showWarning('isDefaultPrevented()');\n+ }\n+ };\n+ eventValue.isPropagationStopped = () => {\n+ if (__DEV__) {\n+ showWarning('isPropagationStopped()');\n+ }\n+ };\n+ \/\/ $FlowFixMe: we don't need value, Flow thinks we do\n+ Object.defineProperty(eventValue, 'nativeEvent', {\n+ get() {\n+ if (__DEV__) {\n+ showWarning('nativeEvent');\n+ }\n+ },\n+ });\n+ }\n+}\n+\n function collectFocusableElements(\n node: Fiber,\n focusableElements: Array,\n@@ -414,14 +390,40 @@ function collectFocusableElements(\n }\n }\n \n+function createEventQueueItem(\n+ value: any,\n+ listeners: Array<(val: any) => void>,\n+): EventQueueItem {\n+ return {\n+ value,\n+ listeners,\n+ };\n+}\n+\n+function doesFiberHaveResponder(\n+ fiber: Fiber,\n+ responder: ReactDOMEventResponder,\n+): boolean {\n+ if (fiber.tag === HostComponent) {\n+ const dependencies = fiber.dependencies;\n+ if (dependencies !== null) {\n+ const respondersMap = dependencies.responders;\n+ if (respondersMap !== null && respondersMap.has(responder)) {\n+ return true;\n+ }\n+ }\n+ }\n+ return false;\n+}\n+\n function getActiveDocument(): Document {\n return ((currentDocument: any): Document);\n }\n \n-function releaseOwnershipForEventComponentInstance(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+function releaseOwnershipForEventResponderInstance(\n+ eventResponderInstance: ReactDOMEventResponderInstance,\n ): boolean {\n- if (globalOwner === eventComponentInstance) {\n+ if (globalOwner === eventResponderInstance) {\n globalOwner = null;\n triggerOwnershipListeners();\n return true;\n@@ -461,13 +463,13 @@ function processTimers(\n delay: number,\n ): void {\n const timersArr = Array.from(timers.values());\n- currentEventQueue = createEventQueue();\n+ currentEventQueuePriority = ContinuousEvent;\n try {\n for (let i = 0; i < timersArr.length; i++) {\n- const {isHook, instance, func, id, timeStamp} = timersArr[i];\n+ const {instance, func, id, timeStamp} = timersArr[i];\n currentInstance = instance;\n+ currentEventQueue = [];\n currentTimeStamp = timeStamp + delay;\n- currentlyInHook = isHook;\n try {\n func();\n } finally {\n@@ -517,39 +519,83 @@ function createDOMResponderEvent(\n };\n }\n \n-function createEventQueue(): EventQueue {\n- return {\n- events: [],\n- eventPriority: ContinuousEvent,\n- };\n-}\n-\n-function processEvent(event: $Shape): void {\n- const type = event.type;\n- const listener = ((eventListeners.get(event): any): (\n- $Shape,\n- ) => void);\n- invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);\n+function collectListeners(\n+ eventProp: string,\n+ eventResponder: ReactDOMEventResponder,\n+ target: Fiber,\n+): Array<(any) => void> {\n+ const eventListeners = [];\n+ let node = target.return;\n+ nodeTraversal: while (node !== null) {\n+ switch (node.tag) {\n+ case HostComponent: {\n+ const dependencies = node.dependencies;\n+\n+ if (dependencies !== null) {\n+ const respondersMap = dependencies.responders;\n+\n+ if (respondersMap !== null && respondersMap.has(eventResponder)) {\n+ break nodeTraversal;\n+ }\n+ }\n+ break;\n+ }\n+ case FunctionComponent:\n+ case MemoComponent:\n+ case ForwardRef: {\n+ const dependencies = node.dependencies;\n+\n+ if (dependencies !== null) {\n+ const listeners = dependencies.listeners;\n+\n+ if (listeners !== null) {\n+ for (\n+ let s = 0, listenersLength = listeners.length;\n+ s < listenersLength;\n+ s++\n+ ) {\n+ const listener = listeners[s];\n+ const {responder, props} = listener;\n+ const listenerFunc = props[eventProp];\n+\n+ if (\n+ responder === eventResponder &&\n+ typeof listenerFunc === 'function'\n+ ) {\n+ eventListeners.push(listenerFunc);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ node = node.return;\n+ }\n+ return eventListeners;\n }\n \n-function processEvents(events: Array): void {\n- for (let i = 0, length = events.length; i < length; i++) {\n- processEvent(events[i]);\n+function processEvents(eventQueue: EventQueue): void {\n+ for (let i = 0, length = eventQueue.length; i < length; i++) {\n+ const {value, listeners} = eventQueue[i];\n+ for (let s = 0, length2 = listeners.length; s < length2; s++) {\n+ const listener = listeners[s];\n+ const type =\n+ typeof value === 'object' && value !== null ? value.type : '';\n+ invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, value);\n+ }\n }\n }\n \n function processEventQueue(): void {\n- const {events, eventPriority} = ((currentEventQueue: any): EventQueue);\n-\n- if (events.length === 0) {\n+ const eventQueue = ((currentEventQueue: any): EventQueue);\n+ if (eventQueue.length === 0) {\n return;\n }\n-\n- switch (eventPriority) {\n+ switch (currentEventQueuePriority) {\n case DiscreteEvent: {\n flushDiscreteUpdatesIfNeeded(currentTimeStamp);\n discreteUpdates(() => {\n- batchedEventUpdates(processEvents, events);\n+ batchedEventUpdates(processEvents, eventQueue);\n });\n break;\n }\n@@ -557,15 +603,15 @@ function processEventQueue(): void {\n if (enableUserBlockingEvents) {\n runWithPriority(\n UserBlockingPriority,\n- batchedEventUpdates.bind(null, processEvents, events),\n+ batchedEventUpdates.bind(null, processEvents, eventQueue),\n );\n } else {\n- batchedEventUpdates(processEvents, events);\n+ batchedEventUpdates(processEvents, eventQueue);\n }\n break;\n }\n case ContinuousEvent: {\n- batchedEventUpdates(processEvents, events);\n+ batchedEventUpdates(processEvents, eventQueue);\n break;\n }\n }\n@@ -583,36 +629,22 @@ function responderEventTypesContainType(\n return false;\n }\n \n-function validateEventTargetTypesForResponder(\n+function validateResponderTargetEventTypes(\n eventType: string,\n responder: ReactDOMEventResponder,\n ): boolean {\n- const targetEventTypes = responder.targetEventTypes;\n+ const {targetEventTypes} = responder;\n \/\/ Validate the target event type exists on the responder\n- if (targetEventTypes !== undefined) {\n+ if (targetEventTypes !== null) {\n return responderEventTypesContainType(targetEventTypes, eventType);\n }\n return false;\n }\n \n-function handleTargetEventResponderInstance(\n- responderEvent: ReactDOMResponderEvent,\n- eventComponentInstance: ReactDOMEventComponentInstance,\n- responder: ReactDOMEventResponder,\n-): void {\n- const {isHook, props, state} = eventComponentInstance;\n- const onEvent = responder.onEvent;\n- if (onEvent !== undefined) {\n- currentInstance = eventComponentInstance;\n- currentlyInHook = isHook;\n- onEvent(responderEvent, eventResponderContext, props, state);\n- }\n-}\n-\n function validateOwnership(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+ responderInstance: ReactDOMEventResponderInstance,\n ): boolean {\n- return globalOwner === null || globalOwner === eventComponentInstance;\n+ return globalOwner === null || globalOwner === responderInstance;\n }\n \n function traverseAndHandleEventResponderInstances(\n@@ -628,8 +660,8 @@ function traverseAndHandleEventResponderInstances(\n const eventType = isPassive ? topLevelType : topLevelType + '_active';\n \n \/\/ Trigger event responders in this order:\n- \/\/ - Bubble target phase\n- \/\/ - Root phase\n+ \/\/ - Bubble target responder phase\n+ \/\/ - Root responder phase\n \n const responderEvent = createDOMResponderEvent(\n topLevelType,\n@@ -638,75 +670,31 @@ function traverseAndHandleEventResponderInstances(\n isPassiveEvent,\n isPassiveSupported,\n );\n- const responderTargets = new Map();\n- const allowLocalPropagation = new Set();\n-\n- \/\/ Bubbled event phases have the notion of local propagation.\n- \/\/ This means that the propgation chain can be stopped part of the the way\n- \/\/ through processing event component instances.\n+ const visitedResponders = new Set();\n let node = targetFiber;\n- let currentTarget = nativeEventTarget;\n while (node !== null) {\n- const {dependencies, stateNode, tag} = node;\n- if (tag === HostComponent) {\n- currentTarget = stateNode;\n- } else if (tag === EventComponent) {\n- const eventComponentInstance = stateNode;\n- if (validateOwnership(eventComponentInstance)) {\n- const responder = eventComponentInstance.responder;\n- let responderTarget = responderTargets.get(responder);\n- let skipCurrentNode = false;\n-\n- if (responderTarget === undefined) {\n- if (validateEventTargetTypesForResponder(eventType, responder)) {\n- responderTarget = currentTarget;\n- responderTargets.set(responder, currentTarget);\n- } else {\n- skipCurrentNode = true;\n- }\n- } else if (allowLocalPropagation.has(responder)) {\n- \/\/ TODO: remove continueLocalPropagation\n- allowLocalPropagation.delete(responder);\n- } else {\n- skipCurrentNode = true;\n- }\n- if (!skipCurrentNode) {\n- responderEvent.responderTarget = ((responderTarget: any):\n- | Document\n- | Element);\n- \/\/ Switch to the current fiber tree\n- node = eventComponentInstance.currentFiber;\n- handleTargetEventResponderInstance(\n- responderEvent,\n- eventComponentInstance,\n- responder,\n- );\n- \/\/ TODO: remove continueLocalPropagation\n- if (continueLocalPropagation) {\n- continueLocalPropagation = false;\n- allowLocalPropagation.add(responder);\n- }\n- }\n- }\n- } else if (tag === FunctionComponent && dependencies !== null) {\n- const events = dependencies.events;\n- if (events !== null) {\n- for (let i = 0; i < events.length; i++) {\n- const eventComponentInstance = events[i];\n- if (validateOwnership(eventComponentInstance)) {\n- const responder = eventComponentInstance.responder;\n- const responderTarget = responderTargets.get(responder);\n- if (responderTarget !== undefined) {\n- responderEvent.responderTarget = responderTarget;\n- handleTargetEventResponderInstance(\n- responderEvent,\n- eventComponentInstance,\n- responder,\n- );\n- \/\/ TODO: remove continueLocalPropagation\n- if (continueLocalPropagation) {\n- continueLocalPropagation = false;\n- allowLocalPropagation.add(responder);\n+ const {dependencies, tag} = node;\n+ if (tag === HostComponent && dependencies !== null) {\n+ const respondersMap = dependencies.responders;\n+ if (respondersMap !== null) {\n+ const responderInstances = Array.from(respondersMap.values());\n+ for (let i = 0, length = responderInstances.length; i < length; i++) {\n+ const responderInstance = responderInstances[i];\n+\n+ if (validateOwnership(responderInstance)) {\n+ const {props, responder, state, target} = responderInstance;\n+ if (\n+ !visitedResponders.has(responder) &&\n+ validateResponderTargetEventTypes(eventType, responder)\n+ ) {\n+ const onEvent = responder.onEvent;\n+ visitedResponders.add(responder);\n+ if (onEvent !== null) {\n+ currentInstance = responderInstance;\n+ responderEvent.responderTarget = ((target: any):\n+ | Element\n+ | Document);\n+ onEvent(responderEvent, eventResponderContext, props, state);\n }\n }\n }\n@@ -716,24 +704,22 @@ function traverseAndHandleEventResponderInstances(\n node = node.return;\n }\n \/\/ Root phase\n- const rootEventInstances = rootEventTypesToEventComponentInstances.get(\n+ const rootEventResponderInstances = rootEventTypesToEventResponderInstances.get(\n eventType,\n );\n- if (rootEventInstances !== undefined) {\n- const rootEventComponentInstances = Array.from(rootEventInstances);\n+ if (rootEventResponderInstances !== undefined) {\n+ const responderInstances = Array.from(rootEventResponderInstances);\n \n- for (let i = 0; i < rootEventComponentInstances.length; i++) {\n- const rootEventComponentInstance = rootEventComponentInstances[i];\n- if (!validateOwnership(rootEventComponentInstance)) {\n+ for (let i = 0; i < responderInstances.length; i++) {\n+ const responderInstance = responderInstances[i];\n+ if (!validateOwnership(responderInstance)) {\n continue;\n }\n- const {isHook, props, responder, state} = rootEventComponentInstance;\n+ const {props, responder, state, target} = responderInstance;\n const onRootEvent = responder.onRootEvent;\n- if (onRootEvent !== undefined) {\n- currentInstance = rootEventComponentInstance;\n- currentlyInHook = isHook;\n- const responderTarget = responderTargets.get(responder);\n- responderEvent.responderTarget = responderTarget || null;\n+ if (onRootEvent !== null) {\n+ currentInstance = responderInstance;\n+ responderEvent.responderTarget = ((target: any): Element | Document);\n onRootEvent(responderEvent, eventResponderContext, props, state);\n }\n }\n@@ -743,40 +729,43 @@ function traverseAndHandleEventResponderInstances(\n function triggerOwnershipListeners(): void {\n const listeningInstances = Array.from(ownershipChangeListeners);\n const previousInstance = currentInstance;\n- const previouslyInHook = currentlyInHook;\n- currentEventQueue = createEventQueue();\n+ const previousEventQueuePriority = currentEventQueuePriority;\n+ const previousEventQueue = currentEventQueue;\n try {\n for (let i = 0; i < listeningInstances.length; i++) {\n const instance = listeningInstances[i];\n- const {isHook, props, responder, state} = instance;\n+ const {props, responder, state} = instance;\n currentInstance = instance;\n- currentlyInHook = isHook;\n+ currentEventQueuePriority = ContinuousEvent;\n+ currentEventQueue = [];\n const onOwnershipChange = ((responder: any): ReactDOMEventResponder)\n .onOwnershipChange;\n- if (onOwnershipChange !== undefined) {\n+ if (onOwnershipChange !== null) {\n onOwnershipChange(eventResponderContext, props, state);\n }\n }\n processEventQueue();\n } finally {\n currentInstance = previousInstance;\n- currentlyInHook = previouslyInHook;\n+ currentEventQueue = previousEventQueue;\n+ currentEventQueuePriority = previousEventQueuePriority;\n }\n }\n \n export function mountEventResponder(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+ responder: ReactDOMEventResponder,\n+ responderInstance: ReactDOMEventResponderInstance,\n+ props: Object,\n+ state: Object,\n ) {\n- const responder = ((eventComponentInstance.responder: any): ReactDOMEventResponder);\n- if (responder.onOwnershipChange !== undefined) {\n- ownershipChangeListeners.add(eventComponentInstance);\n+ if (responder.onOwnershipChange !== null) {\n+ ownershipChangeListeners.add(responderInstance);\n }\n const onMount = responder.onMount;\n- if (onMount !== undefined) {\n- let {isHook, props, state} = eventComponentInstance;\n- currentEventQueue = createEventQueue();\n- currentInstance = eventComponentInstance;\n- currentlyInHook = isHook;\n+ if (onMount !== null) {\n+ currentEventQueuePriority = ContinuousEvent;\n+ currentInstance = responderInstance;\n+ currentEventQueue = [];\n try {\n onMount(eventResponderContext, props, state);\n processEventQueue();\n@@ -789,15 +778,15 @@ export function mountEventResponder(\n }\n \n export function unmountEventResponder(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+ responderInstance: ReactDOMEventResponderInstance,\n ): void {\n- const responder = ((eventComponentInstance.responder: any): ReactDOMEventResponder);\n+ const responder = ((responderInstance.responder: any): ReactDOMEventResponder);\n const onUnmount = responder.onUnmount;\n- if (onUnmount !== undefined) {\n- let {isHook, props, state} = eventComponentInstance;\n- currentEventQueue = createEventQueue();\n- currentInstance = eventComponentInstance;\n- currentlyInHook = isHook;\n+ if (onUnmount !== null) {\n+ let {props, state} = responderInstance;\n+ currentEventQueue = [];\n+ currentEventQueuePriority = ContinuousEvent;\n+ currentInstance = responderInstance;\n try {\n onUnmount(eventResponderContext, props, state);\n processEventQueue();\n@@ -807,27 +796,21 @@ export function unmountEventResponder(\n currentTimers = null;\n }\n }\n- try {\n- currentEventQueue = createEventQueue();\n- releaseOwnershipForEventComponentInstance(eventComponentInstance);\n- processEventQueue();\n- } finally {\n- currentEventQueue = null;\n- }\n- if (responder.onOwnershipChange !== undefined) {\n- ownershipChangeListeners.delete(eventComponentInstance);\n+ releaseOwnershipForEventResponderInstance(responderInstance);\n+ if (responder.onOwnershipChange !== null) {\n+ ownershipChangeListeners.delete(responderInstance);\n }\n- const rootEventTypesSet = eventComponentInstance.rootEventTypes;\n+ const rootEventTypesSet = responderInstance.rootEventTypes;\n if (rootEventTypesSet !== null) {\n const rootEventTypes = Array.from(rootEventTypesSet);\n \n for (let i = 0; i < rootEventTypes.length; i++) {\n const topLevelEventType = rootEventTypes[i];\n- let rootEventComponentInstances = rootEventTypesToEventComponentInstances.get(\n+ let rootEventResponderInstances = rootEventTypesToEventResponderInstances.get(\n topLevelEventType,\n );\n- if (rootEventComponentInstances !== undefined) {\n- rootEventComponentInstances.delete(eventComponentInstance);\n+ if (rootEventResponderInstances !== undefined) {\n+ rootEventResponderInstances.delete(responderInstance);\n }\n }\n }\n@@ -835,7 +818,7 @@ export function unmountEventResponder(\n \n function validateResponderContext(): void {\n invariant(\n- currentEventQueue && currentInstance,\n+ currentInstance !== null,\n 'An event responder context was used outside of an event cycle. ' +\n 'Use context.setTimeout() to use asynchronous responder context outside of event cycle .',\n );\n@@ -854,9 +837,10 @@ export function dispatchEventForResponderEventSystem(\n const previousTimers = currentTimers;\n const previousTimeStamp = currentTimeStamp;\n const previousDocument = currentDocument;\n- const previouslyInHook = currentlyInHook;\n+ const previousEventQueuePriority = currentEventQueuePriority;\n currentTimers = null;\n- currentEventQueue = createEventQueue();\n+ currentEventQueue = [];\n+ currentEventQueuePriority = ContinuousEvent;\n \/\/ nodeType 9 is DOCUMENT_NODE\n currentDocument =\n (nativeEventTarget: any).nodeType === 9\n@@ -879,38 +863,38 @@ export function dispatchEventForResponderEventSystem(\n currentEventQueue = previousEventQueue;\n currentTimeStamp = previousTimeStamp;\n currentDocument = previousDocument;\n- currentlyInHook = previouslyInHook;\n+ currentEventQueuePriority = previousEventQueuePriority;\n }\n }\n }\n \n-export function addRootEventTypesForComponentInstance(\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+export function addRootEventTypesForResponderInstance(\n+ responderInstance: ReactDOMEventResponderInstance,\n rootEventTypes: Array,\n ): void {\n for (let i = 0; i < rootEventTypes.length; i++) {\n const rootEventType = rootEventTypes[i];\n- registerRootEventType(rootEventType, eventComponentInstance);\n+ registerRootEventType(rootEventType, responderInstance);\n }\n }\n \n function registerRootEventType(\n rootEventType: string,\n- eventComponentInstance: ReactDOMEventComponentInstance,\n+ eventResponderInstance: ReactDOMEventResponderInstance,\n ): void {\n- let rootEventComponentInstances = rootEventTypesToEventComponentInstances.get(\n+ let rootEventResponderInstances = rootEventTypesToEventResponderInstances.get(\n rootEventType,\n );\n- if (rootEventComponentInstances === undefined) {\n- rootEventComponentInstances = new Set();\n- rootEventTypesToEventComponentInstances.set(\n+ if (rootEventResponderInstances === undefined) {\n+ rootEventResponderInstances = new Set();\n+ rootEventTypesToEventResponderInstances.set(\n rootEventType,\n- rootEventComponentInstances,\n+ rootEventResponderInstances,\n );\n }\n- let rootEventTypesSet = eventComponentInstance.rootEventTypes;\n+ let rootEventTypesSet = eventResponderInstance.rootEventTypes;\n if (rootEventTypesSet === null) {\n- rootEventTypesSet = eventComponentInstance.rootEventTypes = new Set();\n+ rootEventTypesSet = eventResponderInstance.rootEventTypes = new Set();\n }\n invariant(\n !rootEventTypesSet.has(rootEventType),\n@@ -920,5 +904,5 @@ function registerRootEventType(\n rootEventType,\n );\n rootEventTypesSet.add(rootEventType);\n- rootEventComponentInstances.add(eventComponentInstance);\n+ rootEventResponderInstances.add(eventResponderInstance);\n }\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 f566c164d6..9ea8b8ad72 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@@ -17,29 +17,26 @@ let ReactDOM;\n \/\/ now it's an enum but is that what we want? Hard coding this for now.\n const DiscreteEvent = 0;\n \n-function createReactEventComponent({\n- targetEventTypes,\n- rootEventTypes,\n- getInitialState,\n+function createEventResponder({\n onEvent,\n onRootEvent,\n+ rootEventTypes,\n+ targetEventTypes,\n onMount,\n onUnmount,\n onOwnershipChange,\n+ getInitialState,\n }) {\n- const testEventResponder = {\n- displayName: 'TestEventComponent',\n+ return React.unstable_createResponder('TestEventComponent', {\n targetEventTypes,\n rootEventTypes,\n- getInitialState,\n onEvent,\n onRootEvent,\n onMount,\n onUnmount,\n onOwnershipChange,\n- };\n-\n- return React.unstable_createEvent(testEventResponder);\n+ getInitialState,\n+ });\n }\n \n const createEvent = (type, data) => {\n@@ -83,12 +80,12 @@ describe('DOMEventResponderSystem', () => {\n container = null;\n });\n \n- it('the event responder event listeners should fire on click event', () => {\n+ it('the event responders should fire on click event', () => {\n let eventResponderFiredCount = 0;\n let eventLog = [];\n const buttonRef = React.createRef();\n \n- const ClickEventComponent = createReactEventComponent({\n+ const TestResponder = createEventResponder({\n targetEventTypes: ['click'],\n onEvent: (event, context, props) => {\n eventResponderFiredCount++;\n@@ -102,9 +99,9 @@ describe('DOMEventResponderSystem', () => {\n });\n \n const Test = () => (\n- \n-

dillon1000/react

Files changed