Hello world<\/div>;\n- }\n- const tree = ReactDebugTools.inspectHooks(Foo, {});\n- expect(tree).toEqual([\n- {\n- isStateEditable: false,\n- id: 0,\n- name: 'Ref',\n- subHooks: [],\n- value: null,\n- },\n- {\n- isStateEditable: false,\n- id: 1,\n- name: 'Event',\n- value: {capture: false, passive: undefined, priority: 0, type: 'click'},\n- subHooks: [],\n- },\n- {\n- isStateEditable: false,\n- id: 2,\n- name: 'Effect',\n- value: effect,\n- subHooks: [],\n- },\n- ]);\n- });\n });\ndiff --git a\/packages\/react-dom\/index.classic.fb.js b\/packages\/react-dom\/index.classic.fb.js\nindex 4d6939900b..e946df7b76 100644\n--- a\/packages\/react-dom\/index.classic.fb.js\n+++ b\/packages\/react-dom\/index.classic.fb.js\n@@ -36,5 +36,4 @@ export {\n unstable_scheduleHydration,\n unstable_renderSubtreeIntoContainer,\n unstable_createPortal,\n- unstable_useEvent,\n } from '.\/src\/client\/ReactDOM';\ndiff --git a\/packages\/react-dom\/index.modern.fb.js b\/packages\/react-dom\/index.modern.fb.js\nindex d8da74a5df..bcb213ad4e 100644\n--- a\/packages\/react-dom\/index.modern.fb.js\n+++ b\/packages\/react-dom\/index.modern.fb.js\n@@ -19,5 +19,4 @@ export {\n unstable_flushDiscreteUpdates,\n unstable_flushControlled,\n unstable_scheduleHydration,\n- unstable_useEvent,\n } from '.\/src\/client\/ReactDOM';\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex 600edb3cce..ee294218ce 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -20,7 +20,6 @@ import {\n unmountComponentAtNode,\n } from '.\/ReactDOMLegacy';\n import {createRoot, createBlockingRoot, isValidContainer} from '.\/ReactDOMRoot';\n-import {useEvent} from '.\/ReactDOMUseEvent';\n \n import {\n batchedEventUpdates,\n@@ -211,8 +210,6 @@ export {\n \/\/ Temporary alias since we already shipped React 16 RC with it.\n \/\/ TODO: remove in React 17.\n unstable_createPortal,\n- \/\/ enableUseEventAPI\n- useEvent as unstable_useEvent,\n };\n \n const foundDevTools = injectIntoDevTools({\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\nindex be0c8600dc..c8c6bfc0df 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n@@ -15,7 +15,6 @@ import type {\n SuspenseInstance,\n Props,\n } from '.\/ReactDOMHostConfig';\n-import type {ReactDOMListener} from '..\/shared\/ReactDOMTypes';\n \n import {\n HostComponent,\n@@ -33,7 +32,6 @@ const randomKey = Math.random()\n const internalInstanceKey = '__reactFiber$' + randomKey;\n const internalEventHandlersKey = '__reactEvents$' + randomKey;\n const internalContainerInstanceKey = '__reactContainer$' + randomKey;\n-const internalEventListenersKey = '__reactListeners$' + randomKey;\n \n export function precacheFiberNode(\n hostInst: Fiber,\n@@ -187,18 +185,3 @@ export function updateFiberProps(\n ): void {\n (node: any)[internalEventHandlersKey] = props;\n }\n-\n-\/\/ This is used for useEvent listeners\n-export function getListenersFromTarget(\n- target: EventTarget,\n-): null | Set {\n- return (target: any)[internalEventListenersKey] || null;\n-}\n-\n-\/\/ This is used for useEvent listeners\n-export function initListenersSet(\n- target: EventTarget,\n- value: Set,\n-): void {\n- (target: any)[internalEventListenersKey] = value;\n-}\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 70f23dba42..15a317b1f6 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -13,17 +13,12 @@ import type {\n ReactDOMEventResponder,\n ReactDOMEventResponderInstance,\n ReactDOMFundamentalComponentInstance,\n- ReactDOMListener,\n- ReactDOMListenerEvent,\n- ReactDOMListenerMap,\n } from '..\/shared\/ReactDOMTypes';\n-import type {ReactScopeMethods} from 'shared\/ReactTypes';\n \n import {\n precacheFiberNode,\n updateFiberProps,\n getClosestInstanceFromNode,\n- getListenersFromTarget,\n } from '.\/ReactDOMComponentTree';\n import {\n createElement,\n@@ -69,32 +64,9 @@ import {\n enableSuspenseServerRenderer,\n enableDeprecatedFlareAPI,\n enableFundamentalAPI,\n- enableUseEventAPI,\n- enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n-import {\n- PLUGIN_EVENT_SYSTEM,\n- USE_EVENT_SYSTEM,\n-} from '..\/events\/EventSystemFlags';\n-import {\n- isManagedDOMElement,\n- isValidEventTarget,\n- listenToTopLevelEvent,\n- attachListenerToManagedDOMElement,\n- detachListenerFromManagedDOMElement,\n- attachTargetEventListener,\n- detachTargetEventListener,\n- isReactScope,\n- attachListenerToReactScope,\n- detachListenerFromReactScope,\n-} from '..\/events\/DOMModernPluginEventSystem';\n-import {getListenerMapForElement} from '..\/events\/DOMEventListenerMap';\n import {TOP_BEFORE_BLUR, TOP_AFTER_BLUR} from '..\/events\/DOMTopLevelEventTypes';\n \n-export type ReactListenerEvent = ReactDOMListenerEvent;\n-export type ReactListenerMap = ReactDOMListenerMap;\n-export type ReactListener = ReactDOMListener;\n-\n export type Type = string;\n export type Props = {\n autoFocus?: boolean,\n@@ -246,7 +218,7 @@ export function prepareForCommit(containerInfo: Container): Object | null {\n eventsEnabled = ReactBrowserEventEmitterIsEnabled();\n selectionInformation = getSelectionInformation();\n let activeInstance = null;\n- if (enableDeprecatedFlareAPI || enableUseEventAPI) {\n+ if (enableDeprecatedFlareAPI) {\n const focusedElem = selectionInformation.focusedElem;\n if (focusedElem !== null) {\n activeInstance = getClosestInstanceFromNode(focusedElem);\n@@ -257,7 +229,7 @@ export function prepareForCommit(containerInfo: Container): Object | null {\n }\n \n export function beforeActiveInstanceBlur(): void {\n- if (enableDeprecatedFlareAPI || enableUseEventAPI) {\n+ if (enableDeprecatedFlareAPI) {\n ReactBrowserEventEmitterSetEnabled(true);\n dispatchBeforeDetachedBlur((selectionInformation: any).focusedElem);\n ReactBrowserEventEmitterSetEnabled(false);\n@@ -265,7 +237,7 @@ export function beforeActiveInstanceBlur(): void {\n }\n \n export function afterActiveInstanceBlur(): void {\n- if (enableDeprecatedFlareAPI || enableUseEventAPI) {\n+ if (enableDeprecatedFlareAPI) {\n ReactBrowserEventEmitterSetEnabled(true);\n dispatchAfterDetachedBlur((selectionInformation: any).focusedElem);\n ReactBrowserEventEmitterSetEnabled(false);\n@@ -528,7 +500,7 @@ function createEvent(type: TopLevelType): Event {\n }\n \n function dispatchBeforeDetachedBlur(target: HTMLElement): void {\n- if (enableDeprecatedFlareAPI || enableUseEventAPI) {\n+ if (enableDeprecatedFlareAPI) {\n const event = createEvent(TOP_BEFORE_BLUR);\n \/\/ Dispatch \"beforeblur\" directly on the target,\n \/\/ so it gets picked up by the event system and\n@@ -538,7 +510,7 @@ function dispatchBeforeDetachedBlur(target: HTMLElement): void {\n }\n \n function dispatchAfterDetachedBlur(target: HTMLElement): void {\n- if (enableDeprecatedFlareAPI || enableUseEventAPI) {\n+ if (enableDeprecatedFlareAPI) {\n const event = createEvent(TOP_AFTER_BLUR);\n \/\/ So we know what was detached, make the relatedTarget the\n \/\/ detached target on the \"afterblur\" event.\n@@ -550,23 +522,8 @@ function dispatchAfterDetachedBlur(target: HTMLElement): void {\n \n export function beforeRemoveInstance(\n instance: Instance | TextInstance | SuspenseInstance,\n-): void {\n- if (enableUseEventAPI) {\n- \/\/ It's unfortunate that we have to do this cleanup, but\n- \/\/ it's necessary otherwise we will leak the host instances\n- \/\/ from the useEvent hook instances Map. We call destroy\n- \/\/ on each listener to ensure we properly remove the instance\n- \/\/ from the instances Map. Note: we have this Map so that we\n- \/\/ can properly unmount instances when the function component\n- \/\/ that the hook is attached to gets unmounted.\n- const listenersSet = getListenersFromTarget(instance);\n- if (listenersSet !== null) {\n- const listeners = Array.from(listenersSet);\n- for (let i = 0; i < listeners.length; i++) {\n- listeners[i].destroy(instance);\n- }\n- }\n- }\n+) {\n+ \/\/ TODO for ReactDOM.createEventInstance\n }\n \n export function removeChild(\n@@ -1141,78 +1098,3 @@ export function makeOpaqueHydratingObject(\n valueOf: attemptToReadValue,\n };\n }\n-\n-export function registerEvent(\n- event: ReactDOMListenerEvent,\n- rootContainerInstance: Container,\n-): void {\n- const {passive, priority, type} = event;\n- const listenerMap = getListenerMapForElement(rootContainerInstance);\n- \/\/ Add the event listener to the target container (falling back to\n- \/\/ the target if we didn't find one).\n- listenToTopLevelEvent(\n- type,\n- rootContainerInstance,\n- listenerMap,\n- PLUGIN_EVENT_SYSTEM | USE_EVENT_SYSTEM,\n- passive,\n- priority,\n- );\n-}\n-\n-export function mountEventListener(listener: ReactDOMListener): void {\n- if (enableUseEventAPI) {\n- const {target} = listener;\n- if (isManagedDOMElement(target)) {\n- attachListenerToManagedDOMElement(listener);\n- } else if (enableScopeAPI && isReactScope(target)) {\n- attachListenerToReactScope(listener);\n- } else {\n- attachTargetEventListener(listener);\n- }\n- }\n-}\n-\n-export function unmountEventListener(listener: ReactDOMListener): void {\n- if (enableUseEventAPI) {\n- const {target} = listener;\n- if (isManagedDOMElement(target)) {\n- detachListenerFromManagedDOMElement(listener);\n- } else if (enableScopeAPI && isReactScope(target)) {\n- detachListenerFromReactScope(listener);\n- } else {\n- detachTargetEventListener(listener);\n- }\n- }\n-}\n-\n-export function validateEventListenerTarget(\n- target: EventTarget | ReactScopeMethods,\n- listener: ?(SyntheticEvent) => void,\n-): boolean {\n- if (enableUseEventAPI) {\n- if (\n- target != null &&\n- (isManagedDOMElement(target) ||\n- isValidEventTarget(target) ||\n- isReactScope(target))\n- ) {\n- if (listener == null || typeof listener === 'function') {\n- return true;\n- }\n- if (__DEV__) {\n- console.warn(\n- 'Event listener method setListener() from useEvent() hook requires the second argument' +\n- ' to be either a valid function callback or null\/undefined.',\n- );\n- }\n- }\n- if (__DEV__) {\n- console.warn(\n- 'Event listener method setListener() from useEvent() hook requires the first argument to be ' +\n- 'a valid DOM EventTarget. If using a ref, ensure the current value is not null.',\n- );\n- }\n- }\n- return false;\n-}\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMUseEvent.js b\/packages\/react-dom\/src\/client\/ReactDOMUseEvent.js\ndeleted file mode 100644\nindex f1c3145c06..0000000000\n--- a\/packages\/react-dom\/src\/client\/ReactDOMUseEvent.js\n+++ \/dev\/null\n@@ -1,79 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @flow\n- *\/\n-\n-import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n-import type {EventPriority} from 'shared\/ReactTypes';\n-import type {\n- ReactDOMListenerEvent,\n- ReactDOMListenerMap,\n-} from '..\/shared\/ReactDOMTypes';\n-\n-import ReactSharedInternals from 'shared\/ReactSharedInternals';\n-import invariant from 'shared\/invariant';\n-\n-import {getEventPriorityForListenerSystem} from '..\/events\/DOMEventProperties';\n-\n-type EventOptions = {|\n- capture?: boolean,\n- passive?: boolean,\n- priority?: EventPriority,\n-|};\n-\n-const {ReactCurrentDispatcher} = ReactSharedInternals;\n-\n-function resolveDispatcher() {\n- const dispatcher = ReactCurrentDispatcher.current;\n- invariant(\n- dispatcher !== null,\n- 'Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for' +\n- ' one of the following reasons:\\n' +\n- '1. You might have mismatching versions of React and the renderer (such as React DOM)\\n' +\n- '2. You might be breaking the Rules of Hooks\\n' +\n- '3. You might have more than one copy of React in the same app\\n' +\n- 'See https:\/\/fb.me\/react-invalid-hook-call for tips about how to debug and fix this problem.',\n- );\n- return dispatcher;\n-}\n-\n-export function useEvent(\n- type: string,\n- options?: EventOptions,\n-): ReactDOMListenerMap {\n- const topLevelType = ((type: any): DOMTopLevelEventType);\n- const dispatcher = resolveDispatcher();\n- let capture = false;\n- let passive = undefined; \/\/ Undefined means to use the browser default\n- let priority;\n-\n- if (options != null) {\n- const optionsCapture = options.capture;\n- const optionsPassive = options.passive;\n- const optionsPriority = options.priority;\n-\n- if (typeof optionsCapture === 'boolean') {\n- capture = optionsCapture;\n- }\n- if (typeof optionsPassive === 'boolean') {\n- passive = optionsPassive;\n- }\n- if (typeof optionsPriority === 'number') {\n- priority = optionsPriority;\n- }\n- }\n- if (priority === undefined) {\n- priority = getEventPriorityForListenerSystem(topLevelType);\n- }\n- const event: ReactDOMListenerEvent = {\n- capture,\n- passive,\n- priority,\n- type: topLevelType,\n- };\n- return dispatcher.useEvent(event);\n-}\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventProperties.js b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\nindex d30fc8f991..6a3b0e68fb 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n@@ -23,7 +23,6 @@ import {\n UserBlockingEvent,\n ContinuousEvent,\n } from 'shared\/ReactTypes';\n-import {enableUseEventAPI} from 'shared\/ReactFeatureFlags';\n \n \/\/ Needed for SimpleEventPlugin, rather than\n \/\/ do it in two places, which duplicates logic\n@@ -96,13 +95,6 @@ const otherDiscreteEvents = [\n DOMTopLevelEventTypes.TOP_COMPOSITION_UPDATE,\n ];\n \n-if (enableUseEventAPI) {\n- otherDiscreteEvents.push(\n- DOMTopLevelEventTypes.TOP_BEFORE_BLUR,\n- DOMTopLevelEventTypes.TOP_AFTER_BLUR,\n- );\n-}\n-\n \/\/ prettier-ignore\n const userBlockingPairsForSimpleEventPlugin = [\n DOMTopLevelEventTypes.TOP_DRAG, 'drag',\ndiff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex e2d4084e15..c347e718bb 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -17,11 +17,7 @@ import type {EventSystemFlags} from '.\/EventSystemFlags';\n import type {EventPriority, ReactScopeMethods} from 'shared\/ReactTypes';\n import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {PluginModule} from 'legacy-events\/PluginModuleType';\n-import type {\n- ReactSyntheticEvent,\n- CustomDispatchConfig,\n-} from 'legacy-events\/ReactSyntheticEventType';\n-import type {ReactDOMListener} from '..\/shared\/ReactDOMTypes';\n+import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n \n import {registrationNameDependencies} from 'legacy-events\/EventPluginRegistry';\n import {plugins} from 'legacy-events\/EventPluginRegistry';\n@@ -36,7 +32,6 @@ import {\n import {\n HostRoot,\n HostPortal,\n- ScopeComponent,\n HostComponent,\n } from 'react-reconciler\/src\/ReactWorkTags';\n \n@@ -80,25 +75,14 @@ import {\n TOP_PROGRESS,\n TOP_PLAYING,\n TOP_CLICK,\n- TOP_BEFORE_BLUR,\n- TOP_AFTER_BLUR,\n TOP_SELECTION_CHANGE,\n } from '.\/DOMTopLevelEventTypes';\n-import {\n- getClosestInstanceFromNode,\n- getListenersFromTarget,\n- initListenersSet,\n-} from '..\/client\/ReactDOMComponentTree';\n+import {getClosestInstanceFromNode} from '..\/client\/ReactDOMComponentTree';\n import {COMMENT_NODE} from '..\/shared\/HTMLNodeType';\n-import {topLevelEventsToDispatchConfig} from '.\/DOMEventProperties';\n import {batchedEventUpdates} from '.\/ReactDOMUpdateBatching';\n import getListener from '.\/getListener';\n \n-import {\n- enableLegacyFBSupport,\n- enableUseEventAPI,\n- enableScopeAPI,\n-} from 'shared\/ReactFeatureFlags';\n+import {enableLegacyFBSupport} from 'shared\/ReactFeatureFlags';\n import {\n invokeGuardedCallbackAndCatchFirstError,\n rethrowCaughtError,\n@@ -140,44 +124,8 @@ const capturePhaseEvents = new Set([\n TOP_WAITING,\n ]);\n \n-if (enableUseEventAPI) {\n- capturePhaseEvents.add(TOP_BEFORE_BLUR);\n- capturePhaseEvents.add(TOP_AFTER_BLUR);\n-}\n-\n-const emptyDispatchConfigForCustomEvents: CustomDispatchConfig = {\n- customEvent: true,\n- phasedRegistrationNames: {\n- bubbled: null,\n- captured: null,\n- },\n-};\n-\n const isArray = Array.isArray;\n \n-\/\/ TODO: we should remove the FlowFixMes and the casting to figure out how to make\n-\/\/ these patterns work properly.\n-\/\/ $FlowFixMe: Flow struggles with this pattern, so we also have to cast it.\n-const PossiblyWeakMap = ((typeof WeakMap === 'function' ? WeakMap : Map): any);\n-\n-\/\/ $FlowFixMe: Flow cannot handle polymorphic WeakMaps\n-const eventTargetEventListenerStore: WeakMap<\n- EventTarget,\n- Map<\n- DOMTopLevelEventType,\n- {bubbled: Set, captured: Set},\n- >,\n-> = new PossiblyWeakMap();\n-\n-\/\/ $FlowFixMe: Flow cannot handle polymorphic WeakMaps\n-const reactScopeListenerStore: WeakMap<\n- ReactScopeMethods,\n- Map<\n- DOMTopLevelEventType,\n- {bubbled: Set, captured: Set},\n- >,\n-> = new PossiblyWeakMap();\n-\n function executeDispatch(\n event: ReactSyntheticEvent,\n listener: Function,\n@@ -514,183 +462,7 @@ export function dispatchEventForPluginEventSystem(\n );\n }\n \n-function getNearestRootOrPortalContainer(instance: Element): Element {\n- let node = getClosestInstanceFromNode(instance);\n- while (node !== null) {\n- const tag = node.tag;\n- \/\/ Once we encounter a host container or root container\n- \/\/ we can return their DOM instance.\n- if (tag === HostRoot || tag === HostPortal) {\n- return node.stateNode.containerInfo;\n- }\n- node = node.return;\n- }\n- return instance;\n-}\n-\n-function addEventTypeToDispatchConfig(type: DOMTopLevelEventType): void {\n- const dispatchConfig = topLevelEventsToDispatchConfig.get(type);\n- \/\/ If we don't have a dispatchConfig, then we're dealing with\n- \/\/ an event type that React does not know about (i.e. a custom event).\n- \/\/ We need to register an event config for this or the SimpleEventPlugin\n- \/\/ will not appropriately provide a SyntheticEvent, so we use out empty\n- \/\/ dispatch config for custom events.\n- if (dispatchConfig === undefined) {\n- topLevelEventsToDispatchConfig.set(\n- type,\n- emptyDispatchConfigForCustomEvents,\n- );\n- }\n-}\n-\n-export function attachListenerToManagedDOMElement(\n- listener: ReactDOMListener,\n-): void {\n- const {event, target} = listener;\n- const {passive, priority, type} = event;\n-\n- const managedTargetElement = ((target: any): Element);\n- const containerEventTarget = getNearestRootOrPortalContainer(\n- managedTargetElement,\n- );\n- const listenerMap = getListenerMapForElement(containerEventTarget);\n- \/\/ Add the event listener to the target container (falling back to\n- \/\/ the target if we didn't find one).\n- listenToTopLevelEvent(\n- type,\n- containerEventTarget,\n- listenerMap,\n- PLUGIN_EVENT_SYSTEM | USE_EVENT_SYSTEM,\n- passive,\n- priority,\n- );\n- \/\/ Get the internal listeners Set from the target instance.\n- let listeners = getListenersFromTarget(managedTargetElement);\n- \/\/ If we don't have any listeners, then we need to init them.\n- if (listeners === null) {\n- listeners = new Set();\n- initListenersSet(managedTargetElement, listeners);\n- }\n- \/\/ Add our listener to the listeners Set.\n- listeners.add(listener);\n- \/\/ Finally, add the event to our known event types list.\n- addEventTypeToDispatchConfig(type);\n-}\n-\n-export function detachListenerFromManagedDOMElement(\n- listener: ReactDOMListener,\n-): void {\n- const {target} = listener;\n- const managedTargetElement = ((target: any): Element);\n- \/\/ Get the internal listeners Set from the target instance.\n- const listeners = getListenersFromTarget(managedTargetElement);\n- if (listeners !== null) {\n- \/\/ Remove out listener from the listeners Set.\n- listeners.delete(listener);\n- }\n-}\n-\n-export function attachTargetEventListener(listener: ReactDOMListener): void {\n- const {event, target} = listener;\n- const {capture, passive, priority, type} = event;\n- const eventTarget = ((target: any): EventTarget);\n- const listenerMap = getListenerMapForElement(eventTarget);\n- \/\/ Add the event listener to the TargetEvent object.\n- listenToTopLevelEvent(\n- type,\n- eventTarget,\n- listenerMap,\n- PLUGIN_EVENT_SYSTEM | USE_EVENT_SYSTEM | IS_TARGET_PHASE_ONLY,\n- passive,\n- priority,\n- capture,\n- );\n- let eventTypeMap = eventTargetEventListenerStore.get(eventTarget);\n- if (eventTypeMap === undefined) {\n- eventTypeMap = new Map();\n- eventTargetEventListenerStore.set(eventTarget, eventTypeMap);\n- }\n- \/\/ Get the listeners by the event type\n- let listeners = eventTypeMap.get(type);\n- if (listeners === undefined) {\n- listeners = {captured: new Set(), bubbled: new Set()};\n- eventTypeMap.set(type, listeners);\n- }\n- \/\/ Add our listener to the listeners Set.\n- if (capture) {\n- listeners.captured.add(listener);\n- } else {\n- listeners.bubbled.add(listener);\n- }\n- \/\/ Finally, add the event to our known event types list.\n- addEventTypeToDispatchConfig(type);\n-}\n-\n-export function detachTargetEventListener(listener: ReactDOMListener): void {\n- const {event, target} = listener;\n- const {capture, type} = event;\n- const validEventTarget = ((target: any): EventTarget);\n- const eventTypeMap = eventTargetEventListenerStore.get(validEventTarget);\n- if (eventTypeMap !== undefined) {\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- \/\/ Remove out listener from the listeners Set.\n- if (capture) {\n- listeners.captured.delete(listener);\n- } else {\n- listeners.bubbled.delete(listener);\n- }\n- }\n- }\n-}\n-\n-export function attachListenerToReactScope(listener: ReactDOMListener): void {\n- const {event, target} = listener;\n- const {capture, type} = event;\n- const reactScope = ((target: any): ReactScopeMethods);\n- let eventTypeMap = reactScopeListenerStore.get(reactScope);\n- if (eventTypeMap === undefined) {\n- eventTypeMap = new Map();\n- reactScopeListenerStore.set(reactScope, eventTypeMap);\n- }\n- \/\/ Get the listeners by the event type\n- let listeners = eventTypeMap.get(type);\n- if (listeners === undefined) {\n- listeners = {captured: new Set(), bubbled: new Set()};\n- eventTypeMap.set(type, listeners);\n- }\n- \/\/ Add our listener to the listeners Set.\n- if (capture) {\n- listeners.captured.add(listener);\n- } else {\n- listeners.bubbled.add(listener);\n- }\n- \/\/ Finally, add the event to our known event types list.\n- addEventTypeToDispatchConfig(type);\n-}\n-\n-export function detachListenerFromReactScope(listener: ReactDOMListener): void {\n- const {event, target} = listener;\n- const {capture, type} = event;\n- const reactScope = ((target: any): ReactScopeMethods);\n- const eventTypeMap = reactScopeListenerStore.get(reactScope);\n- if (eventTypeMap !== undefined) {\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- \/\/ Remove out listener from the listeners Set.\n- if (capture) {\n- listeners.captured.delete(listener);\n- } else {\n- listeners.bubbled.delete(listener);\n- }\n- }\n- }\n-}\n-\n-export function accumulateTwoPhaseListeners(\n- event: ReactSyntheticEvent,\n- accumulateUseEventListeners?: boolean,\n-): void {\n+export function accumulateTwoPhaseListeners(event: ReactSyntheticEvent): void {\n const phasedRegistrationNames = event.dispatchConfig.phasedRegistrationNames;\n const dispatchListeners = [];\n const dispatchInstances: Array = [];\n@@ -701,7 +473,6 @@ export function accumulateTwoPhaseListeners(\n \/\/ usual two phase accumulation using the React fiber tree to pick up\n \/\/ all relevant useEvent and on* prop events.\n let instance = event._targetInst;\n- let lastHostComponent = null;\n \n \/\/ Accumulate all instances and listeners via the target -> root path.\n while (instance !== null) {\n@@ -709,35 +480,6 @@ export function accumulateTwoPhaseListeners(\n \/\/ Handle listeners that are on HostComponents (i.e.

)\n if (tag === HostComponent && stateNode !== null) {\n const currentTarget = stateNode;\n- lastHostComponent = currentTarget;\n- \/\/ For useEvent listenrs\n- if (enableUseEventAPI && accumulateUseEventListeners) {\n- \/\/ useEvent event listeners\n- const targetType = event.type;\n- const listeners = getListenersFromTarget(currentTarget);\n-\n- if (listeners !== null) {\n- const listenersArr = Array.from(listeners);\n- for (let i = 0; i < listenersArr.length; i++) {\n- const listener = listenersArr[i];\n- const {\n- callback,\n- event: {capture, type},\n- } = listener;\n- if (type === targetType) {\n- if (capture === true) {\n- dispatchListeners.unshift(callback);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(currentTarget);\n- } else {\n- dispatchListeners.push(callback);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- }\n- }\n \/\/ Standard React on* listeners, i.e. onClick prop\n if (captured !== null) {\n const captureListener = getListener(instance, captured);\n@@ -760,40 +502,6 @@ export function accumulateTwoPhaseListeners(\n }\n }\n }\n- if (\n- enableUseEventAPI &&\n- enableScopeAPI &&\n- accumulateUseEventListeners &&\n- tag === ScopeComponent &&\n- lastHostComponent !== null\n- ) {\n- const reactScope = stateNode.methods;\n- const eventTypeMap = reactScopeListenerStore.get(reactScope);\n- if (eventTypeMap !== undefined) {\n- const type = ((event.type: any): DOMTopLevelEventType);\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- const captureListeners = Array.from(listeners.captured);\n- const bubbleListeners = Array.from(listeners.bubbled);\n- const lastCurrentTarget = ((lastHostComponent: any): Element);\n-\n- for (let i = 0; i < captureListeners.length; i++) {\n- const listener = captureListeners[i];\n- const {callback} = listener;\n- dispatchListeners.unshift(callback);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(lastCurrentTarget);\n- }\n- for (let i = 0; i < bubbleListeners.length; i++) {\n- const listener = bubbleListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(lastCurrentTarget);\n- }\n- }\n- }\n- }\n instance = instance.return;\n }\n \n@@ -806,57 +514,6 @@ export function accumulateTwoPhaseListeners(\n }\n }\n \n-export function accumulateEventTargetListeners(\n- event: ReactSyntheticEvent,\n- currentTarget: EventTarget,\n-): void {\n- const dispatchListeners = [];\n- const dispatchInstances: Array = [];\n- const dispatchCurrentTargets = [];\n-\n- const eventTypeMap = eventTargetEventListenerStore.get(currentTarget);\n- if (eventTypeMap !== undefined) {\n- const type = ((event.type: any): DOMTopLevelEventType);\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- const isCapturePhase = (event: any).eventPhase === 1;\n-\n- if (isCapturePhase) {\n- const captureListeners = Array.from(listeners.captured);\n-\n- for (let i = captureListeners.length - 1; i >= 0; i--) {\n- const listener = captureListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- \/\/ EventTarget listeners do not have instances, as there\n- \/\/ is no backing Fiber instance for them (window, document etc).\n- dispatchInstances.push(null);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- } else {\n- const bubbleListeners = Array.from(listeners.bubbled);\n-\n- for (let i = 0; i < bubbleListeners.length; i++) {\n- const listener = bubbleListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- \/\/ EventTarget listeners do not have instances, as there\n- \/\/ is no backing Fiber instance for them (window, document etc).\n- dispatchInstances.push(null);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- }\n- \/\/ To prevent allocation to the event unless we actually\n- \/\/ have listeners we check the length of one of the arrays.\n- if (dispatchListeners.length > 0) {\n- event._dispatchListeners = dispatchListeners;\n- event._dispatchInstances = dispatchInstances;\n- event._dispatchCurrentTargets = dispatchCurrentTargets;\n- }\n-}\n-\n function getParent(inst: Fiber | null): Fiber | null {\n if (inst === null) {\n return null;\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\nindex 46c8b26c7a..44a0a65b23 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n@@ -44,7 +44,6 @@ import {\n addEventBubbleListener,\n addEventCaptureListener,\n addEventCaptureListenerWithPassiveFlag,\n- addEventBubbleListenerWithPassiveFlag,\n removeEventListener,\n } from '.\/EventListener';\n import getEventTarget from '.\/getEventTarget';\n@@ -56,7 +55,6 @@ import {\n enableDeprecatedFlareAPI,\n enableModernEventSystem,\n enableLegacyFBSupport,\n- enableUseEventAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n UserBlockingEvent,\n@@ -200,37 +198,17 @@ export function addTrappedEventListener(\n };\n }\n if (capture) {\n- if (enableUseEventAPI && passive !== undefined) {\n- \/\/ This is only used with passive is either true or false.\n- unsubscribeListener = addEventCaptureListenerWithPassiveFlag(\n- targetContainer,\n- rawEventName,\n- listener,\n- passive,\n- );\n- } else {\n- unsubscribeListener = addEventCaptureListener(\n- targetContainer,\n- rawEventName,\n- listener,\n- );\n- }\n+ unsubscribeListener = addEventCaptureListener(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ );\n } else {\n- if (enableUseEventAPI && passive !== undefined) {\n- \/\/ This is only used with passive is either true or false.\n- unsubscribeListener = addEventBubbleListenerWithPassiveFlag(\n- targetContainer,\n- rawEventName,\n- listener,\n- passive,\n- );\n- } else {\n- unsubscribeListener = addEventBubbleListener(\n- targetContainer,\n- rawEventName,\n- listener,\n- );\n- }\n+ unsubscribeListener = addEventBubbleListener(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ );\n }\n return unsubscribeListener;\n }\ndiff --git a\/packages\/react-dom\/src\/events\/__tests__\/DOMModernPluginEventSystem-test.internal.js b\/packages\/react-dom\/src\/events\/__tests__\/DOMModernPluginEventSystem-test.internal.js\nindex f73c32580d..538353fff4 100644\n--- a\/packages\/react-dom\/src\/events\/__tests__\/DOMModernPluginEventSystem-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/__tests__\/DOMModernPluginEventSystem-test.internal.js\n@@ -9,13 +9,10 @@\n \n 'use strict';\n \n-import {createEventTarget} from 'dom-event-testing-library';\n-\n let React;\n let ReactFeatureFlags;\n let ReactDOM;\n let ReactDOMServer;\n-let ReactTestUtils;\n let Scheduler;\n \n function dispatchEvent(element, type) {\n@@ -67,7 +64,6 @@ describe('DOMModernPluginEventSystem', () => {\n ReactDOM = require('react-dom');\n Scheduler = require('scheduler');\n ReactDOMServer = require('react-dom\/server');\n- ReactTestUtils = require('react-dom\/test-utils');\n container = document.createElement('div');\n document.body.appendChild(container);\n startNativeEventListenerClearDown();\n@@ -1082,1551 +1078,6 @@ describe('DOMModernPluginEventSystem', () => {\n ]);\n }\n });\n-\n- describe('ReactDOM.useEvent', () => {\n- beforeEach(() => {\n- jest.resetModules();\n- ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n- ReactFeatureFlags.enableModernEventSystem = true;\n- ReactFeatureFlags.enableUseEventAPI = true;\n-\n- React = require('react');\n- ReactDOM = require('react-dom');\n- Scheduler = require('scheduler');\n- ReactDOMServer = require('react-dom\/server');\n- ReactTestUtils = require('react-dom\/test-utils');\n- });\n-\n- \/\/ @gate experimental\n- it('should create the same event listener map', () => {\n- const listenerMaps = [];\n-\n- function Test() {\n- const listenerMap = ReactDOM.unstable_useEvent('click');\n-\n- listenerMaps.push(listenerMap);\n-\n- return

;\n- }\n-\n- ReactDOM.render(, container);\n- ReactDOM.render(, container);\n- expect(listenerMaps.length).toEqual(2);\n- expect(listenerMaps[0]).toEqual(listenerMaps[1]);\n- });\n-\n- \/\/ @gate experimental\n- it('can render correctly with the ReactDOMServer', () => {\n- const clickEvent = jest.fn();\n-\n- function Test() {\n- const divRef = React.useRef(null);\n- const click = ReactDOM.unstable_useEvent('click');\n-\n- React.useEffect(() => {\n- click.setListener(divRef.current, clickEvent);\n- });\n-\n- return

Hello world<\/div>;\n- }\n- const output = ReactDOMServer.renderToString();\n- expect(output).toBe(`

Hello world<\/div>`);\n- });\n-\n- \/\/ @gate experimental\n- it('can render correctly with the ReactDOMServer hydration', () => {\n- const clickEvent = jest.fn();\n- const spanRef = React.createRef();\n-\n- function Test() {\n- const click = ReactDOM.unstable_useEvent('click');\n-\n- React.useEffect(() => {\n- click.setListener(spanRef.current, clickEvent);\n- });\n-\n- return (\n-

\n- Hello world<\/span>\n- <\/div>\n- );\n- }\n- const output = ReactDOMServer.renderToString();\n- expect(output).toBe(\n- `

Hello world<\/span><\/div>`,\n- );\n- container.innerHTML = output;\n- ReactDOM.hydrate(, container);\n- Scheduler.unstable_flushAll();\n- dispatchClickEvent(spanRef.current);\n- expect(clickEvent).toHaveBeenCalledTimes(1);\n- });\n-\n- \/\/ @gate experimental\n- it('should correctly work for a basic \"click\" listener', () => {\n- let log = [];\n- const clickEvent = jest.fn(event => {\n- log.push({\n- eventPhase: event.eventPhase,\n- type: event.type,\n- currentTarget: event.currentTarget,\n- target: event.target,\n- });\n- });\n- const divRef = React.createRef();\n- const buttonRef = React.createRef();\n-\n- function Test() {\n- const click = ReactDOM.unstable_useEvent('click');\n-\n- React.useEffect(() => {\n- click.setListener(buttonRef.current, clickEvent);\n- });\n-\n- return (\n-

dillon1000/react

Files changed