{"files":[{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOM.js"},{"status":"D","path":"packages\/react-dom\/src\/client\/ReactDOMClientInjection.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMComponentTree.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMEventHandle.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DOMEventProperties.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DOMTopLevelEventTypes.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js"},{"status":"A","path":"packages\/react-dom\/src\/events\/EventPluginRegistry.js"},{"previousPath":"packages\/react-dom\/src\/legacy-events\/PluginModuleType.js","status":"R100","path":"packages\/react-dom\/src\/events\/PluginModuleType.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/ReactDOMEventListener.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js"},{"previousPath":"packages\/react-dom\/src\/legacy-events\/ReactSyntheticEventType.js","status":"R086","path":"packages\/react-dom\/src\/events\/ReactSyntheticEventType.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticAnimationEvent.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticClipboardEvent.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticCompositionEvent.js"},{"previousPath":"packages\/react-dom\/src\/legacy-events\/SyntheticEvent.js","status":"R081","path":"packages\/react-dom\/src\/events\/SyntheticEvent.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticInputEvent.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticTransitionEvent.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/SyntheticUIEvent.js"},{"previousPath":"packages\/react-dom\/src\/legacy-events\/TopLevelEventTypes.js","status":"R071","path":"packages\/react-dom\/src\/events\/TopLevelEventTypes.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/getEventModifierState.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js"},{"status":"D","path":"packages\/react-dom\/src\/legacy-events\/EventPluginRegistry.js"},{"status":"D","path":"packages\/react-dom\/src\/legacy-events\/EventPluginUtils.js"},{"status":"D","path":"packages\/react-dom\/src\/legacy-events\/accumulateInto.js"},{"status":"D","path":"packages\/react-dom\/src\/legacy-events\/forEachAccumulated.js"},{"status":"M","path":"packages\/react-dom\/src\/server\/ReactPartialRenderer.js"},{"status":"M","path":"packages\/react-dom\/src\/shared\/ReactDOMTypes.js"},{"status":"M","path":"packages\/react-dom\/src\/shared\/ReactDOMUnknownPropertyHook.js"},{"status":"M","path":"packages\/react-dom\/src\/test-utils\/ReactTestUtils.js"},{"status":"M","path":"packages\/react-dom\/src\/test-utils\/ReactTestUtilsAct.js"}],"commit":{"subject":"Remove dead code from modern event system (#19233)","shortRevision":"75b6921d64","revision":"75b6921d6429cc2d7456bd66684263ae63dc6abb","authorName":"Dan Abramov","authoredAt":"2020-07-01T21:04:14+01:00","authorEmail":"dan.abramov@gmail.com"},"parents":["9fba65efa50fe5f38e5664729d4aa6f85cf7be92"],"body":"* Remove dead code from modern event system\r\n\r\n* Remove SSR dependency on EventPluginRegistry","patch":"diff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex 2016fbe9d6..606569f8b8 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -11,7 +11,6 @@ import type {ReactNodeList} from 'shared\/ReactTypes';\n import type {Container} from '.\/ReactDOMHostConfig';\n \n import '..\/shared\/checkReact';\n-import '.\/ReactDOMClientInjection';\n import {\n findDOMNode,\n render,\n@@ -39,10 +38,7 @@ import {\n } from 'react-reconciler\/src\/ReactFiberReconciler';\n import {createPortal as createPortalImpl} from 'react-reconciler\/src\/ReactPortal';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n-import {\n- eventNameDispatchConfigs,\n- injectEventPluginsByName,\n-} from '..\/legacy-events\/EventPluginRegistry';\n+import {eventNameDispatchConfigs} from '..\/events\/EventPluginRegistry';\n import ReactVersion from 'shared\/ReactVersion';\n import invariant from 'shared\/invariant';\n import {\n@@ -57,7 +53,6 @@ import {\n getClosestInstanceFromNode,\n } from '.\/ReactDOMComponentTree';\n import {restoreControlledState} from '.\/ReactDOMComponent';\n-import {dispatchEvent} from '..\/events\/ReactDOMEventListener';\n import {\n setAttemptSynchronousHydration,\n setAttemptUserBlockingHydration,\n@@ -180,11 +175,9 @@ const Internals = {\n getInstanceFromNode,\n getNodeFromInstance,\n getFiberCurrentPropsFromNode,\n- injectEventPluginsByName,\n eventNameDispatchConfigs,\n enqueueStateRestore,\n restoreStateIfNeeded,\n- dispatchEvent,\n flushPassiveEffects,\n IsThisRendererActing,\n ],\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js b\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js\ndeleted file mode 100644\nindex 0f2532c1b6..0000000000\n--- a\/packages\/react-dom\/src\/client\/ReactDOMClientInjection.js\n+++ \/dev\/null\n@@ -1,24 +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-\/\/ TODO: remove this injection altogether.\n-\n-import ModernBeforeInputEventPlugin from '..\/events\/plugins\/ModernBeforeInputEventPlugin';\n-import ModernChangeEventPlugin from '..\/events\/plugins\/ModernChangeEventPlugin';\n-import ModernEnterLeaveEventPlugin from '..\/events\/plugins\/ModernEnterLeaveEventPlugin';\n-import ModernSelectEventPlugin from '..\/events\/plugins\/ModernSelectEventPlugin';\n-import ModernSimpleEventPlugin from '..\/events\/plugins\/ModernSimpleEventPlugin';\n-\n-import {injectEventPlugins} from '..\/legacy-events\/EventPluginRegistry';\n-\n-injectEventPlugins([\n- ModernSimpleEventPlugin,\n- ModernEnterLeaveEventPlugin,\n- ModernChangeEventPlugin,\n- ModernSelectEventPlugin,\n- ModernBeforeInputEventPlugin,\n-]);\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex af1f118491..ad476a94d7 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -7,7 +7,10 @@\n * @flow\n *\/\n \n-import {registrationNameModules} from '..\/legacy-events\/EventPluginRegistry';\n+import {\n+ registrationNameModules,\n+ possibleRegistrationNames,\n+} from '..\/events\/EventPluginRegistry';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n import invariant from 'shared\/invariant';\n import {\n@@ -129,7 +132,10 @@ if (__DEV__) {\n validatePropertiesInDevelopment = function(type, props) {\n validateARIAProperties(type, props);\n validateInputProperties(type, props);\n- validateUnknownProperties(type, props, \/* canUseEventSystem *\/ true);\n+ validateUnknownProperties(type, props, {\n+ registrationNameModules,\n+ possibleRegistrationNames,\n+ });\n };\n \n \/\/ IE 11 parses & normalizes the style attribute as opposed to other\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\nindex 9d2822f60d..5381083e4c 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n@@ -17,7 +17,7 @@ import type {\n SuspenseInstance,\n Props,\n } from '.\/ReactDOMHostConfig';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n \n import {\n HostComponent,\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js b\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\nindex b477685c17..ae9b40d130 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMEventHandle.js\n@@ -7,7 +7,7 @@\n * @flow\n *\/\n \n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n import type {EventPriority, ReactScopeInstance} from 'shared\/ReactTypes';\n import type {\n ReactDOMEventHandle,\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 2c09646696..f064b0f9c2 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -7,7 +7,7 @@\n * @flow\n *\/\n \n-import type {TopLevelType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {TopLevelType} from '..\/events\/TopLevelEventTypes';\n import type {Fiber, FiberRoot} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {\n BoundingRect,\ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventProperties.js b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\nindex 747fd4278e..2135fdc167 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n@@ -11,11 +11,11 @@ import type {EventPriority} from 'shared\/ReactTypes';\n import type {\n TopLevelType,\n DOMTopLevelEventType,\n-} from '..\/legacy-events\/TopLevelEventTypes';\n+} from '..\/events\/TopLevelEventTypes';\n import type {\n DispatchConfig,\n CustomDispatchConfig,\n-} from '..\/legacy-events\/ReactSyntheticEventType';\n+} from '..\/events\/ReactSyntheticEventType';\n \n import * as DOMTopLevelEventTypes from '.\/DOMTopLevelEventTypes';\n import {\ndiff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex 5cebb608e4..4caecefcfe 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -7,8 +7,8 @@\n * @flow\n *\/\n \n-import type {AnyNativeEvent} from '..\/legacy-events\/PluginModuleType';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {AnyNativeEvent} from '..\/events\/PluginModuleType';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n import type {\n ElementListenerMap,\n ElementListenerMapEntry,\n@@ -22,14 +22,14 @@ import type {\n DispatchQueueItem,\n DispatchQueueItemPhase,\n DispatchQueueItemPhaseEntry,\n-} from '..\/legacy-events\/PluginModuleType';\n+} from '..\/events\/PluginModuleType';\n import type {\n ReactSyntheticEvent,\n CustomDispatchConfig,\n-} from '..\/legacy-events\/ReactSyntheticEventType';\n+} from '..\/events\/ReactSyntheticEventType';\n \n-import {registrationNameDependencies} from '..\/legacy-events\/EventPluginRegistry';\n-import {plugins} from '..\/legacy-events\/EventPluginRegistry';\n+import {registrationNameDependencies} from '..\/events\/EventPluginRegistry';\n+import {plugins} from '..\/events\/EventPluginRegistry';\n import {\n PLUGIN_EVENT_SYSTEM,\n LEGACY_FB_SUPPORT,\ndiff --git a\/packages\/react-dom\/src\/events\/DOMTopLevelEventTypes.js b\/packages\/react-dom\/src\/events\/DOMTopLevelEventTypes.js\nindex 69e0a1e319..86fcb713a4 100644\n--- a\/packages\/react-dom\/src\/events\/DOMTopLevelEventTypes.js\n+++ b\/packages\/react-dom\/src\/events\/DOMTopLevelEventTypes.js\n@@ -7,12 +7,12 @@\n * @flow\n *\/\n \n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n \n import {\n unsafeCastStringToDOMTopLevelType,\n unsafeCastDOMTopLevelTypeToString,\n-} from '..\/legacy-events\/TopLevelEventTypes';\n+} from '..\/events\/TopLevelEventTypes';\n import getVendorPrefixedEventName from '.\/getVendorPrefixedEventName';\n \n \/**\ndiff --git a\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\nindex 878015ebc0..8f59811678 100644\n--- a\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DeprecatedDOMEventResponderSystem.js\n@@ -12,7 +12,7 @@ import {\n PASSIVE_NOT_SUPPORTED,\n RESPONDER_EVENT_SYSTEM,\n } from '.\/EventSystemFlags';\n-import type {AnyNativeEvent} from '..\/legacy-events\/PluginModuleType';\n+import type {AnyNativeEvent} from '..\/events\/PluginModuleType';\n import {\n HostComponent,\n ScopeComponent,\n@@ -25,7 +25,7 @@ import type {\n ReactDOMResponderContext,\n ReactDOMResponderEvent,\n } from '..\/shared\/ReactDOMTypes';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n import {\n batchedEventUpdates,\n discreteUpdates,\ndiff --git a\/packages\/react-dom\/src\/events\/EventPluginRegistry.js b\/packages\/react-dom\/src\/events\/EventPluginRegistry.js\nnew file mode 100644\nindex 0000000000..27ec25c378\n--- \/dev\/null\n+++ b\/packages\/react-dom\/src\/events\/EventPluginRegistry.js\n@@ -0,0 +1,151 @@\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 {DispatchConfig} from '.\/ReactSyntheticEventType';\n+import type {\n+ AnyNativeEvent,\n+ LegacyPluginModule,\n+ ModernPluginModule,\n+} from '.\/PluginModuleType';\n+import ModernBeforeInputEventPlugin from '..\/events\/plugins\/ModernBeforeInputEventPlugin';\n+import ModernChangeEventPlugin from '..\/events\/plugins\/ModernChangeEventPlugin';\n+import ModernEnterLeaveEventPlugin from '..\/events\/plugins\/ModernEnterLeaveEventPlugin';\n+import ModernSelectEventPlugin from '..\/events\/plugins\/ModernSelectEventPlugin';\n+import ModernSimpleEventPlugin from '..\/events\/plugins\/ModernSimpleEventPlugin';\n+\n+import invariant from 'shared\/invariant';\n+\n+\/**\n+ * Publishes an event so that it can be dispatched by the supplied plugin.\n+ *\n+ * @param {object} dispatchConfig Dispatch configuration for the event.\n+ * @param {object} PluginModule Plugin publishing the event.\n+ * @return {boolean} True if the event was successfully published.\n+ * @private\n+ *\/\n+function publishEventForPlugin(\n+ dispatchConfig: DispatchConfig,\n+ pluginModule:\n+ | LegacyPluginModule\n+ | ModernPluginModule,\n+ eventName: string,\n+): boolean {\n+ invariant(\n+ !eventNameDispatchConfigs.hasOwnProperty(eventName),\n+ 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n+ 'event name, `%s`.',\n+ eventName,\n+ );\n+ eventNameDispatchConfigs[eventName] = dispatchConfig;\n+\n+ const phasedRegistrationNames = dispatchConfig.phasedRegistrationNames;\n+ if (phasedRegistrationNames) {\n+ for (const phaseName in phasedRegistrationNames) {\n+ if (phasedRegistrationNames.hasOwnProperty(phaseName)) {\n+ const phasedRegistrationName = phasedRegistrationNames[phaseName];\n+ publishRegistrationName(\n+ phasedRegistrationName,\n+ pluginModule,\n+ eventName,\n+ );\n+ }\n+ }\n+ return true;\n+ } else if (dispatchConfig.registrationName) {\n+ publishRegistrationName(\n+ dispatchConfig.registrationName,\n+ pluginModule,\n+ eventName,\n+ );\n+ return true;\n+ }\n+ return false;\n+}\n+\n+\/**\n+ * Publishes a registration name that is used to identify dispatched events.\n+ *\n+ * @param {string} registrationName Registration name to add.\n+ * @param {object} PluginModule Plugin publishing the event.\n+ * @private\n+ *\/\n+function publishRegistrationName(\n+ registrationName: string,\n+ pluginModule:\n+ | LegacyPluginModule\n+ | ModernPluginModule,\n+ eventName: string,\n+): void {\n+ invariant(\n+ !registrationNameModules[registrationName],\n+ 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n+ 'registration name, `%s`.',\n+ registrationName,\n+ );\n+ registrationNameModules[registrationName] = pluginModule;\n+ registrationNameDependencies[registrationName] =\n+ pluginModule.eventTypes[eventName].dependencies;\n+\n+ if (__DEV__) {\n+ const lowerCasedName = registrationName.toLowerCase();\n+ possibleRegistrationNames[lowerCasedName] = registrationName;\n+\n+ if (registrationName === 'onDoubleClick') {\n+ possibleRegistrationNames.ondblclick = registrationName;\n+ }\n+ }\n+}\n+\n+\/**\n+ * Registers plugins so that they can extract and dispatch events.\n+ *\/\n+\n+\/**\n+ * Ordered list of injected plugins.\n+ *\/\n+export const plugins = [];\n+\n+\/**\n+ * Mapping from event name to dispatch config\n+ *\/\n+export const eventNameDispatchConfigs = {};\n+\n+\/**\n+ * Mapping from registration name to plugin module\n+ *\/\n+export const registrationNameModules = {};\n+\n+\/**\n+ * Mapping from registration name to event name\n+ *\/\n+export const registrationNameDependencies = {};\n+\n+\/**\n+ * Mapping from lowercase registration names to the properly cased version,\n+ * used to warn in the case of missing event handlers. Available\n+ * only in __DEV__.\n+ * @type {Object}\n+ *\/\n+export const possibleRegistrationNames = __DEV__ ? {} : (null: any);\n+\/\/ Trust the developer to only use possibleRegistrationNames in __DEV__\n+\n+function injectEventPlugin(pluginModule: ModernPluginModule): void {\n+ plugins.push(pluginModule);\n+ const publishedEvents = pluginModule.eventTypes;\n+ for (const eventName in publishedEvents) {\n+ publishEventForPlugin(publishedEvents[eventName], pluginModule, eventName);\n+ }\n+}\n+\n+\/\/ TODO: remove top-level side effect.\n+injectEventPlugin(ModernSimpleEventPlugin);\n+injectEventPlugin(ModernEnterLeaveEventPlugin);\n+injectEventPlugin(ModernChangeEventPlugin);\n+injectEventPlugin(ModernSelectEventPlugin);\n+injectEventPlugin(ModernBeforeInputEventPlugin);\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/PluginModuleType.js b\/packages\/react-dom\/src\/events\/PluginModuleType.js\nsimilarity index 100%\nrename from packages\/react-dom\/src\/legacy-events\/PluginModuleType.js\nrename to packages\/react-dom\/src\/events\/PluginModuleType.js\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\nindex c83e3cd284..5dcfb77050 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventListener.js\n@@ -7,11 +7,11 @@\n * @flow\n *\/\n \n-import type {AnyNativeEvent} from '..\/legacy-events\/PluginModuleType';\n+import type {AnyNativeEvent} from '..\/events\/PluginModuleType';\n import type {EventPriority} from 'shared\/ReactTypes';\n import type {FiberRoot} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {Container, SuspenseInstance} from '..\/client\/ReactDOMHostConfig';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n \n \/\/ Intentionally not named imports because Rollup would use dynamic dispatch for\n \/\/ CommonJS interop named imports.\ndiff --git a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\nindex 9d4cd1a9e3..d69d9684a7 100644\n--- a\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n+++ b\/packages\/react-dom\/src\/events\/ReactDOMEventReplaying.js\n@@ -7,9 +7,9 @@\n * @flow\n *\/\n \n-import type {AnyNativeEvent} from '..\/legacy-events\/PluginModuleType';\n+import type {AnyNativeEvent} from '..\/events\/PluginModuleType';\n import type {Container, SuspenseInstance} from '..\/client\/ReactDOMHostConfig';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n import type {ElementListenerMap} from '..\/client\/ReactDOMComponentTree';\n import type {EventSystemFlags} from '.\/EventSystemFlags';\n import type {FiberRoot} from 'react-reconciler\/src\/ReactInternalTypes';\n@@ -35,7 +35,7 @@ import {\n getClosestInstanceFromNode,\n getEventListenerMap,\n } from '..\/client\/ReactDOMComponentTree';\n-import {unsafeCastDOMTopLevelTypeToString} from '..\/legacy-events\/TopLevelEventTypes';\n+import {unsafeCastDOMTopLevelTypeToString} from '..\/events\/TopLevelEventTypes';\n import {HostRoot, SuspenseComponent} from 'react-reconciler\/src\/ReactWorkTags';\n \n let attemptSynchronousHydration: (fiber: Object) => void;\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/ReactSyntheticEventType.js b\/packages\/react-dom\/src\/events\/ReactSyntheticEventType.js\nsimilarity index 86%\nrename from packages\/react-dom\/src\/legacy-events\/ReactSyntheticEventType.js\nrename to packages\/react-dom\/src\/events\/ReactSyntheticEventType.js\nindex 1bc167afe0..7777a11c8c 100644\n--- a\/packages\/react-dom\/src\/legacy-events\/ReactSyntheticEventType.js\n+++ b\/packages\/react-dom\/src\/events\/ReactSyntheticEventType.js\n@@ -33,12 +33,6 @@ export type CustomDispatchConfig = {|\n \n export type ReactSyntheticEvent = {|\n dispatchConfig: DispatchConfig | CustomDispatchConfig,\n- getPooled: (\n- dispatchConfig: DispatchConfig | CustomDispatchConfig,\n- targetInst: Fiber,\n- nativeTarget: Event,\n- nativeEventTarget: EventTarget,\n- ) => ReactSyntheticEvent,\n isPersistent: () => boolean,\n isPropagationStopped: () => boolean,\n _dispatchInstances?: null | Array | Fiber,\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticAnimationEvent.js b\/packages\/react-dom\/src\/events\/SyntheticAnimationEvent.js\nindex e5a161cb6f..9409bd129c 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticAnimationEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticAnimationEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n \/**\n * @interface Event\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticClipboardEvent.js b\/packages\/react-dom\/src\/events\/SyntheticClipboardEvent.js\nindex bcab0e926c..f886c9ced7 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticClipboardEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticClipboardEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n \/**\n * @interface Event\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticCompositionEvent.js b\/packages\/react-dom\/src\/events\/SyntheticCompositionEvent.js\nindex afe88b4028..556c6e5f79 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticCompositionEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticCompositionEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n \/**\n * @interface Event\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/SyntheticEvent.js b\/packages\/react-dom\/src\/events\/SyntheticEvent.js\nsimilarity index 81%\nrename from packages\/react-dom\/src\/legacy-events\/SyntheticEvent.js\nrename to packages\/react-dom\/src\/events\/SyntheticEvent.js\nindex de8b2cfc31..950fee5942 100644\n--- a\/packages\/react-dom\/src\/legacy-events\/SyntheticEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticEvent.js\n@@ -60,15 +60,6 @@ function SyntheticEvent(\n nativeEvent,\n nativeEventTarget,\n ) {\n- if (__DEV__) {\n- \/\/ these have a getter\/setter for warnings\n- delete this.nativeEvent;\n- delete this.preventDefault;\n- delete this.stopPropagation;\n- delete this.isDefaultPrevented;\n- delete this.isPropagationStopped;\n- }\n-\n this.dispatchConfig = dispatchConfig;\n this._targetInst = targetInst;\n this.nativeEvent = nativeEvent;\n@@ -78,9 +69,6 @@ function SyntheticEvent(\n if (!Interface.hasOwnProperty(propName)) {\n continue;\n }\n- if (__DEV__) {\n- delete this[propName]; \/\/ this has a getter\/setter for warnings\n- }\n const normalize = Interface[propName];\n if (normalize) {\n this[propName] = normalize(nativeEvent);\n@@ -157,14 +145,6 @@ Object.assign(SyntheticEvent.prototype, {\n * @return {boolean} True if this should not be released, false otherwise.\n *\/\n isPersistent: functionThatReturnsTrue,\n-\n- \/**\n- * `PooledClass` looks for `destructor` on each instance it releases.\n- *\/\n- destructor: function() {\n- \/\/ Modern event system doesn't use pooling.\n- \/\/ TODO: remove calls to this.\n- },\n });\n \n SyntheticEvent.Interface = EventInterface;\n@@ -188,34 +168,8 @@ SyntheticEvent.extend = function(Interface) {\n \n Class.Interface = Object.assign({}, Super.Interface, Interface);\n Class.extend = Super.extend;\n- addEventPoolingTo(Class);\n \n return Class;\n };\n \n-addEventPoolingTo(SyntheticEvent);\n-\n-function createOrGetPooledEvent(\n- dispatchConfig,\n- targetInst,\n- nativeEvent,\n- nativeInst,\n-) {\n- const EventConstructor = this;\n- \/\/ Modern event system doesn't use pooling.\n- \/\/ TODO: remove this indirection.\n- return new EventConstructor(\n- dispatchConfig,\n- targetInst,\n- nativeEvent,\n- nativeInst,\n- );\n-}\n-\n-function addEventPoolingTo(EventConstructor) {\n- EventConstructor.getPooled = createOrGetPooledEvent;\n- \/\/ Modern event system doesn't use pooling.\n- \/\/ TODO: remove calls to this.\n-}\n-\n export default SyntheticEvent;\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticInputEvent.js b\/packages\/react-dom\/src\/events\/SyntheticInputEvent.js\nindex 1e98175935..e4803b17aa 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticInputEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticInputEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n \/**\n * @interface Event\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticTransitionEvent.js b\/packages\/react-dom\/src\/events\/SyntheticTransitionEvent.js\nindex 654d846d9a..cffd41f6af 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticTransitionEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticTransitionEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n \/**\n * @interface Event\ndiff --git a\/packages\/react-dom\/src\/events\/SyntheticUIEvent.js b\/packages\/react-dom\/src\/events\/SyntheticUIEvent.js\nindex 488ab41190..9eb2561e5d 100644\n--- a\/packages\/react-dom\/src\/events\/SyntheticUIEvent.js\n+++ b\/packages\/react-dom\/src\/events\/SyntheticUIEvent.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n \n const SyntheticUIEvent = SyntheticEvent.extend({\n view: null,\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/TopLevelEventTypes.js b\/packages\/react-dom\/src\/events\/TopLevelEventTypes.js\nsimilarity index 71%\nrename from packages\/react-dom\/src\/legacy-events\/TopLevelEventTypes.js\nrename to packages\/react-dom\/src\/events\/TopLevelEventTypes.js\nindex ce64f7a8e5..e4f2aefa90 100644\n--- a\/packages\/react-dom\/src\/legacy-events\/TopLevelEventTypes.js\n+++ b\/packages\/react-dom\/src\/events\/TopLevelEventTypes.js\n@@ -7,17 +7,6 @@\n * @flow\n *\/\n \n-export type RNTopLevelEventType =\n- | 'topMouseDown'\n- | 'topMouseMove'\n- | 'topMouseUp'\n- | 'topScroll'\n- | 'topSelectionChange'\n- | 'topTouchCancel'\n- | 'topTouchEnd'\n- | 'topTouchMove'\n- | 'topTouchStart';\n-\n export opaque type DOMTopLevelEventType = string;\n \n \/\/ Do not use the below two methods directly!\n@@ -36,4 +25,4 @@ export function unsafeCastDOMTopLevelTypeToString(\n return topLevelType;\n }\n \n-export type TopLevelType = DOMTopLevelEventType | RNTopLevelEventType;\n+export type TopLevelType = DOMTopLevelEventType;\ndiff --git a\/packages\/react-dom\/src\/events\/getEventModifierState.js b\/packages\/react-dom\/src\/events\/getEventModifierState.js\nindex 8a3f2f29f6..74f4f94049 100644\n--- a\/packages\/react-dom\/src\/events\/getEventModifierState.js\n+++ b\/packages\/react-dom\/src\/events\/getEventModifierState.js\n@@ -12,7 +12,7 @@\n * @see http:\/\/www.w3.org\/TR\/DOM-Level-3-Events\/#keys-Modifiers\n *\/\n \n-import type {AnyNativeEvent} from '..\/legacy-events\/PluginModuleType';\n+import type {AnyNativeEvent} from '..\/events\/PluginModuleType';\n \n const modifierKeyToProp = {\n Alt: 'altKey',\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\nindex 1bbf54bde9..b8627d9261 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import type {TopLevelType} from '..\/..\/legacy-events\/TopLevelEventTypes';\n+import type {TopLevelType} from '..\/..\/events\/TopLevelEventTypes';\n \n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n \n@@ -259,7 +259,7 @@ function extractCompositionEvent(\n }\n }\n \n- const event = SyntheticCompositionEvent.getPooled(\n+ const event = new SyntheticCompositionEvent(\n eventType,\n null,\n nativeEvent,\n@@ -429,7 +429,7 @@ function extractBeforeInputEvent(\n return null;\n }\n \n- const event = SyntheticInputEvent.getPooled(\n+ const event = new SyntheticInputEvent(\n eventTypes.beforeInput,\n null,\n nativeEvent,\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\nindex ee47a22806..3c6d1442f9 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import SyntheticEvent from '..\/..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/..\/events\/SyntheticEvent';\n import isTextInputElement from '..\/isTextInputElement';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n \n@@ -58,7 +58,7 @@ function createAndAccumulateChangeEvent(\n nativeEvent,\n target,\n ) {\n- const event = SyntheticEvent.getPooled(\n+ const event = new SyntheticEvent(\n eventTypes.change,\n null,\n nativeEvent,\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\nindex 679d3897d2..545df1e475 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\n@@ -145,7 +145,7 @@ const EnterLeaveEventPlugin = {\n const fromNode = from == null ? win : getNodeFromInstance(from);\n const toNode = to == null ? win : getNodeFromInstance(to);\n \n- const leave = eventInterface.getPooled(\n+ const leave = new eventInterface(\n leaveEventType,\n from,\n nativeEvent,\n@@ -155,7 +155,7 @@ const EnterLeaveEventPlugin = {\n leave.target = fromNode;\n leave.relatedTarget = toNode;\n \n- let enter = eventInterface.getPooled(\n+ let enter = new eventInterface(\n enterEventType,\n to,\n nativeEvent,\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\nindex 9761593a28..d272fec09e 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n@@ -6,7 +6,7 @@\n *\/\n \n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n-import SyntheticEvent from '..\/..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/..\/events\/SyntheticEvent';\n import isTextInputElement from '..\/isTextInputElement';\n import shallowEqual from 'shared\/shallowEqual';\n \n@@ -132,7 +132,7 @@ function constructSelectEvent(dispatchQueue, nativeEvent, nativeEventTarget) {\n if (!lastSelection || !shallowEqual(lastSelection, currentSelection)) {\n lastSelection = currentSelection;\n \n- const syntheticEvent = SyntheticEvent.getPooled(\n+ const syntheticEvent = new SyntheticEvent(\n eventTypes.select,\n null,\n nativeEvent,\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\nindex 27db617a5b..7aa1bf0ac3 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n@@ -10,15 +10,15 @@\n import type {\n TopLevelType,\n DOMTopLevelEventType,\n-} from '..\/..\/legacy-events\/TopLevelEventTypes';\n+} from '..\/..\/events\/TopLevelEventTypes';\n import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {\n ModernPluginModule,\n DispatchQueue,\n-} from '..\/..\/legacy-events\/PluginModuleType';\n+} from '..\/..\/events\/PluginModuleType';\n import type {EventSystemFlags} from '..\/EventSystemFlags';\n \n-import SyntheticEvent from '..\/..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/..\/events\/SyntheticEvent';\n \n import * as DOMTopLevelEventTypes from '..\/DOMTopLevelEventTypes';\n import {\n@@ -200,7 +200,7 @@ const SimpleEventPlugin: ModernPluginModule = {\n EventConstructor = SyntheticEvent;\n break;\n }\n- const event = EventConstructor.getPooled(\n+ const event = new EventConstructor(\n dispatchConfig,\n null,\n nativeEvent,\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/EventPluginRegistry.js b\/packages\/react-dom\/src\/legacy-events\/EventPluginRegistry.js\ndeleted file mode 100644\nindex 7c22ebbcbc..0000000000\n--- a\/packages\/react-dom\/src\/legacy-events\/EventPluginRegistry.js\n+++ \/dev\/null\n@@ -1,270 +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 {DispatchConfig} from '.\/ReactSyntheticEventType';\n-import type {\n- AnyNativeEvent,\n- PluginName,\n- LegacyPluginModule,\n- ModernPluginModule,\n-} from '.\/PluginModuleType';\n-\n-import invariant from 'shared\/invariant';\n-\n-type NamesToPlugins = {\n- [key: PluginName]:\n- | LegacyPluginModule\n- | ModernPluginModule,\n- ...,\n-};\n-type EventPluginOrder = null | Array;\n-\n-\/**\n- * Injectable ordering of event plugins.\n- *\/\n-let eventPluginOrder: EventPluginOrder = null;\n-\n-\/**\n- * Injectable mapping from names to event plugin modules.\n- *\/\n-const namesToPlugins: NamesToPlugins = {};\n-\n-\/**\n- * Recomputes the plugin list using the injected plugins and plugin ordering.\n- *\n- * @private\n- *\/\n-function recomputePluginOrdering(): void {\n- if (!eventPluginOrder) {\n- \/\/ Wait until an `eventPluginOrder` is injected.\n- return;\n- }\n- for (const pluginName in namesToPlugins) {\n- const pluginModule = namesToPlugins[pluginName];\n- const pluginIndex = eventPluginOrder.indexOf(pluginName);\n- invariant(\n- pluginIndex > -1,\n- 'EventPluginRegistry: Cannot inject event plugins that do not exist in ' +\n- 'the plugin ordering, `%s`.',\n- pluginName,\n- );\n- if (plugins[pluginIndex]) {\n- continue;\n- }\n- invariant(\n- pluginModule.extractEvents,\n- 'EventPluginRegistry: Event plugins must implement an `extractEvents` ' +\n- 'method, but `%s` does not.',\n- pluginName,\n- );\n- plugins[pluginIndex] = pluginModule;\n- const publishedEvents = pluginModule.eventTypes;\n- for (const eventName in publishedEvents) {\n- invariant(\n- publishEventForPlugin(\n- publishedEvents[eventName],\n- pluginModule,\n- eventName,\n- ),\n- 'EventPluginRegistry: Failed to publish event `%s` for plugin `%s`.',\n- eventName,\n- pluginName,\n- );\n- }\n- }\n-}\n-\n-\/**\n- * Publishes an event so that it can be dispatched by the supplied plugin.\n- *\n- * @param {object} dispatchConfig Dispatch configuration for the event.\n- * @param {object} PluginModule Plugin publishing the event.\n- * @return {boolean} True if the event was successfully published.\n- * @private\n- *\/\n-function publishEventForPlugin(\n- dispatchConfig: DispatchConfig,\n- pluginModule:\n- | LegacyPluginModule\n- | ModernPluginModule,\n- eventName: string,\n-): boolean {\n- invariant(\n- !eventNameDispatchConfigs.hasOwnProperty(eventName),\n- 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n- 'event name, `%s`.',\n- eventName,\n- );\n- eventNameDispatchConfigs[eventName] = dispatchConfig;\n-\n- const phasedRegistrationNames = dispatchConfig.phasedRegistrationNames;\n- if (phasedRegistrationNames) {\n- for (const phaseName in phasedRegistrationNames) {\n- if (phasedRegistrationNames.hasOwnProperty(phaseName)) {\n- const phasedRegistrationName = phasedRegistrationNames[phaseName];\n- publishRegistrationName(\n- phasedRegistrationName,\n- pluginModule,\n- eventName,\n- );\n- }\n- }\n- return true;\n- } else if (dispatchConfig.registrationName) {\n- publishRegistrationName(\n- dispatchConfig.registrationName,\n- pluginModule,\n- eventName,\n- );\n- return true;\n- }\n- return false;\n-}\n-\n-\/**\n- * Publishes a registration name that is used to identify dispatched events.\n- *\n- * @param {string} registrationName Registration name to add.\n- * @param {object} PluginModule Plugin publishing the event.\n- * @private\n- *\/\n-function publishRegistrationName(\n- registrationName: string,\n- pluginModule:\n- | LegacyPluginModule\n- | ModernPluginModule,\n- eventName: string,\n-): void {\n- invariant(\n- !registrationNameModules[registrationName],\n- 'EventPluginRegistry: More than one plugin attempted to publish the same ' +\n- 'registration name, `%s`.',\n- registrationName,\n- );\n- registrationNameModules[registrationName] = pluginModule;\n- registrationNameDependencies[registrationName] =\n- pluginModule.eventTypes[eventName].dependencies;\n-\n- if (__DEV__) {\n- const lowerCasedName = registrationName.toLowerCase();\n- possibleRegistrationNames[lowerCasedName] = registrationName;\n-\n- if (registrationName === 'onDoubleClick') {\n- possibleRegistrationNames.ondblclick = registrationName;\n- }\n- }\n-}\n-\n-\/**\n- * Registers plugins so that they can extract and dispatch events.\n- *\/\n-\n-\/**\n- * Ordered list of injected plugins.\n- *\/\n-export const plugins = [];\n-\n-\/**\n- * Mapping from event name to dispatch config\n- *\/\n-export const eventNameDispatchConfigs = {};\n-\n-\/**\n- * Mapping from registration name to plugin module\n- *\/\n-export const registrationNameModules = {};\n-\n-\/**\n- * Mapping from registration name to event name\n- *\/\n-export const registrationNameDependencies = {};\n-\n-\/**\n- * Mapping from lowercase registration names to the properly cased version,\n- * used to warn in the case of missing event handlers. Available\n- * only in __DEV__.\n- * @type {Object}\n- *\/\n-export const possibleRegistrationNames = __DEV__ ? {} : (null: any);\n-\/\/ Trust the developer to only use possibleRegistrationNames in __DEV__\n-\n-\/**\n- * Injects an ordering of plugins (by plugin name). This allows the ordering\n- * to be decoupled from injection of the actual plugins so that ordering is\n- * always deterministic regardless of packaging, on-the-fly injection, etc.\n- *\n- * @param {array} InjectedEventPluginOrder\n- * @internal\n- *\/\n-export function injectEventPluginOrder(\n- injectedEventPluginOrder: EventPluginOrder,\n-): void {\n- invariant(\n- !eventPluginOrder,\n- 'EventPluginRegistry: Cannot inject event plugin ordering more than ' +\n- 'once. You are likely trying to load more than one copy of React.',\n- );\n- \/\/ Clone the ordering so it cannot be dynamically mutated.\n- eventPluginOrder = Array.prototype.slice.call(injectedEventPluginOrder);\n- recomputePluginOrdering();\n-}\n-\n-\/**\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- *\/\n-export function injectEventPluginsByName(\n- injectedNamesToPlugins: NamesToPlugins,\n-): void {\n- let isOrderingDirty = false;\n- for (const pluginName in injectedNamesToPlugins) {\n- if (!injectedNamesToPlugins.hasOwnProperty(pluginName)) {\n- continue;\n- }\n- const pluginModule = injectedNamesToPlugins[pluginName];\n- if (\n- !namesToPlugins.hasOwnProperty(pluginName) ||\n- namesToPlugins[pluginName] !== pluginModule\n- ) {\n- invariant(\n- !namesToPlugins[pluginName],\n- 'EventPluginRegistry: Cannot inject two different event plugins ' +\n- 'using the same name, `%s`.',\n- pluginName,\n- );\n- namesToPlugins[pluginName] = pluginModule;\n- isOrderingDirty = true;\n- }\n- }\n- if (isOrderingDirty) {\n- recomputePluginOrdering();\n- }\n-}\n-\n-export function injectEventPlugins(\n- eventPlugins: [ModernPluginModule],\n-): void {\n- for (let i = 0; i < eventPlugins.length; i++) {\n- const pluginModule = eventPlugins[i];\n- plugins.push(pluginModule);\n- const publishedEvents = pluginModule.eventTypes;\n- for (const eventName in publishedEvents) {\n- publishEventForPlugin(\n- publishedEvents[eventName],\n- pluginModule,\n- eventName,\n- );\n- }\n- }\n-}\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/EventPluginUtils.js b\/packages\/react-dom\/src\/legacy-events\/EventPluginUtils.js\ndeleted file mode 100644\nindex abba8e9a3d..0000000000\n--- a\/packages\/react-dom\/src\/legacy-events\/EventPluginUtils.js\n+++ \/dev\/null\n@@ -1,172 +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-import {invokeGuardedCallbackAndCatchFirstError} from 'shared\/ReactErrorUtils';\n-import invariant from 'shared\/invariant';\n-\n-export let getFiberCurrentPropsFromNode = null;\n-export let getInstanceFromNode = null;\n-export let getNodeFromInstance = null;\n-\n-export function setComponentTree(\n- getFiberCurrentPropsFromNodeImpl,\n- getInstanceFromNodeImpl,\n- getNodeFromInstanceImpl,\n-) {\n- getFiberCurrentPropsFromNode = getFiberCurrentPropsFromNodeImpl;\n- getInstanceFromNode = getInstanceFromNodeImpl;\n- getNodeFromInstance = getNodeFromInstanceImpl;\n- if (__DEV__) {\n- if (!getNodeFromInstance || !getInstanceFromNode) {\n- console.error(\n- 'EventPluginUtils.setComponentTree(...): Injected ' +\n- 'module is missing getNodeFromInstance or getInstanceFromNode.',\n- );\n- }\n- }\n-}\n-\n-let validateEventDispatches;\n-if (__DEV__) {\n- validateEventDispatches = function(event) {\n- const dispatchListeners = event._dispatchListeners;\n- const dispatchInstances = event._dispatchInstances;\n-\n- const listenersIsArr = Array.isArray(dispatchListeners);\n- const listenersLen = listenersIsArr\n- ? dispatchListeners.length\n- : dispatchListeners\n- ? 1\n- : 0;\n-\n- const instancesIsArr = Array.isArray(dispatchInstances);\n- const instancesLen = instancesIsArr\n- ? dispatchInstances.length\n- : dispatchInstances\n- ? 1\n- : 0;\n-\n- if (instancesIsArr !== listenersIsArr || instancesLen !== listenersLen) {\n- console.error('EventPluginUtils: Invalid `event`.');\n- }\n- };\n-}\n-\n-\/**\n- * Dispatch the event to the listener.\n- * @param {SyntheticEvent} event SyntheticEvent to handle\n- * @param {function} listener Application-level callback\n- * @param {*} inst Internal component instance\n- *\/\n-export function executeDispatch(event, listener, inst) {\n- const type = event.type || 'unknown-event';\n- event.currentTarget = getNodeFromInstance(inst);\n- invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);\n- event.currentTarget = null;\n-}\n-\n-\/**\n- * Standard\/simple iteration through an event's collected dispatches.\n- *\/\n-export function executeDispatchesInOrder(event) {\n- const dispatchListeners = event._dispatchListeners;\n- const dispatchInstances = event._dispatchInstances;\n- if (__DEV__) {\n- validateEventDispatches(event);\n- }\n- if (Array.isArray(dispatchListeners)) {\n- for (let i = 0; i < dispatchListeners.length; i++) {\n- if (event.isPropagationStopped()) {\n- break;\n- }\n- \/\/ Listeners and Instances are two parallel arrays that are always in sync.\n- executeDispatch(event, dispatchListeners[i], dispatchInstances[i]);\n- }\n- } else if (dispatchListeners) {\n- executeDispatch(event, dispatchListeners, dispatchInstances);\n- }\n- event._dispatchListeners = null;\n- event._dispatchInstances = null;\n-}\n-\n-\/**\n- * Standard\/simple iteration through an event's collected dispatches, but stops\n- * at the first dispatch execution returning true, and returns that id.\n- *\n- * @return {?string} id of the first dispatch execution who's listener returns\n- * true, or null if no listener returned true.\n- *\/\n-function executeDispatchesInOrderStopAtTrueImpl(event) {\n- const dispatchListeners = event._dispatchListeners;\n- const dispatchInstances = event._dispatchInstances;\n- if (__DEV__) {\n- validateEventDispatches(event);\n- }\n- if (Array.isArray(dispatchListeners)) {\n- for (let i = 0; i < dispatchListeners.length; i++) {\n- if (event.isPropagationStopped()) {\n- break;\n- }\n- \/\/ Listeners and Instances are two parallel arrays that are always in sync.\n- if (dispatchListeners[i](event, dispatchInstances[i])) {\n- return dispatchInstances[i];\n- }\n- }\n- } else if (dispatchListeners) {\n- if (dispatchListeners(event, dispatchInstances)) {\n- return dispatchInstances;\n- }\n- }\n- return null;\n-}\n-\n-\/**\n- * @see executeDispatchesInOrderStopAtTrueImpl\n- *\/\n-export function executeDispatchesInOrderStopAtTrue(event) {\n- const ret = executeDispatchesInOrderStopAtTrueImpl(event);\n- event._dispatchInstances = null;\n- event._dispatchListeners = null;\n- return ret;\n-}\n-\n-\/**\n- * Execution of a \"direct\" dispatch - there must be at most one dispatch\n- * accumulated on the event or it is considered an error. It doesn't really make\n- * sense for an event with multiple dispatches (bubbled) to keep track of the\n- * return values at each dispatch execution, but it does tend to make sense when\n- * dealing with \"direct\" dispatches.\n- *\n- * @return {*} The return value of executing the single dispatch.\n- *\/\n-export function executeDirectDispatch(event) {\n- if (__DEV__) {\n- validateEventDispatches(event);\n- }\n- const dispatchListener = event._dispatchListeners;\n- const dispatchInstance = event._dispatchInstances;\n- invariant(\n- !Array.isArray(dispatchListener),\n- 'executeDirectDispatch(...): Invalid `event`.',\n- );\n- event.currentTarget = dispatchListener\n- ? getNodeFromInstance(dispatchInstance)\n- : null;\n- const res = dispatchListener ? dispatchListener(event) : null;\n- event.currentTarget = null;\n- event._dispatchListeners = null;\n- event._dispatchInstances = null;\n- return res;\n-}\n-\n-\/**\n- * @param {SyntheticEvent} event\n- * @return {boolean} True iff number of dispatches accumulated is greater than 0.\n- *\/\n-export function hasDispatches(event) {\n- return !!event._dispatchListeners;\n-}\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/accumulateInto.js b\/packages\/react-dom\/src\/legacy-events\/accumulateInto.js\ndeleted file mode 100644\nindex 35625311da..0000000000\n--- a\/packages\/react-dom\/src\/legacy-events\/accumulateInto.js\n+++ \/dev\/null\n@@ -1,57 +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 invariant from 'shared\/invariant';\n-\n-\/**\n- * Accumulates items that must not be null or undefined into the first one. This\n- * is used to conserve memory by avoiding array allocations, and thus sacrifices\n- * API cleanness. Since `current` can be null before being passed in and not\n- * null after this function, make sure to assign it back to `current`:\n- *\n- * `a = accumulateInto(a, b);`\n- *\n- * This API should be sparingly used. Try `accumulate` for something cleaner.\n- *\n- * @return {*|array<*>} An accumulation of items.\n- *\/\n-\n-function accumulateInto(\n- current: ?(Array | T),\n- next: T | Array,\n-): T | Array {\n- invariant(\n- next != null,\n- 'accumulateInto(...): Accumulated items must not be null or undefined.',\n- );\n-\n- if (current == null) {\n- return next;\n- }\n-\n- \/\/ Both are not empty. Warning: Never call x.concat(y) when you are not\n- \/\/ certain that x is an Array (x could be a string with concat method).\n- if (Array.isArray(current)) {\n- if (Array.isArray(next)) {\n- current.push.apply(current, next);\n- return current;\n- }\n- current.push(next);\n- return current;\n- }\n-\n- if (Array.isArray(next)) {\n- \/\/ A bit too dangerous to mutate `next`.\n- return [current].concat(next);\n- }\n-\n- return [current, next];\n-}\n-\n-export default accumulateInto;\ndiff --git a\/packages\/react-dom\/src\/legacy-events\/forEachAccumulated.js b\/packages\/react-dom\/src\/legacy-events\/forEachAccumulated.js\ndeleted file mode 100644\nindex 369be5605c..0000000000\n--- a\/packages\/react-dom\/src\/legacy-events\/forEachAccumulated.js\n+++ \/dev\/null\n@@ -1,31 +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-\/**\n- * @param {array} arr an \"accumulation\" of items which is either an Array or\n- * a single item. Useful when paired with the `accumulate` module. This is a\n- * simple utility that allows us to reason about a collection of items, but\n- * handling the case when there is exactly one item (and we do not need to\n- * allocate an array).\n- * @param {function} cb Callback invoked with each element or a collection.\n- * @param {?} [scope] Scope used as `this` in a callback.\n- *\/\n-function forEachAccumulated(\n- arr: ?(Array | T),\n- cb: (elem: T) => void,\n- scope: ?any,\n-) {\n- if (Array.isArray(arr)) {\n- arr.forEach(cb, scope);\n- } else if (arr) {\n- cb.call(scope, arr);\n- }\n-}\n-\n-export default forEachAccumulated;\ndiff --git a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\nindex 63693ed1b5..79e411d7f0 100644\n--- a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n+++ b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n@@ -114,7 +114,7 @@ if (__DEV__) {\n validatePropertiesInDevelopment = function(type, props) {\n validateARIAProperties(type, props);\n validateInputProperties(type, props);\n- validateUnknownProperties(type, props, \/* canUseEventSystem *\/ false);\n+ validateUnknownProperties(type, props, null);\n };\n \n describeStackFrame = function(element): string {\ndiff --git a\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js b\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\nindex f1f548c82e..3a04da5201 100644\n--- a\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\n+++ b\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\n@@ -14,7 +14,7 @@ import type {\n EventPriority,\n ReactScopeInstance,\n } from 'shared\/ReactTypes';\n-import type {DOMTopLevelEventType} from '..\/legacy-events\/TopLevelEventTypes';\n+import type {DOMTopLevelEventType} from '..\/events\/TopLevelEventTypes';\n \n type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;\n \ndiff --git a\/packages\/react-dom\/src\/shared\/ReactDOMUnknownPropertyHook.js b\/packages\/react-dom\/src\/shared\/ReactDOMUnknownPropertyHook.js\nindex f1eb971e2b..eab24b20d7 100644\n--- a\/packages\/react-dom\/src\/shared\/ReactDOMUnknownPropertyHook.js\n+++ b\/packages\/react-dom\/src\/shared\/ReactDOMUnknownPropertyHook.js\n@@ -5,11 +5,6 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import {\n- registrationNameModules,\n- possibleRegistrationNames,\n-} from '..\/legacy-events\/EventPluginRegistry';\n-\n import {\n ATTRIBUTE_NAME_CHAR,\n BOOLEAN,\n@@ -30,7 +25,7 @@ if (__DEV__) {\n const rARIA = new RegExp('^(aria)-[' + ATTRIBUTE_NAME_CHAR + ']*$');\n const rARIACamel = new RegExp('^(aria)[A-Z][' + ATTRIBUTE_NAME_CHAR + ']*$');\n \n- validateProperty = function(tagName, name, value, canUseEventSystem) {\n+ validateProperty = function(tagName, name, value, eventRegistry) {\n if (hasOwnProperty.call(warnedProperties, name) && warnedProperties[name]) {\n return true;\n }\n@@ -47,7 +42,11 @@ if (__DEV__) {\n }\n \n \/\/ We can't rely on the event system being injected on the server.\n- if (canUseEventSystem) {\n+ if (eventRegistry != null) {\n+ const {\n+ registrationNameModules,\n+ possibleRegistrationNames,\n+ } = eventRegistry;\n if (registrationNameModules.hasOwnProperty(name)) {\n return true;\n }\n@@ -240,16 +239,11 @@ if (__DEV__) {\n };\n }\n \n-const warnUnknownProperties = function(type, props, canUseEventSystem) {\n+const warnUnknownProperties = function(type, props, eventRegistry) {\n if (__DEV__) {\n const unknownProps = [];\n for (const key in props) {\n- const isValid = validateProperty(\n- type,\n- key,\n- props[key],\n- canUseEventSystem,\n- );\n+ const isValid = validateProperty(type, key, props[key], eventRegistry);\n if (!isValid) {\n unknownProps.push(key);\n }\n@@ -278,9 +272,9 @@ const warnUnknownProperties = function(type, props, canUseEventSystem) {\n }\n };\n \n-export function validateProperties(type, props, canUseEventSystem) {\n+export function validateProperties(type, props, eventRegistry) {\n if (isCustomComponent(type, props)) {\n return;\n }\n- warnUnknownProperties(type, props, canUseEventSystem);\n+ warnUnknownProperties(type, props, eventRegistry);\n }\ndiff --git a\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js b\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\nindex a42df39b31..54de14b032 100644\n--- a\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\n+++ b\/packages\/react-dom\/src\/test-utils\/ReactTestUtils.js\n@@ -15,12 +15,10 @@ import {\n HostComponent,\n HostText,\n } from 'react-reconciler\/src\/ReactWorkTags';\n-import SyntheticEvent from '..\/legacy-events\/SyntheticEvent';\n+import SyntheticEvent from '..\/events\/SyntheticEvent';\n import invariant from 'shared\/invariant';\n import {ELEMENT_NODE} from '..\/shared\/HTMLNodeType';\n import act from '.\/ReactTestUtilsAct';\n-import forEachAccumulated from '..\/legacy-events\/forEachAccumulated';\n-import accumulateInto from '..\/legacy-events\/accumulateInto';\n import {\n rethrowCaughtError,\n invokeGuardedCallbackAndCatchFirstError,\n@@ -32,13 +30,12 @@ const [\n \/* eslint-disable no-unused-vars *\/\n getNodeFromInstance,\n getFiberCurrentPropsFromNode,\n- injectEventPluginsByName,\n \/* eslint-enable no-unused-vars *\/\n eventNameDispatchConfigs,\n enqueueStateRestore,\n- restoreStateIfNeeded \/* eslint-disable no-unused-vars *\/, \/\/ TODO: remove.\n- ,\n- \/* dispatchEvent *\/ flushPassiveEffects,\n+ restoreStateIfNeeded,\n+ \/* eslint-disable no-unused-vars *\/\n+ flushPassiveEffects,\n IsThisRendererActing,\n \/* eslint-enable no-unused-vars *\/\n ] = ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.Events;\n@@ -386,12 +383,6 @@ function executeDispatchesInOrder(event) {\n event._dispatchInstances = null;\n }\n \n-\/**\n- * Internal queue of events that have accumulated their dispatches and are\n- * waiting to have their dispatches executed.\n- *\/\n-let eventQueue: ?(Array | ReactSyntheticEvent) = null;\n-\n \/**\n * Dispatches an event and releases it back into the pool, unless persistent.\n *\n@@ -408,36 +399,6 @@ const executeDispatchesAndRelease = function(event: ReactSyntheticEvent) {\n }\n };\n \n-const executeDispatchesAndReleaseTopLevel = function(e) {\n- return executeDispatchesAndRelease(e);\n-};\n-\n-function runEventsInBatch(\n- events: Array | ReactSyntheticEvent | null,\n-) {\n- if (events !== null) {\n- eventQueue = accumulateInto(eventQueue, events);\n- }\n-\n- \/\/ Set `eventQueue` to null before processing it so that we can tell if more\n- \/\/ events get enqueued while processing.\n- const processingEventQueue = eventQueue;\n- eventQueue = null;\n-\n- if (!processingEventQueue) {\n- return;\n- }\n-\n- forEachAccumulated(processingEventQueue, executeDispatchesAndReleaseTopLevel);\n- invariant(\n- !eventQueue,\n- 'processEventQueue(): Additional events were enqueued while processing ' +\n- 'an event queue. Support for this has not yet been implemented.',\n- );\n- \/\/ This would be a good time to rethrow if any of the event handlers threw.\n- rethrowCaughtError();\n-}\n-\n function isInteractive(tag) {\n return (\n tag === 'button' ||\n@@ -541,11 +502,14 @@ function accumulateDispatches(inst, ignoredDirection, event) {\n const registrationName = event.dispatchConfig.registrationName;\n const listener = getListener(inst, registrationName);\n if (listener) {\n- event._dispatchListeners = accumulateInto(\n- event._dispatchListeners,\n- listener,\n- );\n- event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);\n+ if (event._dispatchListeners == null) {\n+ event._dispatchListeners = [];\n+ }\n+ if (event._dispatchInstances == null) {\n+ event._dispatchInstances = [];\n+ }\n+ event._dispatchListeners.push(listener);\n+ event._dispatchInstances.push(inst);\n }\n }\n }\n@@ -558,11 +522,14 @@ function accumulateDirectionalDispatches(inst, phase, event) {\n }\n const listener = listenerAtPhase(inst, event, phase);\n if (listener) {\n- event._dispatchListeners = accumulateInto(\n- event._dispatchListeners,\n- listener,\n- );\n- event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);\n+ if (event._dispatchListeners == null) {\n+ event._dispatchListeners = [];\n+ }\n+ if (event._dispatchInstances == null) {\n+ event._dispatchInstances = [];\n+ }\n+ event._dispatchListeners.push(listener);\n+ event._dispatchInstances.push(inst);\n }\n }\n \n@@ -572,23 +539,15 @@ function accumulateDirectDispatchesSingle(event) {\n }\n }\n \n-function accumulateDirectDispatches(events) {\n- forEachAccumulated(events, accumulateDirectDispatchesSingle);\n-}\n-\n function accumulateTwoPhaseDispatchesSingle(event) {\n if (event && event.dispatchConfig.phasedRegistrationNames) {\n traverseTwoPhase(event._targetInst, accumulateDirectionalDispatches, event);\n }\n }\n \n-function accumulateTwoPhaseDispatches(events) {\n- forEachAccumulated(events, accumulateTwoPhaseDispatchesSingle);\n-}\n \/\/ End of inline\n \n const Simulate = {};\n-let SimulateNative;\n \n \/**\n * Exports:\n@@ -618,8 +577,6 @@ function makeSimulator(eventType) {\n fakeNativeEvent.target = domNode;\n fakeNativeEvent.type = eventType.toLowerCase();\n \n- \/\/ We don't use SyntheticEvent.getPooled in order to not have to worry about\n- \/\/ properly destroying any properties assigned from `eventData` upon release\n const targetInst = getInstanceFromNode(domNode);\n const event = new SyntheticEvent(\n dispatchConfig,\n@@ -634,16 +591,17 @@ function makeSimulator(eventType) {\n Object.assign(event, eventData);\n \n if (dispatchConfig.phasedRegistrationNames) {\n- accumulateTwoPhaseDispatches(event);\n+ accumulateTwoPhaseDispatchesSingle(event);\n } else {\n- accumulateDirectDispatches(event);\n+ accumulateDirectDispatchesSingle(event);\n }\n \n ReactDOM.unstable_batchedUpdates(function() {\n \/\/ Normally extractEvent enqueues a state restore, but we'll just always\n \/\/ do that since we're by-passing it here.\n enqueueStateRestore(domNode);\n- runEventsInBatch(event);\n+ executeDispatchesAndRelease(event);\n+ rethrowCaughtError();\n });\n restoreStateIfNeeded();\n };\n@@ -680,6 +638,5 @@ export {\n mockComponent,\n nativeTouchData,\n Simulate,\n- SimulateNative,\n act,\n };\ndiff --git a\/packages\/react-dom\/src\/test-utils\/ReactTestUtilsAct.js b\/packages\/react-dom\/src\/test-utils\/ReactTestUtilsAct.js\nindex 39a249a098..6f43182171 100644\n--- a\/packages\/react-dom\/src\/test-utils\/ReactTestUtilsAct.js\n+++ b\/packages\/react-dom\/src\/test-utils\/ReactTestUtilsAct.js\n@@ -20,11 +20,9 @@ const [\n getInstanceFromNode,\n getNodeFromInstance,\n getFiberCurrentPropsFromNode,\n- injectEventPluginsByName,\n eventNameDispatchConfigs,\n enqueueStateRestore,\n restoreStateIfNeeded,\n- dispatchEvent,\n \/* eslint-enable no-unused-vars *\/\n flushPassiveEffects,\n IsThisRendererActing,\n"}

dillon1000/react

Files changed