{"patch":"diff --git a\/packages\/legacy-events\/EventPluginHub.js b\/packages\/legacy-events\/EventPluginHub.js\ndeleted file mode 100644\nindex 4079460230..0000000000\n--- a\/packages\/legacy-events\/EventPluginHub.js\n+++ \/dev\/null\n@@ -1,176 +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- * @flow\n- *\/\n-\n-import invariant from 'shared\/invariant';\n-\n-import {\n- injectEventPluginOrder,\n- injectEventPluginsByName,\n- plugins,\n-} from '.\/EventPluginRegistry';\n-import {getFiberCurrentPropsFromNode} from '.\/EventPluginUtils';\n-import accumulateInto from '.\/accumulateInto';\n-import {runEventsInBatch} from '.\/EventBatching';\n-\n-import type {PluginModule} from '.\/PluginModuleType';\n-import type {ReactSyntheticEvent} from '.\/ReactSyntheticEventType';\n-import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n-import type {AnyNativeEvent} from '.\/PluginModuleType';\n-import type {TopLevelType} from '.\/TopLevelEventTypes';\n-import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n-\n-function isInteractive(tag) {\n- return (\n- tag === 'button' ||\n- tag === 'input' ||\n- tag === 'select' ||\n- tag === 'textarea'\n- );\n-}\n-\n-function shouldPreventMouseEvent(name, type, props) {\n- switch (name) {\n- case 'onClick':\n- case 'onClickCapture':\n- case 'onDoubleClick':\n- case 'onDoubleClickCapture':\n- case 'onMouseDown':\n- case 'onMouseDownCapture':\n- case 'onMouseMove':\n- case 'onMouseMoveCapture':\n- case 'onMouseUp':\n- case 'onMouseUpCapture':\n- case 'onMouseEnter':\n- return !!(props.disabled && isInteractive(type));\n- default:\n- return false;\n- }\n-}\n-\n-\/**\n- * This is a unified interface for event plugins to be installed and configured.\n- *\n- * Event plugins can implement the following properties:\n- *\n- * `extractEvents` {function(string, DOMEventTarget, string, object): *}\n- * Required. When a top-level event is fired, this method is expected to\n- * extract synthetic events that will in turn be queued and dispatched.\n- *\n- * `eventTypes` {object}\n- * Optional, plugins that fire events must publish a mapping of registration\n- * names that are used to register listeners. Values of this mapping must\n- * be objects that contain `registrationName` or `phasedRegistrationNames`.\n- *\n- * `executeDispatch` {function(object, function, string)}\n- * Optional, allows plugins to override how an event gets dispatched. By\n- * default, the listener is simply invoked.\n- *\n- * Each plugin that is injected into `EventsPluginHub` is immediately operable.\n- *\n- * @public\n- *\/\n-\n-\/**\n- * Methods for injecting dependencies.\n- *\/\n-export const injection = {\n- \/**\n- * @param {array} InjectedEventPluginOrder\n- * @public\n- *\/\n- injectEventPluginOrder,\n-\n- \/**\n- * @param {object} injectedNamesToPlugins Map from names to plugin modules.\n- *\/\n- injectEventPluginsByName,\n-};\n-\n-\/**\n- * @param {object} inst The instance, which is the source of events.\n- * @param {string} registrationName Name of listener (e.g. `onClick`).\n- * @return {?function} The stored callback.\n- *\/\n-export function getListener(inst: Fiber, registrationName: string) {\n- let listener;\n-\n- \/\/ TODO: shouldPreventMouseEvent is DOM-specific and definitely should not\n- \/\/ live here; needs to be moved to a better place soon\n- const stateNode = inst.stateNode;\n- if (!stateNode) {\n- \/\/ Work in progress (ex: onload events in incremental mode).\n- return null;\n- }\n- const props = getFiberCurrentPropsFromNode(stateNode);\n- if (!props) {\n- \/\/ Work in progress.\n- return null;\n- }\n- listener = props[registrationName];\n- if (shouldPreventMouseEvent(registrationName, inst.type, props)) {\n- return null;\n- }\n- invariant(\n- !listener || typeof listener === 'function',\n- 'Expected `%s` listener to be a function, instead got a value of `%s` type.',\n- registrationName,\n- typeof listener,\n- );\n- return listener;\n-}\n-\n-\/**\n- * Allows registered plugins an opportunity to extract events from top-level\n- * native browser events.\n- *\n- * @return {*} An accumulation of synthetic events.\n- * @internal\n- *\/\n-function extractPluginEvents(\n- topLevelType: TopLevelType,\n- targetInst: null | Fiber,\n- nativeEvent: AnyNativeEvent,\n- nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n-): Array | ReactSyntheticEvent | null {\n- let events = null;\n- for (let i = 0; i < plugins.length; i++) {\n- \/\/ Not every plugin in the ordering may be loaded at runtime.\n- const possiblePlugin: PluginModule = plugins[i];\n- if (possiblePlugin) {\n- const extractedEvents = possiblePlugin.extractEvents(\n- topLevelType,\n- targetInst,\n- nativeEvent,\n- nativeEventTarget,\n- eventSystemFlags,\n- );\n- if (extractedEvents) {\n- events = accumulateInto(events, extractedEvents);\n- }\n- }\n- }\n- return events;\n-}\n-\n-export function runExtractedPluginEventsInBatch(\n- topLevelType: TopLevelType,\n- targetInst: null | Fiber,\n- nativeEvent: AnyNativeEvent,\n- nativeEventTarget: null | EventTarget,\n- eventSystemFlags: EventSystemFlags,\n-) {\n- const events = extractPluginEvents(\n- topLevelType,\n- targetInst,\n- nativeEvent,\n- nativeEventTarget,\n- eventSystemFlags,\n- );\n- runEventsInBatch(events);\n-}\ndiff --git a\/packages\/legacy-events\/EventPluginRegistry.js b\/packages\/legacy-events\/EventPluginRegistry.js\nindex 64c2a9a1e0..067e260313 100644\n--- a\/packages\/legacy-events\/EventPluginRegistry.js\n+++ b\/packages\/legacy-events\/EventPluginRegistry.js\n@@ -89,7 +89,7 @@ function publishEventForPlugin(\n ): boolean {\n invariant(\n !eventNameDispatchConfigs.hasOwnProperty(eventName),\n- 'EventPluginHub: More than one plugin attempted to publish the same ' +\n+ 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n 'event name, `%s`.',\n eventName,\n );\n@@ -133,7 +133,7 @@ function publishRegistrationName(\n ): void {\n invariant(\n !registrationNameModules[registrationName],\n- 'EventPluginHub: More than one plugin attempted to publish the same ' +\n+ 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n 'registration name, `%s`.',\n registrationName,\n );\n@@ -153,8 +153,6 @@ function publishRegistrationName(\n \n \/**\n * Registers plugins so that they can extract and dispatch events.\n- *\n- * @see {EventPluginHub}\n *\/\n \n \/**\n@@ -193,7 +191,6 @@ export const possibleRegistrationNames = __DEV__ ? {} : (null: any);\n *\n * @param {array} InjectedEventPluginOrder\n * @internal\n- * @see {EventPluginHub.injection.injectEventPluginOrder}\n *\/\n export function injectEventPluginOrder(\n injectedEventPluginOrder: EventPluginOrder,\n@@ -209,14 +206,13 @@ export function injectEventPluginOrder(\n }\n \n \/**\n- * Injects plugins to be used by `EventPluginHub`. The plugin names must be\n+ * Injects plugins to be used by plugin event system. The plugin names must be\n * in the ordering injected by `injectEventPluginOrder`.\n *\n * Plugins can be injected as part of page initialization or on-the-fly.\n *\n * @param {object} injectedNamesToPlugins Map from names to plugin modules.\n * @internal\n- * @see {EventPluginHub.injection.injectEventPluginsByName}\n *\/\n export function injectEventPluginsByName(\n injectedNamesToPlugins: NamesToPlugins,\ndiff --git a\/packages\/legacy-events\/EventPropagators.js b\/packages\/legacy-events\/EventPropagators.js\nindex dfaacdab4d..d916de99a3 100644\n--- a\/packages\/legacy-events\/EventPropagators.js\n+++ b\/packages\/legacy-events\/EventPropagators.js\n@@ -11,7 +11,7 @@ import {\n traverseEnterLeave,\n } from 'shared\/ReactTreeTraversal';\n \n-import {getListener} from '.\/EventPluginHub';\n+import getListener from 'legacy-events\/getListener';\n import accumulateInto from '.\/accumulateInto';\n import forEachAccumulated from '.\/forEachAccumulated';\n \ndiff --git a\/packages\/legacy-events\/ResponderEventPlugin.js b\/packages\/legacy-events\/ResponderEventPlugin.js\nindex a5d4fe0251..a1e9ae7f0a 100644\n--- a\/packages\/legacy-events\/ResponderEventPlugin.js\n+++ b\/packages\/legacy-events\/ResponderEventPlugin.js\n@@ -282,7 +282,7 @@ to return true:wantsResponderID| |\n + + *\/\n \n \/**\n- * A note about event ordering in the `EventPluginHub`.\n+ * A note about event ordering in the `EventPluginRegistry`.\n *\n * Suppose plugins are injected in the following order:\n *\n@@ -301,7 +301,7 @@ to return true:wantsResponderID| |\n * - When returned from `extractEvents`, deferred-dispatched events contain an\n * \"accumulation\" of deferred dispatches.\n * - These deferred dispatches are accumulated\/collected before they are\n- * returned, but processed at a later time by the `EventPluginHub` (hence the\n+ * returned, but processed at a later time by the `EventPluginRegistry` (hence the\n * name deferred).\n *\n * In the process of returning their deferred-dispatched events, event plugins\n@@ -325,9 +325,9 @@ to return true:wantsResponderID| |\n * - `R`s on-demand events (if any) (dispatched by `R` on-demand)\n * - `S`s on-demand events (if any) (dispatched by `S` on-demand)\n * - `C`s on-demand events (if any) (dispatched by `C` on-demand)\n- * - `R`s extracted events (if any) (dispatched by `EventPluginHub`)\n- * - `S`s extracted events (if any) (dispatched by `EventPluginHub`)\n- * - `C`s extracted events (if any) (dispatched by `EventPluginHub`)\n+ * - `R`s extracted events (if any) (dispatched by `EventPluginRegistry`)\n+ * - `S`s extracted events (if any) (dispatched by `EventPluginRegistry`)\n+ * - `C`s extracted events (if any) (dispatched by `EventPluginRegistry`)\n *\n * In the case of `ResponderEventPlugin`: If the `startShouldSetResponder`\n * on-demand dispatch returns `true` (and some other details are satisfied) the\n@@ -336,9 +336,9 @@ to return true:wantsResponderID| |\n * will appear as follows:\n *\n * - `startShouldSetResponder` (`ResponderEventPlugin` dispatches on-demand)\n- * - `touchStartCapture` (`EventPluginHub` dispatches as usual)\n- * - `touchStart` (`EventPluginHub` dispatches as usual)\n- * - `responderGrant\/Reject` (`EventPluginHub` dispatches as usual)\n+ * - `touchStartCapture` (`EventPluginRegistry` dispatches as usual)\n+ * - `touchStart` (`EventPluginRegistry` dispatches as usual)\n+ * - `responderGrant\/Reject` (`EventPluginRegistry` dispatches as usual)\n *\/\n \n function setResponderAndExtractTransfer(\ndiff --git a\/packages\/legacy-events\/__tests__\/EventPluginRegistry-test.internal.js b\/packages\/legacy-events\/__tests__\/EventPluginRegistry-test.internal.js\nindex c56f2e5748..2f30399cd8 100644\n--- a\/packages\/legacy-events\/__tests__\/EventPluginRegistry-test.internal.js\n+++ b\/packages\/legacy-events\/__tests__\/EventPluginRegistry-test.internal.js\n@@ -211,7 +211,7 @@ describe('EventPluginRegistry', () => {\n expect(function() {\n EventPluginRegistry.injectEventPluginOrder(['one', 'two']);\n }).toThrowError(\n- 'EventPluginHub: More than one plugin attempted to publish the same ' +\n+ 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n 'registration name, `onPhotoCapture`.',\n );\n });\ndiff --git a\/packages\/legacy-events\/getListener.js b\/packages\/legacy-events\/getListener.js\nnew file mode 100644\nindex 0000000000..8ef609c7b3\n--- \/dev\/null\n+++ b\/packages\/legacy-events\/getListener.js\n@@ -0,0 +1,74 @@\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+ * @flow\n+ *\/\n+\n+import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+\n+import invariant from 'shared\/invariant';\n+\n+import {getFiberCurrentPropsFromNode} from '.\/EventPluginUtils';\n+\n+function isInteractive(tag) {\n+ return (\n+ tag === 'button' ||\n+ tag === 'input' ||\n+ tag === 'select' ||\n+ tag === 'textarea'\n+ );\n+}\n+\n+function shouldPreventMouseEvent(name, type, props) {\n+ switch (name) {\n+ case 'onClick':\n+ case 'onClickCapture':\n+ case 'onDoubleClick':\n+ case 'onDoubleClickCapture':\n+ case 'onMouseDown':\n+ case 'onMouseDownCapture':\n+ case 'onMouseMove':\n+ case 'onMouseMoveCapture':\n+ case 'onMouseUp':\n+ case 'onMouseUpCapture':\n+ case 'onMouseEnter':\n+ return !!(props.disabled && isInteractive(type));\n+ default:\n+ return false;\n+ }\n+}\n+\n+\/**\n+ * @param {object} inst The instance, which is the source of events.\n+ * @param {string} registrationName Name of listener (e.g. `onClick`).\n+ * @return {?function} The stored callback.\n+ *\/\n+export default function getListener(inst: Fiber, registrationName: string) {\n+ let listener;\n+\n+ \/\/ TODO: shouldPreventMouseEvent is DOM-specific and definitely should not\n+ \/\/ live here; needs to be moved to a better place soon\n+ const stateNode = inst.stateNode;\n+ if (!stateNode) {\n+ \/\/ Work in progress (ex: onload events in incremental mode).\n+ return null;\n+ }\n+ const props = getFiberCurrentPropsFromNode(stateNode);\n+ if (!props) {\n+ \/\/ Work in progress.\n+ return null;\n+ }\n+ listener = props[registrationName];\n+ if (shouldPreventMouseEvent(registrationName, inst.type, props)) {\n+ return null;\n+ }\n+ invariant(\n+ !listener || typeof listener === 'function',\n+ 'Expected `%s` listener to be a function, instead got a value of `%s` type.',\n+ registrationName,\n+ typeof listener,\n+ );\n+ return listener;\n+}\ndiff --git a\/packages\/react-dom\/src\/__tests__\/EventPluginHub-test.js b\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\nsimilarity index 96%\nrename from packages\/react-dom\/src\/__tests__\/EventPluginHub-test.js\nrename to packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\nindex df7859fa6b..dc5f0e694f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/EventPluginHub-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\n@@ -11,7 +11,7 @@\n \n jest.mock('..\/events\/isEventSupported');\n \n-describe('EventPluginHub', () => {\n+describe('InvalidEventListeners', () => {\n let React;\n let ReactTestUtils;\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\nindex 57348fa556..114565d342 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js\n@@ -9,7 +9,7 @@\n \n 'use strict';\n \n-let EventPluginHub;\n+let EventPluginGetListener;\n let EventPluginRegistry;\n let React;\n let ReactDOM;\n@@ -58,7 +58,7 @@ describe('ReactBrowserEventEmitter', () => {\n LISTENER.mockClear();\n \n \/\/ TODO: can we express this test with only public API?\n- EventPluginHub = require('legacy-events\/EventPluginHub');\n+ EventPluginGetListener = require('legacy-events\/getListener').default;\n EventPluginRegistry = require('legacy-events\/EventPluginRegistry');\n React = require('react');\n ReactDOM = require('react-dom');\n@@ -100,7 +100,7 @@ describe('ReactBrowserEventEmitter', () => {\n \n getListener = function(node, eventName) {\n const inst = ReactDOMComponentTree.getInstanceFromNode(node);\n- return EventPluginHub.getListener(inst, eventName);\n+ return EventPluginGetListener(inst, eventName);\n };\n putListener = function(node, eventName, listener) {\n switch (node) {\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex f542aa752b..9983f1418c 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -45,9 +45,11 @@ import {\n enqueueStateRestore,\n restoreStateIfNeeded,\n } from 'legacy-events\/ReactControlledComponent';\n-import {injection as EventPluginHubInjection} from 'legacy-events\/EventPluginHub';\n import {runEventsInBatch} from 'legacy-events\/EventBatching';\n-import {eventNameDispatchConfigs} from 'legacy-events\/EventPluginRegistry';\n+import {\n+ eventNameDispatchConfigs,\n+ injectEventPluginsByName,\n+} from 'legacy-events\/EventPluginRegistry';\n import {\n accumulateTwoPhaseDispatches,\n accumulateDirectDispatches,\n@@ -145,7 +147,7 @@ const ReactDOM: Object = {\n getInstanceFromNode,\n getNodeFromInstance,\n getFiberCurrentPropsFromNode,\n- EventPluginHubInjection.injectEventPluginsByName,\n+ injectEventPluginsByName,\n eventNameDispatchConfigs,\n accumulateTwoPhaseDispatches,\n accumulateDirectDispatches,\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js b\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js\nindex 604c3ff976..4c0ba0d14f 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js\n@@ -5,7 +5,6 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import {injection as EventPluginHubInjection} from 'legacy-events\/EventPluginHub';\n import {setComponentTree} from 'legacy-events\/EventPluginUtils';\n \n import {\n@@ -15,15 +14,35 @@ import {\n } from '.\/ReactDOMComponentTree';\n import BeforeInputEventPlugin from '..\/events\/BeforeInputEventPlugin';\n import ChangeEventPlugin from '..\/events\/ChangeEventPlugin';\n-import DOMEventPluginOrder from '..\/events\/DOMEventPluginOrder';\n import EnterLeaveEventPlugin from '..\/events\/EnterLeaveEventPlugin';\n import SelectEventPlugin from '..\/events\/SelectEventPlugin';\n import SimpleEventPlugin from '..\/events\/SimpleEventPlugin';\n+import {\n+ injectEventPluginOrder,\n+ injectEventPluginsByName,\n+} from 'legacy-events\/EventPluginRegistry';\n+\n+\/**\n+ * Specifies a deterministic ordering of `EventPlugin`s. A convenient way to\n+ * reason about plugins, without having to package every one of them. This\n+ * is better than having plugins be ordered in the same order that they\n+ * are injected because that ordering would be influenced by the packaging order.\n+ * `ResponderEventPlugin` must occur before `SimpleEventPlugin` so that\n+ * preventing default on events is convenient in `SimpleEventPlugin` handlers.\n+ *\/\n+const DOMEventPluginOrder = [\n+ 'ResponderEventPlugin',\n+ 'SimpleEventPlugin',\n+ 'EnterLeaveEventPlugin',\n+ 'ChangeEventPlugin',\n+ 'SelectEventPlugin',\n+ 'BeforeInputEventPlugin',\n+];\n \n \/**\n * Inject modules for resolving DOM hierarchy and plugin ordering.\n *\/\n-EventPluginHubInjection.injectEventPluginOrder(DOMEventPluginOrder);\n+injectEventPluginOrder(DOMEventPluginOrder);\n setComponentTree(\n getFiberCurrentPropsFromNode,\n getInstanceFromNode,\n@@ -34,7 +53,7 @@ setComponentTree(\n * Some important event plugins included by default (without having to require\n * them).\n *\/\n-EventPluginHubInjection.injectEventPluginsByName({\n+injectEventPluginsByName({\n SimpleEventPlugin: SimpleEventPlugin,\n EnterLeaveEventPlugin: EnterLeaveEventPlugin,\n ChangeEventPlugin: ChangeEventPlugin,\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventPluginOrder.js b\/packages\/react-dom\/src\/events\/DOMEventPluginOrder.js\ndeleted file mode 100644\nindex add0b12a23..0000000000\n--- a\/packages\/react-dom\/src\/events\/DOMEventPluginOrder.js\n+++ \/dev\/null\n@@ -1,26 +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-\n-\/**\n- * Module that is injectable into `EventPluginHub`, that specifies a\n- * deterministic ordering of `EventPlugin`s. A convenient way to reason about\n- * plugins, without having to package every one of them. This is better than\n- * having plugins be ordered in the same order that they are injected because\n- * that ordering would be influenced by the packaging order.\n- * `ResponderEventPlugin` must occur before `SimpleEventPlugin` so that\n- * preventing default on events is convenient in `SimpleEventPlugin` handlers.\n- *\/\n-const DOMEventPluginOrder = [\n- 'ResponderEventPlugin',\n- 'SimpleEventPlugin',\n- 'EnterLeaveEventPlugin',\n- 'ChangeEventPlugin',\n- 'SelectEventPlugin',\n- 'BeforeInputEventPlugin',\n-];\n-\n-export default DOMEventPluginOrder;\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js b\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js\nnew file mode 100644\nindex 0000000000..40190f30e3\n--- \/dev\/null\n+++ b\/packages\/react-dom\/src\/events\/DOMEventPluginSystem.js\n@@ -0,0 +1,215 @@\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 {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n+import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n+import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+import type {PluginModule} from 'legacy-events\/PluginModuleType';\n+import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n+import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n+\n+import {HostRoot, HostComponent, HostText} from 'shared\/ReactWorkTags';\n+import {IS_FIRST_ANCESTOR} from 'legacy-events\/EventSystemFlags';\n+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+\n+import getEventTarget from '.\/getEventTarget';\n+import {getClosestInstanceFromNode} from '..\/client\/ReactDOMComponentTree';\n+\n+const CALLBACK_BOOKKEEPING_POOL_SIZE = 10;\n+const callbackBookkeepingPool = [];\n+\n+type BookKeepingInstance = {|\n+ topLevelType: DOMTopLevelEventType | null,\n+ eventSystemFlags: EventSystemFlags,\n+ nativeEvent: AnyNativeEvent | null,\n+ targetInst: Fiber | null,\n+ ancestors: Array,\n+|};\n+\n+function releaseTopLevelCallbackBookKeeping(\n+ instance: BookKeepingInstance,\n+): void {\n+ instance.topLevelType = null;\n+ instance.nativeEvent = null;\n+ instance.targetInst = null;\n+ instance.ancestors.length = 0;\n+ if (callbackBookkeepingPool.length < CALLBACK_BOOKKEEPING_POOL_SIZE) {\n+ callbackBookkeepingPool.push(instance);\n+ }\n+}\n+\n+\/\/ Used to store ancestor hierarchy in top level callback\n+function getTopLevelCallbackBookKeeping(\n+ topLevelType: DOMTopLevelEventType,\n+ nativeEvent: AnyNativeEvent,\n+ targetInst: Fiber | null,\n+ eventSystemFlags: EventSystemFlags,\n+): BookKeepingInstance {\n+ if (callbackBookkeepingPool.length) {\n+ const instance = callbackBookkeepingPool.pop();\n+ instance.topLevelType = topLevelType;\n+ instance.eventSystemFlags = eventSystemFlags;\n+ instance.nativeEvent = nativeEvent;\n+ instance.targetInst = targetInst;\n+ return instance;\n+ }\n+ return {\n+ topLevelType,\n+ eventSystemFlags,\n+ nativeEvent,\n+ targetInst,\n+ ancestors: [],\n+ };\n+}\n+\n+\/**\n+ * Find the deepest React component completely containing the root of the\n+ * passed-in instance (for use when entire React trees are nested within each\n+ * other). If React trees are not nested, returns null.\n+ *\/\n+function findRootContainerNode(inst) {\n+ if (inst.tag === HostRoot) {\n+ return inst.stateNode.containerInfo;\n+ }\n+ \/\/ TODO: It may be a good idea to cache this to prevent unnecessary DOM\n+ \/\/ traversal, but caching is difficult to do correctly without using a\n+ \/\/ mutation observer to listen for all DOM changes.\n+ while (inst.return) {\n+ inst = inst.return;\n+ }\n+ if (inst.tag !== HostRoot) {\n+ \/\/ This can happen if we're in a detached tree.\n+ return null;\n+ }\n+ return inst.stateNode.containerInfo;\n+}\n+\n+\/**\n+ * Allows registered plugins an opportunity to extract events from top-level\n+ * native browser events.\n+ *\n+ * @return {*} An accumulation of synthetic events.\n+ * @internal\n+ *\/\n+function extractPluginEvents(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+): Array | ReactSyntheticEvent | null {\n+ let events = null;\n+ for (let i = 0; i < plugins.length; i++) {\n+ \/\/ Not every plugin in the ordering may be loaded at runtime.\n+ const possiblePlugin: PluginModule = plugins[i];\n+ if (possiblePlugin) {\n+ const extractedEvents = possiblePlugin.extractEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ if (extractedEvents) {\n+ events = accumulateInto(events, extractedEvents);\n+ }\n+ }\n+ }\n+ return events;\n+}\n+\n+function runExtractedPluginEventsInBatch(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+) {\n+ const events = extractPluginEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ runEventsInBatch(events);\n+}\n+\n+function handleTopLevel(bookKeeping: BookKeepingInstance) {\n+ let targetInst = bookKeeping.targetInst;\n+\n+ \/\/ Loop through the hierarchy, in case there's any nested components.\n+ \/\/ It's important that we build the array of ancestors before calling any\n+ \/\/ event handlers, because event handlers can modify the DOM, leading to\n+ \/\/ inconsistencies with ReactMount's node cache. See #1105.\n+ let ancestor = targetInst;\n+ do {\n+ if (!ancestor) {\n+ const ancestors = bookKeeping.ancestors;\n+ ((ancestors: any): Array).push(ancestor);\n+ break;\n+ }\n+ const root = findRootContainerNode(ancestor);\n+ if (!root) {\n+ break;\n+ }\n+ const tag = ancestor.tag;\n+ if (tag === HostComponent || tag === HostText) {\n+ bookKeeping.ancestors.push(ancestor);\n+ }\n+ ancestor = getClosestInstanceFromNode(root);\n+ } while (ancestor);\n+\n+ for (let i = 0; i < bookKeeping.ancestors.length; i++) {\n+ targetInst = bookKeeping.ancestors[i];\n+ const eventTarget = getEventTarget(bookKeeping.nativeEvent);\n+ const topLevelType = ((bookKeeping.topLevelType: any): DOMTopLevelEventType);\n+ const nativeEvent = ((bookKeeping.nativeEvent: any): AnyNativeEvent);\n+ let eventSystemFlags = bookKeeping.eventSystemFlags;\n+\n+ \/\/ If this is the first ancestor, we mark it on the system flags\n+ if (i === 0) {\n+ eventSystemFlags |= IS_FIRST_ANCESTOR;\n+ }\n+\n+ runExtractedPluginEventsInBatch(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ eventTarget,\n+ eventSystemFlags,\n+ );\n+ }\n+}\n+\n+export function dispatchEventForPluginEventSystem(\n+ topLevelType: DOMTopLevelEventType,\n+ eventSystemFlags: EventSystemFlags,\n+ nativeEvent: AnyNativeEvent,\n+ targetInst: null | Fiber,\n+): void {\n+ const bookKeeping = getTopLevelCallbackBookKeeping(\n+ topLevelType,\n+ nativeEvent,\n+ targetInst,\n+ eventSystemFlags,\n+ );\n+\n+ try {\n+ \/\/ Event queue being processed in the same cycle allows\n+ \/\/ `preventDefault`.\n+ batchedEventUpdates(handleTopLevel, bookKeeping);\n+ } finally {\n+ releaseTopLevelCallbackBookKeeping(bookKeeping);\n+ }\n+}\ndiff --git a\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js b\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js\nindex 16cd407cba..3cc7aae2f2 100644\n--- a\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js\n+++ b\/packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js\n@@ -42,13 +42,13 @@ import isEventSupported from '.\/isEventSupported';\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 `EventPluginHub`, which in turn will ask plugins if they want\n+ * trap it) to `EventPluginRegistry`, which in turn will ask plugins if they want\n * to extract any synthetic events.\n *\n- * - The `EventPluginHub` will then process each event by annotating them with\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 `EventPluginHub` then dispatches the events.\n+ * - The `EventPluginRegistry` then dispatches the events.\n *\n * Overview of React and the event system:\n *\n@@ -65,7 +65,7 @@ import isEventSupported from '.\/isEventSupported';\n * | . | |Plugin |\n * +-----|------+ . v +-----------+\n * | | | . +--------------+ +------------+\n- * | +-----------.--->|EventPluginHub| | Event |\n+ * | +-----------.--->|PluginRegistry| | Event |\n * | | . | | +-----------+ | Propagators|\n * | ReactEvent | . | | |TapEvent | |------------|\n * | Emitter | . | |<---+|Plugin | |other plugin|\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\nindex d43c201168..e119fafa48 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n@@ -8,7 +8,6 @@\n *\/\n \n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n import type {FiberRoot} from 'react-reconciler\/src\/ReactFiberRoot';\n import type {Container, SuspenseInstance} from '..\/client\/ReactDOMHostConfig';\n import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n@@ -18,11 +17,9 @@ import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n import * as Scheduler from 'scheduler';\n \n import {\n- batchedEventUpdates,\n discreteUpdates,\n flushDiscreteUpdatesIfNeeded,\n } from 'legacy-events\/ReactGenericBatching';\n-import {runExtractedPluginEventsInBatch} from 'legacy-events\/EventPluginHub';\n import {DEPRECATED_dispatchEventForResponderEventSystem} from '.\/DeprecatedDOMEventResponderSystem';\n import {\n isReplayableDiscreteEvent,\n@@ -36,12 +33,7 @@ import {\n getContainerFromFiber,\n getSuspenseInstanceFromFiber,\n } from 'react-reconciler\/reflection';\n-import {\n- HostRoot,\n- SuspenseComponent,\n- HostComponent,\n- HostText,\n-} from 'shared\/ReactWorkTags';\n+import {HostRoot, SuspenseComponent} from 'shared\/ReactWorkTags';\n import {\n type EventSystemFlags,\n PLUGIN_EVENT_SYSTEM,\n@@ -49,7 +41,6 @@ import {\n IS_PASSIVE,\n IS_ACTIVE,\n PASSIVE_NOT_SUPPORTED,\n- IS_FIRST_ANCESTOR,\n } from 'legacy-events\/EventSystemFlags';\n \n import {\n@@ -69,128 +60,13 @@ import {\n DiscreteEvent,\n } from 'shared\/ReactTypes';\n import {getEventPriorityForPluginSystem} from '.\/DOMEventProperties';\n+import {dispatchEventForPluginEventSystem} from '.\/DOMEventPluginSystem';\n \n const {\n unstable_UserBlockingPriority: UserBlockingPriority,\n unstable_runWithPriority: runWithPriority,\n } = Scheduler;\n \n-const CALLBACK_BOOKKEEPING_POOL_SIZE = 10;\n-const callbackBookkeepingPool = [];\n-\n-type BookKeepingInstance = {|\n- topLevelType: DOMTopLevelEventType | null,\n- eventSystemFlags: EventSystemFlags,\n- nativeEvent: AnyNativeEvent | null,\n- targetInst: Fiber | null,\n- ancestors: Array,\n-|};\n-\n-\/**\n- * Find the deepest React component completely containing the root of the\n- * passed-in instance (for use when entire React trees are nested within each\n- * other). If React trees are not nested, returns null.\n- *\/\n-function findRootContainerNode(inst) {\n- if (inst.tag === HostRoot) {\n- return inst.stateNode.containerInfo;\n- }\n- \/\/ TODO: It may be a good idea to cache this to prevent unnecessary DOM\n- \/\/ traversal, but caching is difficult to do correctly without using a\n- \/\/ mutation observer to listen for all DOM changes.\n- while (inst.return) {\n- inst = inst.return;\n- }\n- if (inst.tag !== HostRoot) {\n- \/\/ This can happen if we're in a detached tree.\n- return null;\n- }\n- return inst.stateNode.containerInfo;\n-}\n-\n-\/\/ Used to store ancestor hierarchy in top level callback\n-function getTopLevelCallbackBookKeeping(\n- topLevelType: DOMTopLevelEventType,\n- nativeEvent: AnyNativeEvent,\n- targetInst: Fiber | null,\n- eventSystemFlags: EventSystemFlags,\n-): BookKeepingInstance {\n- if (callbackBookkeepingPool.length) {\n- const instance = callbackBookkeepingPool.pop();\n- instance.topLevelType = topLevelType;\n- instance.eventSystemFlags = eventSystemFlags;\n- instance.nativeEvent = nativeEvent;\n- instance.targetInst = targetInst;\n- return instance;\n- }\n- return {\n- topLevelType,\n- eventSystemFlags,\n- nativeEvent,\n- targetInst,\n- ancestors: [],\n- };\n-}\n-\n-function releaseTopLevelCallbackBookKeeping(\n- instance: BookKeepingInstance,\n-): void {\n- instance.topLevelType = null;\n- instance.nativeEvent = null;\n- instance.targetInst = null;\n- instance.ancestors.length = 0;\n- if (callbackBookkeepingPool.length < CALLBACK_BOOKKEEPING_POOL_SIZE) {\n- callbackBookkeepingPool.push(instance);\n- }\n-}\n-\n-function handleTopLevel(bookKeeping: BookKeepingInstance) {\n- let targetInst = bookKeeping.targetInst;\n-\n- \/\/ Loop through the hierarchy, in case there's any nested components.\n- \/\/ It's important that we build the array of ancestors before calling any\n- \/\/ event handlers, because event handlers can modify the DOM, leading to\n- \/\/ inconsistencies with ReactMount's node cache. See #1105.\n- let ancestor = targetInst;\n- do {\n- if (!ancestor) {\n- const ancestors = bookKeeping.ancestors;\n- ((ancestors: any): Array).push(ancestor);\n- break;\n- }\n- const root = findRootContainerNode(ancestor);\n- if (!root) {\n- break;\n- }\n- const tag = ancestor.tag;\n- if (tag === HostComponent || tag === HostText) {\n- bookKeeping.ancestors.push(ancestor);\n- }\n- ancestor = getClosestInstanceFromNode(root);\n- } while (ancestor);\n-\n- for (let i = 0; i < bookKeeping.ancestors.length; i++) {\n- targetInst = bookKeeping.ancestors[i];\n- const eventTarget = getEventTarget(bookKeeping.nativeEvent);\n- const topLevelType = ((bookKeeping.topLevelType: any): DOMTopLevelEventType);\n- const nativeEvent = ((bookKeeping.nativeEvent: any): AnyNativeEvent);\n- let eventSystemFlags = bookKeeping.eventSystemFlags;\n-\n- \/\/ If this is the first ancestor, we mark it on the system flags\n- if (i === 0) {\n- eventSystemFlags |= IS_FIRST_ANCESTOR;\n- }\n-\n- runExtractedPluginEventsInBatch(\n- topLevelType,\n- targetInst,\n- nativeEvent,\n- eventTarget,\n- eventSystemFlags,\n- );\n- }\n-}\n-\n \/\/ TODO: can we stop exporting these?\n export let _enabled = true;\n \n@@ -323,28 +199,6 @@ function dispatchUserBlockingUpdate(\n );\n }\n \n-function dispatchEventForPluginEventSystem(\n- topLevelType: DOMTopLevelEventType,\n- eventSystemFlags: EventSystemFlags,\n- nativeEvent: AnyNativeEvent,\n- targetInst: null | Fiber,\n-): void {\n- const bookKeeping = getTopLevelCallbackBookKeeping(\n- topLevelType,\n- nativeEvent,\n- targetInst,\n- eventSystemFlags,\n- );\n-\n- try {\n- \/\/ Event queue being processed in the same cycle allows\n- \/\/ `preventDefault`.\n- batchedEventUpdates(handleTopLevel, bookKeeping);\n- } finally {\n- releaseTopLevelCallbackBookKeeping(bookKeeping);\n- }\n-}\n-\n export function dispatchEvent(\n topLevelType: DOMTopLevelEventType,\n eventSystemFlags: EventSystemFlags,\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js b\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\nindex 98c1c3c718..959df5bc48 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js\n@@ -7,22 +7,76 @@\n * @flow\n *\/\n \n+import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n+import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+import type {PluginModule} from 'legacy-events\/PluginModuleType';\n+import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n+import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n \n import {PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n-import {\n- getListener,\n- runExtractedPluginEventsInBatch,\n-} from 'legacy-events\/EventPluginHub';\n import {registrationNameModules} from 'legacy-events\/EventPluginRegistry';\n import {batchedUpdates} from 'legacy-events\/ReactGenericBatching';\n+import accumulateInto from 'legacy-events\/accumulateInto';\n \n-import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n import {enableNativeTargetAsInstance} from 'shared\/ReactFeatureFlags';\n-import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n+import {plugins} from 'legacy-events\/EventPluginRegistry';\n+import getListener from 'legacy-events\/getListener';\n+import {runEventsInBatch} from 'legacy-events\/EventBatching';\n \n export {getListener, registrationNameModules as registrationNames};\n \n+\/**\n+ * Allows registered plugins an opportunity to extract events from top-level\n+ * native browser events.\n+ *\n+ * @return {*} An accumulation of synthetic events.\n+ * @internal\n+ *\/\n+function extractPluginEvents(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+): Array | ReactSyntheticEvent | null {\n+ let events = null;\n+ for (let i = 0; i < plugins.length; i++) {\n+ \/\/ Not every plugin in the ordering may be loaded at runtime.\n+ const possiblePlugin: PluginModule = plugins[i];\n+ if (possiblePlugin) {\n+ const extractedEvents = possiblePlugin.extractEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ if (extractedEvents) {\n+ events = accumulateInto(events, extractedEvents);\n+ }\n+ }\n+ }\n+ return events;\n+}\n+\n+function runExtractedPluginEventsInBatch(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+) {\n+ const events = extractPluginEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ runEventsInBatch(events);\n+}\n+\n export function dispatchEvent(\n target: null | Object,\n topLevelType: TopLevelType,\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js b\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\nindex 424f0eae25..789a4f2506 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js\n@@ -28,9 +28,6 @@ const {\n const ReactNativeBridgeEventPlugin = {\n eventTypes: {},\n \n- \/**\n- * @see {EventPluginHub.extractEvents}\n- *\/\n extractEvents: function(\n topLevelType: TopLevelType,\n targetInst: null | Object,\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js b\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\nindex 07c62f83ed..fe69998e9d 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js\n@@ -7,20 +7,24 @@\n * @flow\n *\/\n \n+import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n+import type {EventSystemFlags} from 'legacy-events\/EventSystemFlags';\n+import type {Fiber} from 'react-reconciler\/src\/ReactFiber';\n+import type {PluginModule} from 'legacy-events\/PluginModuleType';\n+import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n+import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n+\n import {PLUGIN_EVENT_SYSTEM} from 'legacy-events\/EventSystemFlags';\n-import {\n- getListener,\n- runExtractedPluginEventsInBatch,\n-} from 'legacy-events\/EventPluginHub';\n import {registrationNameModules} from 'legacy-events\/EventPluginRegistry';\n import {batchedUpdates} from 'legacy-events\/ReactGenericBatching';\n+import {runEventsInBatch} from 'legacy-events\/EventBatching';\n import {enableNativeTargetAsInstance} from 'shared\/ReactFeatureFlags';\n+import {plugins} from 'legacy-events\/EventPluginRegistry';\n+import getListener from 'legacy-events\/getListener';\n+import accumulateInto from 'legacy-events\/accumulateInto';\n \n import {getInstanceFromNode} from '.\/ReactNativeComponentTree';\n \n-import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import type {TopLevelType} from 'legacy-events\/TopLevelEventTypes';\n-\n export {getListener, registrationNameModules as registrationNames};\n \n \/**\n@@ -121,6 +125,57 @@ function _receiveRootNodeIDEvent(\n \/\/ where it would do it.\n }\n \n+\/**\n+ * Allows registered plugins an opportunity to extract events from top-level\n+ * native browser events.\n+ *\n+ * @return {*} An accumulation of synthetic events.\n+ * @internal\n+ *\/\n+function extractPluginEvents(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+): Array | ReactSyntheticEvent | null {\n+ let events = null;\n+ for (let i = 0; i < plugins.length; i++) {\n+ \/\/ Not every plugin in the ordering may be loaded at runtime.\n+ const possiblePlugin: PluginModule = plugins[i];\n+ if (possiblePlugin) {\n+ const extractedEvents = possiblePlugin.extractEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ if (extractedEvents) {\n+ events = accumulateInto(events, extractedEvents);\n+ }\n+ }\n+ }\n+ return events;\n+}\n+\n+function runExtractedPluginEventsInBatch(\n+ topLevelType: TopLevelType,\n+ targetInst: null | Fiber,\n+ nativeEvent: AnyNativeEvent,\n+ nativeEventTarget: null | EventTarget,\n+ eventSystemFlags: EventSystemFlags,\n+) {\n+ const events = extractPluginEvents(\n+ topLevelType,\n+ targetInst,\n+ nativeEvent,\n+ nativeEventTarget,\n+ eventSystemFlags,\n+ );\n+ runEventsInBatch(events);\n+}\n+\n \/**\n * Publicly exposed method on module for native objc to invoke when a top\n * level event is extracted.\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeInjectionShared.js b\/packages\/react-native-renderer\/src\/ReactNativeInjectionShared.js\nindex 9e97891918..bfb3b926db 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeInjectionShared.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeInjectionShared.js\n@@ -16,8 +16,11 @@\n \/\/ Module provided by RN:\n import 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInitializeCore';\n \n-import {injection as EventPluginHubInjection} from 'legacy-events\/EventPluginHub';\n import ResponderEventPlugin from 'legacy-events\/ResponderEventPlugin';\n+import {\n+ injectEventPluginOrder,\n+ injectEventPluginsByName,\n+} from 'legacy-events\/EventPluginRegistry';\n \n import ReactNativeBridgeEventPlugin from '.\/ReactNativeBridgeEventPlugin';\n import ReactNativeEventPluginOrder from '.\/ReactNativeEventPluginOrder';\n@@ -25,13 +28,13 @@ import ReactNativeEventPluginOrder from '.\/ReactNativeEventPluginOrder';\n \/**\n * Inject module for resolving DOM hierarchy and plugin ordering.\n *\/\n-EventPluginHubInjection.injectEventPluginOrder(ReactNativeEventPluginOrder);\n+injectEventPluginOrder(ReactNativeEventPluginOrder);\n \n \/**\n * Some important event plugins included by default (without having to require\n * them).\n *\/\n-EventPluginHubInjection.injectEventPluginsByName({\n+injectEventPluginsByName({\n ResponderEventPlugin: ResponderEventPlugin,\n ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,\n });\ndiff --git a\/scripts\/error-codes\/codes.json b\/scripts\/error-codes\/codes.json\nindex 654b283dc6..5a2e9b8075 100644\n--- a\/scripts\/error-codes\/codes.json\n+++ b\/scripts\/error-codes\/codes.json\n@@ -98,8 +98,8 @@\n \"96\": \"EventPluginRegistry: Cannot inject event plugins that do not exist in the plugin ordering, `%s`.\",\n \"97\": \"EventPluginRegistry: Event plugins must implement an `extractEvents` method, but `%s` does not.\",\n \"98\": \"EventPluginRegistry: Failed to publish event `%s` for plugin `%s`.\",\n- \"99\": \"EventPluginHub: More than one plugin attempted to publish the same event name, `%s`.\",\n- \"100\": \"EventPluginHub: More than one plugin attempted to publish the same registration name, `%s`.\",\n+ \"99\": \"EventPluginRegistry: More than one plugin attempted to publish the same event name, `%s`.\",\n+ \"100\": \"EventPluginRegistry: More than one plugin attempted to publish the same registration name, `%s`.\",\n \"101\": \"EventPluginRegistry: Cannot inject event plugin ordering more than once. You are likely trying to load more than one copy of React.\",\n \"102\": \"EventPluginRegistry: Cannot inject two different event plugins using the same name, `%s`.\",\n \"103\": \"executeDirectDispatch(...): Invalid `event`.\",\n","commit":{"revision":"9def56ec0e1e71928ee999f48c00b1803ed8772a","shortRevision":"9def56ec0e","authorName":"Dominic Gannaway","authorEmail":"trueadm@users.noreply.github.com","subject":"Refactor DOM plugin system to single module (#18025)","authoredAt":"2020-02-14T08:10:42+00:00"},"body":"","parents":["2d6be757df86177ca8590bf7c361d6c910640895"],"files":[{"path":"packages\/legacy-events\/EventPluginHub.js","status":"D"},{"path":"packages\/legacy-events\/EventPluginRegistry.js","status":"M"},{"path":"packages\/legacy-events\/EventPropagators.js","status":"M"},{"path":"packages\/legacy-events\/ResponderEventPlugin.js","status":"M"},{"path":"packages\/legacy-events\/__tests__\/EventPluginRegistry-test.internal.js","status":"M"},{"path":"packages\/legacy-events\/getListener.js","status":"A"},{"path":"packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js","previousPath":"packages\/react-dom\/src\/__tests__\/EventPluginHub-test.js","status":"R096"},{"path":"packages\/react-dom\/src\/__tests__\/ReactBrowserEventEmitter-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOM.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMClientInjection.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/DOMEventPluginOrder.js","status":"D"},{"path":"packages\/react-dom\/src\/events\/DOMEventPluginSystem.js","status":"A"},{"path":"packages\/react-dom\/src\/events\/ReactBrowserEventEmitter.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/ReactDOMEventListener.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactFabricEventEmitter.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeBridgeEventPlugin.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeEventEmitter.js","status":"M"},{"path":"packages\/react-native-renderer\/src\/ReactNativeInjectionShared.js","status":"M"},{"path":"scripts\/error-codes\/codes.json","status":"M"}]}

dillon1000/react

Files changed