{"commit":{"authorName":"Dominic Gannaway","revision":"f48a5e64e8fd903293f5b854beb795dcc6bae86d","subject":"Further cleanup of plugin event system (#18056)","authorEmail":"trueadm@users.noreply.github.com","authoredAt":"2020-02-18T13:31:59+00:00","shortRevision":"f48a5e64e8"},"body":"","parents":["d533229fba8f7e7e576436bf52bbcae56c862906"],"files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMFB.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMEventListenerMap.js","status":"A"},{"path":"packages\/react-dom\/src\/events\/DOMEventPluginSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js","status":"D"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/SelectEventPlugin.js","status":"M"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\nindex 114565d342..0b377d16ec 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n@@ -14,7 +14,8 @@ let EventPluginRegistry;\n let React;\n let ReactDOM;\n let ReactDOMComponentTree;\n-let ReactBrowserEventEmitter;\n+let DOMEventPluginSystem;\n+let ReactDOMEventListener;\n let ReactTestUtils;\n \n let idCallOrder;\n@@ -52,18 +53,21 @@ function registerSimpleTestHandler() {\n return getListener(CHILD, ON_CLICK_KEY);\n }\n \n+\/\/ We should probably remove this file at some point, it's just full of\n+\/\/ internal API usage. ReactBrowserEventEmitter was refactored out in\n+\/\/ #18056 too. The majority of this code lives in DOMEventPluginSystem.\n describe('ReactBrowserEventEmitter', () => {\n beforeEach(() => {\n jest.resetModules();\n LISTENER.mockClear();\n \n- \/\/ TODO: can we express this test with only public API?\n EventPluginGetListener = require('legacy-events\/getListener').default;\n EventPluginRegistry = require('legacy-events\/EventPluginRegistry');\n React = require('react');\n ReactDOM = require('react-dom');\n ReactDOMComponentTree = require('..\/client\/ReactDOMComponentTree');\n- ReactBrowserEventEmitter = require('..\/events\/ReactBrowserEventEmitter');\n+ DOMEventPluginSystem = require('..\/events\/DOMEventPluginSystem');\n+ ReactDOMEventListener = require('..\/events\/ReactDOMEventListener');\n ReactTestUtils = require('react-dom\/test-utils');\n \n container = document.createElement('div');\n@@ -177,12 +181,12 @@ describe('ReactBrowserEventEmitter', () => {\n expect(LISTENER).toHaveBeenCalledTimes(1);\n });\n \n- it('should not invoke handlers if ReactBrowserEventEmitter is disabled', () => {\n+ it('should not invoke handlers if ReactDOMEventListener is disabled', () => {\n registerSimpleTestHandler();\n- ReactBrowserEventEmitter.setEnabled(false);\n+ ReactDOMEventListener.setEnabled(false);\n CHILD.click();\n expect(LISTENER).toHaveBeenCalledTimes(0);\n- ReactBrowserEventEmitter.setEnabled(true);\n+ ReactDOMEventListener.setEnabled(true);\n CHILD.click();\n expect(LISTENER).toHaveBeenCalledTimes(1);\n });\n@@ -346,15 +350,15 @@ describe('ReactBrowserEventEmitter', () => {\n \n it('should listen to events only once', () => {\n spyOnDevAndProd(EventTarget.prototype, 'addEventListener');\n- ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);\n- ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);\n+ DOMEventPluginSystem.listenToEvent(ON_CLICK_KEY, document);\n+ DOMEventPluginSystem.listenToEvent(ON_CLICK_KEY, document);\n expect(EventTarget.prototype.addEventListener).toHaveBeenCalledTimes(1);\n });\n \n it('should work with event plugins without dependencies', () => {\n spyOnDevAndProd(EventTarget.prototype, 'addEventListener');\n \n- ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);\n+ DOMEventPluginSystem.listenToEvent(ON_CLICK_KEY, document);\n \n expect(EventTarget.prototype.addEventListener.calls.argsFor(0)[0]).toBe(\n 'click',\n@@ -364,7 +368,7 @@ describe('ReactBrowserEventEmitter', () => {\n it('should work with event plugins with dependencies', () => {\n spyOnDevAndProd(EventTarget.prototype, 'addEventListener');\n \n- ReactBrowserEventEmitter.listenTo(ON_CHANGE_KEY, document);\n+ DOMEventPluginSystem.listenToEvent(ON_CHANGE_KEY, document);\n \n const setEventListeners = [];\n const listenCalls = EventTarget.prototype.addEventListener.calls.allArgs();\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex e5111ae603..aa01964f9b 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -57,14 +57,11 @@ import {\n TOP_SUBMIT,\n TOP_TOGGLE,\n } from '..\/events\/DOMTopLevelEventTypes';\n-import {\n- listenTo,\n- trapBubbledEvent,\n- getListenerMapForElement,\n-} from '..\/events\/ReactBrowserEventEmitter';\n+import {getListenerMapForElement} from '..\/events\/DOMEventListenerMap';\n import {\n addResponderEventSystemEvent,\n removeActiveResponderEventSystemEvent,\n+ trapBubbledEvent,\n } from '..\/events\/ReactDOMEventListener.js';\n import {mediaEventTypes} from '..\/events\/DOMTopLevelEventTypes';\n import {\n@@ -90,6 +87,7 @@ import {\n enableDeprecatedFlareAPI,\n enableTrustedTypesIntegration,\n } from 'shared\/ReactFeatureFlags';\n+import {listenToEvent} from '..\/events\/DOMEventPluginSystem';\n \n let didWarnInvalidHydration = false;\n let didWarnShadyDOM = false;\n@@ -274,7 +272,7 @@ function ensureListeningTo(\n const doc = isDocumentOrFragment\n ? rootContainerElement\n : rootContainerElement.ownerDocument;\n- listenTo(registrationName, doc);\n+ listenToEvent(registrationName, doc);\n }\n \n function getOwnerDocumentFromRootContainer(\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMFB.js b\/packages\/react-dom\/src\/client\/ReactDOMFB.js\nindex 5acb45d81e..02403919e7 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMFB.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMFB.js\n@@ -10,7 +10,7 @@\n import {addUserTimingListener} from 'shared\/ReactFeatureFlags';\n \n import ReactDOM from '.\/ReactDOM';\n-import {isEnabled} from '..\/events\/ReactBrowserEventEmitter';\n+import {isEnabled} from '..\/events\/ReactDOMEventListener';\n import {getClosestInstanceFromNode} from '.\/ReactDOMComponentTree';\n \n if (__EXPERIMENTAL__) {\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 2e90978b31..0cf8db9da9 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -34,7 +34,7 @@ import {validateDOMNesting, updatedAncestorInfo} from '.\/validateDOMNesting';\n import {\n isEnabled as ReactBrowserEventEmitterIsEnabled,\n setEnabled as ReactBrowserEventEmitterSetEnabled,\n-} from '..\/events\/ReactBrowserEventEmitter';\n+} from '..\/events\/ReactDOMEventListener';\n import {getChildNamespace} from '..\/shared\/DOMNamespaces';\n import {\n ELEMENT_NODE,\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventListenerMap.js b\/packages\/react-dom\/src\/events\/DOMEventListenerMap.js\nnew file mode 100644\nindex 0000000000..b951eed1b6\n--- \/dev\/null\n+++ b\/packages\/react-dom\/src\/events\/DOMEventListenerMap.js\n@@ -0,0 +1,31 @@\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+\n+const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n+\/\/ prettier-ignore\n+const elementListenerMap:\n+ \/\/ $FlowFixMe Work around Flow bug\n+ | WeakMap\n+ | Map<\n+ Document | Element | Node,\n+ Map void)>,\n+ > = new PossiblyWeakMap();\n+\n+export function getListenerMapForElement(\n+ element: Document | Element | Node,\n+): Map void)> {\n+ let listenerMap = elementListenerMap.get(element);\n+ if (listenerMap === undefined) {\n+ listenerMap = new Map();\n+ elementListenerMap.set(element, listenerMap);\n+ }\n+ return listenerMap;\n+}\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js b\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js\nindex 40190f30e3..ad8b38f794 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js\n@@ -21,9 +21,81 @@ import {batchedEventUpdates} from 'legacy-events\/ReactGenericBatching';\n import {runEventsInBatch} from 'legacy-events\/EventBatching';\n import {plugins} from 'legacy-events\/EventPluginRegistry';\n import accumulateInto from 'legacy-events\/accumulateInto';\n+import {registrationNameDependencies} from 'legacy-events\/EventPluginRegistry';\n \n import getEventTarget from '.\/getEventTarget';\n import {getClosestInstanceFromNode} from '..\/client\/ReactDOMComponentTree';\n+import {trapCapturedEvent, trapBubbledEvent} from '.\/ReactDOMEventListener';\n+import {getListenerMapForElement} from '.\/DOMEventListenerMap';\n+import isEventSupported from '.\/isEventSupported';\n+import {\n+ TOP_BLUR,\n+ TOP_CANCEL,\n+ TOP_CLOSE,\n+ TOP_FOCUS,\n+ TOP_INVALID,\n+ TOP_RESET,\n+ TOP_SCROLL,\n+ TOP_SUBMIT,\n+ getRawEventName,\n+ mediaEventTypes,\n+} from '.\/DOMTopLevelEventTypes';\n+\n+\/**\n+ * Summary of `DOMEventPluginSystem` event handling:\n+ *\n+ * - Top-level delegation is used to trap most native browser events. This\n+ * may only occur in the main thread and is the responsibility of\n+ * ReactDOMEventListener, which is injected and can therefore support\n+ * pluggable event sources. This is the only work that occurs in the main\n+ * thread.\n+ *\n+ * - We normalize and de-duplicate events to account for browser quirks. This\n+ * may be done in the worker thread.\n+ *\n+ * - Forward these native events (with the associated top-level type used to\n+ * trap it) to `EventPluginRegistry`, which in turn will ask plugins if they want\n+ * to extract any synthetic events.\n+ *\n+ * - The `EventPluginRegistry` will then process each event by annotating them with\n+ * \"dispatches\", a sequence of listeners and IDs that care about that event.\n+ *\n+ * - The `EventPluginRegistry` then dispatches the events.\n+ *\n+ * Overview of React and the event system:\n+ *\n+ * +------------+ .\n+ * | DOM | .\n+ * +------------+ .\n+ * | .\n+ * v .\n+ * +------------+ .\n+ * | ReactEvent | .\n+ * | Listener | .\n+ * +------------+ . +-----------+\n+ * | . +--------+|SimpleEvent|\n+ * | . | |Plugin |\n+ * +-----|------+ . v +-----------+\n+ * | | | . +--------------+ +------------+\n+ * | +-----------.--->|PluginRegistry| | Event |\n+ * | | . | | +-----------+ | Propagators|\n+ * | ReactEvent | . | | |TapEvent | |------------|\n+ * | Emitter | . | |<---+|Plugin | |other plugin|\n+ * | | . | | +-----------+ | utilities |\n+ * | +-----------.--->| | +------------+\n+ * | | | . +--------------+\n+ * +-----|------+ . ^ +-----------+\n+ * | . | |Enter\/Leave|\n+ * + . +-------+|Plugin |\n+ * +-------------+ . +-----------+\n+ * | application | .\n+ * |-------------| .\n+ * | | .\n+ * | | .\n+ * +-------------+ .\n+ * .\n+ * React Core . General Purpose Event Plugin System\n+ *\/\n \n const CALLBACK_BOOKKEEPING_POOL_SIZE = 10;\n const callbackBookkeepingPool = [];\n@@ -213,3 +285,97 @@ export function dispatchEventForPluginEventSystem(\n releaseTopLevelCallbackBookKeeping(bookKeeping);\n }\n }\n+\n+\/**\n+ * We listen for bubbled touch events on the document object.\n+ *\n+ * Firefox v8.01 (and possibly others) exhibited strange behavior when\n+ * mounting `onmousemove` events at some node that was not the document\n+ * element. The symptoms were that if your mouse is not moving over something\n+ * contained within that mount point (for example on the background) the\n+ * top-level listeners for `onmousemove` won't be called. However, if you\n+ * register the `mousemove` on the document object, then it will of course\n+ * catch all `mousemove`s. This along with iOS quirks, justifies restricting\n+ * top-level listeners to the document object only, at least for these\n+ * movement types of events and possibly all events.\n+ *\n+ * @see http:\/\/www.quirksmode.org\/blog\/archives\/2010\/09\/click_event_del.html\n+ *\n+ * Also, `keyup`\/`keypress`\/`keydown` do not bubble to the window on IE, but\n+ * they bubble to document.\n+ *\n+ * @param {string} registrationName Name of listener (e.g. `onClick`).\n+ * @param {object} mountAt Container where to mount the listener\n+ *\/\n+export function listenToEvent(\n+ registrationName: string,\n+ mountAt: Document | Element | Node,\n+): void {\n+ const listeningSet = getListenerMapForElement(mountAt);\n+ const dependencies = registrationNameDependencies[registrationName];\n+\n+ for (let i = 0; i < dependencies.length; i++) {\n+ const dependency = dependencies[i];\n+ listenToTopLevelEvent(dependency, mountAt, listeningSet);\n+ }\n+}\n+\n+export function listenToTopLevelEvent(\n+ topLevelType: DOMTopLevelEventType,\n+ mountAt: Document | Element | Node,\n+ listenerMap: Map void)>,\n+): void {\n+ if (!listenerMap.has(topLevelType)) {\n+ switch (topLevelType) {\n+ case TOP_SCROLL:\n+ trapCapturedEvent(TOP_SCROLL, mountAt);\n+ break;\n+ case TOP_FOCUS:\n+ case TOP_BLUR:\n+ trapCapturedEvent(TOP_FOCUS, mountAt);\n+ trapCapturedEvent(TOP_BLUR, mountAt);\n+ \/\/ We set the flag for a single dependency later in this function,\n+ \/\/ but this ensures we mark both as attached rather than just one.\n+ listenerMap.set(TOP_BLUR, null);\n+ listenerMap.set(TOP_FOCUS, null);\n+ break;\n+ case TOP_CANCEL:\n+ case TOP_CLOSE:\n+ if (isEventSupported(getRawEventName(topLevelType))) {\n+ trapCapturedEvent(topLevelType, mountAt);\n+ }\n+ break;\n+ case TOP_INVALID:\n+ case TOP_SUBMIT:\n+ case TOP_RESET:\n+ \/\/ We listen to them on the target DOM elements.\n+ \/\/ Some of them bubble so we don't want them to fire twice.\n+ break;\n+ default:\n+ \/\/ By default, listen on the top level to all non-media events.\n+ \/\/ Media events don't bubble so adding the listener wouldn't do anything.\n+ const isMediaEvent = mediaEventTypes.indexOf(topLevelType) !== -1;\n+ if (!isMediaEvent) {\n+ trapBubbledEvent(topLevelType, mountAt);\n+ }\n+ break;\n+ }\n+ listenerMap.set(topLevelType, null);\n+ }\n+}\n+\n+export function isListeningToAllDependencies(\n+ registrationName: string,\n+ mountAt: Document | Element,\n+): boolean {\n+ const listenerMap = getListenerMapForElement(mountAt);\n+ const dependencies = registrationNameDependencies[registrationName];\n+\n+ for (let i = 0; i < dependencies.length; i++) {\n+ const dependency = dependencies[i];\n+ if (!listenerMap.has(dependency)) {\n+ return false;\n+ }\n+ }\n+ return true;\n+}\ndiff --git a\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js b\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js\ndeleted file mode 100644\nindex 3cc7aae2f2..0000000000\n--- a\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js\n+++ \/dev\/null\n@@ -1,203 +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 {registrationNameDependencies} from 'legacy-events\/EventPluginRegistry';\n-import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n-import {\n- TOP_BLUR,\n- TOP_CANCEL,\n- TOP_CLOSE,\n- TOP_FOCUS,\n- TOP_INVALID,\n- TOP_RESET,\n- TOP_SCROLL,\n- TOP_SUBMIT,\n- getRawEventName,\n- mediaEventTypes,\n-} from '.\/DOMTopLevelEventTypes';\n-import {\n- setEnabled,\n- isEnabled,\n- trapBubbledEvent,\n- trapCapturedEvent,\n-} from '.\/ReactDOMEventListener';\n-import isEventSupported from '.\/isEventSupported';\n-\n-\/**\n- * Summary of `ReactBrowserEventEmitter` event handling:\n- *\n- * - Top-level delegation is used to trap most native browser events. This\n- * may only occur in the main thread and is the responsibility of\n- * ReactDOMEventListener, which is injected and can therefore support\n- * pluggable event sources. This is the only work that occurs in the main\n- * thread.\n- *\n- * - We normalize and de-duplicate events to account for browser quirks. This\n- * may be done in the worker thread.\n- *\n- * - Forward these native events (with the associated top-level type used to\n- * trap it) to `EventPluginRegistry`, which in turn will ask plugins if they want\n- * to extract any synthetic events.\n- *\n- * - The `EventPluginRegistry` will then process each event by annotating them with\n- * \"dispatches\", a sequence of listeners and IDs that care about that event.\n- *\n- * - The `EventPluginRegistry` then dispatches the events.\n- *\n- * Overview of React and the event system:\n- *\n- * +------------+ .\n- * | DOM | .\n- * +------------+ .\n- * | .\n- * v .\n- * +------------+ .\n- * | ReactEvent | .\n- * | Listener | .\n- * +------------+ . +-----------+\n- * | . +--------+|SimpleEvent|\n- * | . | |Plugin |\n- * +-----|------+ . v +-----------+\n- * | | | . +--------------+ +------------+\n- * | +-----------.--->|PluginRegistry| | Event |\n- * | | . | | +-----------+ | Propagators|\n- * | ReactEvent | . | | |TapEvent | |------------|\n- * | Emitter | . | |<---+|Plugin | |other plugin|\n- * | | . | | +-----------+ | utilities |\n- * | +-----------.--->| | +------------+\n- * | | | . +--------------+\n- * +-----|------+ . ^ +-----------+\n- * | . | |Enter\/Leave|\n- * + . +-------+|Plugin |\n- * +-------------+ . +-----------+\n- * | application | .\n- * |-------------| .\n- * | | .\n- * | | .\n- * +-------------+ .\n- * .\n- * React Core . General Purpose Event Plugin System\n- *\/\n-\n-const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n-\/\/ prettier-ignore\n-const elementListenerMap:\n- \/\/ $FlowFixMe Work around Flow bug\n- | WeakMap\n- | Map<\n- Document | Element | Node,\n- Map void)>,\n- > = new PossiblyWeakMap();\n-\n-export function getListenerMapForElement(\n- element: Document | Element | Node,\n-): Map void)> {\n- let listenerMap = elementListenerMap.get(element);\n- if (listenerMap === undefined) {\n- listenerMap = new Map();\n- elementListenerMap.set(element, listenerMap);\n- }\n- return listenerMap;\n-}\n-\n-\/**\n- * We listen for bubbled touch events on the document object.\n- *\n- * Firefox v8.01 (and possibly others) exhibited strange behavior when\n- * mounting `onmousemove` events at some node that was not the document\n- * element. The symptoms were that if your mouse is not moving over something\n- * contained within that mount point (for example on the background) the\n- * top-level listeners for `onmousemove` won't be called. However, if you\n- * register the `mousemove` on the document object, then it will of course\n- * catch all `mousemove`s. This along with iOS quirks, justifies restricting\n- * top-level listeners to the document object only, at least for these\n- * movement types of events and possibly all events.\n- *\n- * @see http:\/\/www.quirksmode.org\/blog\/archives\/2010\/09\/click_event_del.html\n- *\n- * Also, `keyup`\/`keypress`\/`keydown` do not bubble to the window on IE, but\n- * they bubble to document.\n- *\n- * @param {string} registrationName Name of listener (e.g. `onClick`).\n- * @param {object} mountAt Container where to mount the listener\n- *\/\n-export function listenTo(\n- registrationName: string,\n- mountAt: Document | Element | Node,\n-): void {\n- const listeningSet = getListenerMapForElement(mountAt);\n- const dependencies = registrationNameDependencies[registrationName];\n-\n- for (let i = 0; i < dependencies.length; i++) {\n- const dependency = dependencies[i];\n- listenToTopLevel(dependency, mountAt, listeningSet);\n- }\n-}\n-\n-export function listenToTopLevel(\n- topLevelType: DOMTopLevelEventType,\n- mountAt: Document | Element | Node,\n- listenerMap: Map void)>,\n-): void {\n- if (!listenerMap.has(topLevelType)) {\n- switch (topLevelType) {\n- case TOP_SCROLL:\n- trapCapturedEvent(TOP_SCROLL, mountAt);\n- break;\n- case TOP_FOCUS:\n- case TOP_BLUR:\n- trapCapturedEvent(TOP_FOCUS, mountAt);\n- trapCapturedEvent(TOP_BLUR, mountAt);\n- \/\/ We set the flag for a single dependency later in this function,\n- \/\/ but this ensures we mark both as attached rather than just one.\n- listenerMap.set(TOP_BLUR, null);\n- listenerMap.set(TOP_FOCUS, null);\n- break;\n- case TOP_CANCEL:\n- case TOP_CLOSE:\n- if (isEventSupported(getRawEventName(topLevelType))) {\n- trapCapturedEvent(topLevelType, mountAt);\n- }\n- break;\n- case TOP_INVALID:\n- case TOP_SUBMIT:\n- case TOP_RESET:\n- \/\/ We listen to them on the target DOM elements.\n- \/\/ Some of them bubble so we don't want them to fire twice.\n- break;\n- default:\n- \/\/ By default, listen on the top level to all non-media events.\n- \/\/ Media events don't bubble so adding the listener wouldn't do anything.\n- const isMediaEvent = mediaEventTypes.indexOf(topLevelType) !== -1;\n- if (!isMediaEvent) {\n- trapBubbledEvent(topLevelType, mountAt);\n- }\n- break;\n- }\n- listenerMap.set(topLevelType, null);\n- }\n-}\n-\n-export function isListeningToAllDependencies(\n- registrationName: string,\n- mountAt: Document | Element,\n-): boolean {\n- const listenerMap = getListenerMapForElement(mountAt);\n- const dependencies = registrationNameDependencies[registrationName];\n-\n- for (let i = 0; i < dependencies.length; i++) {\n- const dependency = dependencies[i];\n- if (!listenerMap.has(dependency)) {\n- return false;\n- }\n- }\n- return true;\n-}\n-\n-export {setEnabled, isEnabled, trapBubbledEvent, trapCapturedEvent};\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\nindex b0c999caf4..36a78b5d0f 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n@@ -32,10 +32,7 @@ import {\n attemptToDispatchEvent,\n addResponderEventSystemEvent,\n } from '.\/ReactDOMEventListener';\n-import {\n- getListenerMapForElement,\n- listenToTopLevel,\n-} from '.\/ReactBrowserEventEmitter';\n+import {getListenerMapForElement} from '.\/DOMEventListenerMap';\n import {\n getInstanceFromNode,\n getClosestInstanceFromNode,\n@@ -120,6 +117,7 @@ import {\n TOP_BLUR,\n } from '.\/DOMTopLevelEventTypes';\n import {IS_REPLAYED} from 'legacy-events\/EventSystemFlags';\n+import {listenToTopLevelEvent} from '.\/DOMEventPluginSystem';\n \n type QueuedReplayableEvent = {|\n blockedOn: null | Container | SuspenseInstance,\n@@ -217,7 +215,7 @@ function trapReplayableEvent(\n document: Document,\n listenerMap: Map void)>,\n ) {\n- listenToTopLevel(topLevelType, document, listenerMap);\n+ listenToTopLevelEvent(topLevelType, document, listenerMap);\n if (enableDeprecatedFlareAPI) {\n \/\/ Trap events for the responder system.\n const topLevelTypeString = unsafeCastDOMTopLevelTypeToString(topLevelType);\ndiff --git a\/packages\/react-dom\/src\/events\/SelectEventPlugin.js b\/packages\/react-dom\/src\/events\/SelectEventPlugin.js\nindex b358e896ea..2c3da14bbe 100644\n--- a\/packages\/react-dom\/src\/events\/SelectEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/SelectEventPlugin.js\n@@ -22,11 +22,11 @@ import {\n TOP_MOUSE_UP,\n TOP_SELECTION_CHANGE,\n } from '.\/DOMTopLevelEventTypes';\n-import {isListeningToAllDependencies} from '.\/ReactBrowserEventEmitter';\n import getActiveElement from '..\/client\/getActiveElement';\n import {getNodeFromInstance} from '..\/client\/ReactDOMComponentTree';\n import {hasSelectionCapabilities} from '..\/client\/ReactInputSelection';\n import {DOCUMENT_NODE} from '..\/shared\/HTMLNodeType';\n+import {isListeningToAllDependencies} from '.\/DOMEventPluginSystem';\n \n const skipSelectionChangeEvent =\n canUseDOM && 'documentMode' in document && document.documentMode <= 11;\n"}

dillon1000/react

Files changed