{"parents":["0301f3e24ff98d50c6625ce394bc3a54d4b39c7b"],"commit":{"authorEmail":"trueadm@users.noreply.github.com","subject":"Clean up modern plugins to remove dead code (#18639)","revision":"32bb44c80ac64b3c96fa9e03b6ecb6dce6a0de6e","authoredAt":"2020-04-16T20:10:23+01:00","authorName":"Dominic Gannaway","shortRevision":"32bb44c80a"},"files":[{"path":"packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js","status":"D"},{"path":"packages\/react-dom\/src\/events\/accumulateEventTargetListeners.js","status":"D"},{"path":"packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js","status":"D"},{"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":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernBeforeInputEventPlugin-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernChangeEventPlugin-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernEnterLeaveEventPlugin-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSelectEventPlugin-test.internal.js","status":"M"},{"path":"packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSimpleEventPlugin-test.internal.js","status":"M"}],"patch":"diff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex 8804095657..568df46f72 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -33,7 +33,12 @@ import {\n USE_EVENT_SYSTEM,\n } from '.\/EventSystemFlags';\n \n-import {HostRoot, HostPortal} from 'react-reconciler\/src\/ReactWorkTags';\n+import {\n+ HostRoot,\n+ HostPortal,\n+ ScopeComponent,\n+ HostComponent,\n+} from 'react-reconciler\/src\/ReactWorkTags';\n \n import {\n addTrappedEventListener,\n@@ -86,10 +91,12 @@ import {\n import {COMMENT_NODE} from '..\/shared\/HTMLNodeType';\n import {topLevelEventsToDispatchConfig} from '.\/DOMEventProperties';\n import {batchedEventUpdates} from '.\/ReactDOMUpdateBatching';\n+import getListener from '.\/getListener';\n \n import {\n enableLegacyFBSupport,\n enableUseEventAPI,\n+ enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n invokeGuardedCallbackAndCatchFirstError,\n@@ -153,7 +160,7 @@ const isArray = Array.isArray;\n const PossiblyWeakMap = ((typeof WeakMap === 'function' ? WeakMap : Map): any);\n \n \/\/ $FlowFixMe: Flow cannot handle polymorphic WeakMaps\n-export const eventTargetEventListenerStore: WeakMap<\n+const eventTargetEventListenerStore: WeakMap<\n EventTarget,\n Map<\n DOMTopLevelEventType,\n@@ -162,7 +169,7 @@ export const eventTargetEventListenerStore: WeakMap<\n > = new PossiblyWeakMap();\n \n \/\/ $FlowFixMe: Flow cannot handle polymorphic WeakMaps\n-export const reactScopeListenerStore: WeakMap<\n+const reactScopeListenerStore: WeakMap<\n ReactScopeMethods,\n Map<\n DOMTopLevelEventType,\n@@ -672,3 +679,303 @@ export function detachListenerFromReactScope(listener: ReactDOMListener): void {\n }\n }\n }\n+\n+export function accumulateTwoPhaseListeners(\n+ event: ReactSyntheticEvent,\n+ accumulateUseEventListeners?: boolean,\n+): void {\n+ const phasedRegistrationNames = event.dispatchConfig.phasedRegistrationNames;\n+ const dispatchListeners = [];\n+ const dispatchInstances: Array = [];\n+ const dispatchCurrentTargets = [];\n+\n+ const {bubbled, captured} = phasedRegistrationNames;\n+ \/\/ If we are not handling EventTarget only phase, then we're doing the\n+ \/\/ usual two phase accumulation using the React fiber tree to pick up\n+ \/\/ all relevant useEvent and on* prop events.\n+ let instance = event._targetInst;\n+ let lastHostComponent = null;\n+\n+ \/\/ Accumulate all instances and listeners via the target -> root path.\n+ while (instance !== null) {\n+ const {stateNode, tag} = instance;\n+ \/\/ Handle listeners that are on HostComponents (i.e.

)\n+ if (tag === HostComponent && stateNode !== null) {\n+ const currentTarget = stateNode;\n+ lastHostComponent = currentTarget;\n+ \/\/ For useEvent listenrs\n+ if (enableUseEventAPI && accumulateUseEventListeners) {\n+ \/\/ useEvent event listeners\n+ const targetType = event.type;\n+ const listeners = getListenersFromTarget(currentTarget);\n+\n+ if (listeners !== null) {\n+ const listenersArr = Array.from(listeners);\n+ for (let i = 0; i < listenersArr.length; i++) {\n+ const listener = listenersArr[i];\n+ const {\n+ callback,\n+ event: {capture, type},\n+ } = listener;\n+ if (type === targetType) {\n+ if (capture === true) {\n+ dispatchListeners.unshift(callback);\n+ dispatchInstances.unshift(instance);\n+ dispatchCurrentTargets.unshift(currentTarget);\n+ } else {\n+ dispatchListeners.push(callback);\n+ dispatchInstances.push(instance);\n+ dispatchCurrentTargets.push(currentTarget);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ \/\/ Standard React on* listeners, i.e. onClick prop\n+ if (captured !== null) {\n+ const captureListener = getListener(instance, captured);\n+ if (captureListener != null) {\n+ \/\/ Capture listeners\/instances should go at the start, so we\n+ \/\/ unshift them to the start of the array.\n+ dispatchListeners.unshift(captureListener);\n+ dispatchInstances.unshift(instance);\n+ dispatchCurrentTargets.unshift(currentTarget);\n+ }\n+ }\n+ if (bubbled !== null) {\n+ const bubbleListener = getListener(instance, bubbled);\n+ if (bubbleListener != null) {\n+ \/\/ Bubble listeners\/instances should go at the end, so we\n+ \/\/ push them to the end of the array.\n+ dispatchListeners.push(bubbleListener);\n+ dispatchInstances.push(instance);\n+ dispatchCurrentTargets.push(currentTarget);\n+ }\n+ }\n+ }\n+ if (\n+ enableUseEventAPI &&\n+ enableScopeAPI &&\n+ accumulateUseEventListeners &&\n+ tag === ScopeComponent &&\n+ lastHostComponent !== null\n+ ) {\n+ const reactScope = stateNode.methods;\n+ const eventTypeMap = reactScopeListenerStore.get(reactScope);\n+ if (eventTypeMap !== undefined) {\n+ const type = ((event.type: any): DOMTopLevelEventType);\n+ const listeners = eventTypeMap.get(type);\n+ if (listeners !== undefined) {\n+ const captureListeners = Array.from(listeners.captured);\n+ const bubbleListeners = Array.from(listeners.bubbled);\n+ const lastCurrentTarget = ((lastHostComponent: any): Element);\n+\n+ for (let i = 0; i < captureListeners.length; i++) {\n+ const listener = captureListeners[i];\n+ const {callback} = listener;\n+ dispatchListeners.unshift(callback);\n+ dispatchInstances.unshift(instance);\n+ dispatchCurrentTargets.unshift(lastCurrentTarget);\n+ }\n+ for (let i = 0; i < bubbleListeners.length; i++) {\n+ const listener = bubbleListeners[i];\n+ const {callback} = listener;\n+ dispatchListeners.push(callback);\n+ dispatchInstances.push(instance);\n+ dispatchCurrentTargets.push(lastCurrentTarget);\n+ }\n+ }\n+ }\n+ }\n+ instance = instance.return;\n+ }\n+\n+ \/\/ To prevent allocation to the event unless we actually\n+ \/\/ have listeners we check the length of one of the arrays.\n+ if (dispatchListeners.length > 0) {\n+ event._dispatchListeners = dispatchListeners;\n+ event._dispatchInstances = dispatchInstances;\n+ event._dispatchCurrentTargets = dispatchCurrentTargets;\n+ }\n+}\n+\n+export function accumulateEventTargetListeners(\n+ event: ReactSyntheticEvent,\n+ currentTarget: EventTarget,\n+): void {\n+ const dispatchListeners = [];\n+ const dispatchInstances: Array = [];\n+ const dispatchCurrentTargets = [];\n+\n+ const eventTypeMap = eventTargetEventListenerStore.get(currentTarget);\n+ if (eventTypeMap !== undefined) {\n+ const type = ((event.type: any): DOMTopLevelEventType);\n+ const listeners = eventTypeMap.get(type);\n+ if (listeners !== undefined) {\n+ const isCapturePhase = (event: any).eventPhase === 1;\n+\n+ if (isCapturePhase) {\n+ const captureListeners = Array.from(listeners.captured);\n+\n+ for (let i = captureListeners.length - 1; i >= 0; i--) {\n+ const listener = captureListeners[i];\n+ const {callback} = listener;\n+ dispatchListeners.push(callback);\n+ \/\/ EventTarget listeners do not have instances, as there\n+ \/\/ is no backing Fiber instance for them (window, document etc).\n+ dispatchInstances.push(null);\n+ dispatchCurrentTargets.push(currentTarget);\n+ }\n+ } else {\n+ const bubbleListeners = Array.from(listeners.bubbled);\n+\n+ for (let i = 0; i < bubbleListeners.length; i++) {\n+ const listener = bubbleListeners[i];\n+ const {callback} = listener;\n+ dispatchListeners.push(callback);\n+ \/\/ EventTarget listeners do not have instances, as there\n+ \/\/ is no backing Fiber instance for them (window, document etc).\n+ dispatchInstances.push(null);\n+ dispatchCurrentTargets.push(currentTarget);\n+ }\n+ }\n+ }\n+ }\n+ \/\/ To prevent allocation to the event unless we actually\n+ \/\/ have listeners we check the length of one of the arrays.\n+ if (dispatchListeners.length > 0) {\n+ event._dispatchListeners = dispatchListeners;\n+ event._dispatchInstances = dispatchInstances;\n+ event._dispatchCurrentTargets = dispatchCurrentTargets;\n+ }\n+}\n+\n+function getParent(inst: Fiber | null): Fiber | null {\n+ if (inst === null) {\n+ return null;\n+ }\n+ do {\n+ inst = inst.return;\n+ \/\/ TODO: If this is a HostRoot we might want to bail out.\n+ \/\/ That is depending on if we want nested subtrees (layers) to bubble\n+ \/\/ events to their parent. We could also go through parentNode on the\n+ \/\/ host node but that wouldn't work for React Native and doesn't let us\n+ \/\/ do the portal feature.\n+ } while (inst && inst.tag !== HostComponent);\n+ if (inst) {\n+ return inst;\n+ }\n+ return null;\n+}\n+\n+\/**\n+ * Return the lowest common ancestor of A and B, or null if they are in\n+ * different trees.\n+ *\/\n+function getLowestCommonAncestor(instA: Fiber, instB: Fiber): Fiber | null {\n+ let nodeA = instA;\n+ let nodeB = instB;\n+ let depthA = 0;\n+ for (let tempA = nodeA; tempA; tempA = getParent(tempA)) {\n+ depthA++;\n+ }\n+ let depthB = 0;\n+ for (let tempB = nodeB; tempB; tempB = getParent(tempB)) {\n+ depthB++;\n+ }\n+\n+ \/\/ If A is deeper, crawl up.\n+ while (depthA - depthB > 0) {\n+ nodeA = getParent(nodeA);\n+ depthA--;\n+ }\n+\n+ \/\/ If B is deeper, crawl up.\n+ while (depthB - depthA > 0) {\n+ nodeB = getParent(nodeB);\n+ depthB--;\n+ }\n+\n+ \/\/ Walk in lockstep until we find a match.\n+ let depth = depthA;\n+ while (depth--) {\n+ if (nodeA === nodeB || (nodeB !== null && nodeA === nodeB.alternate)) {\n+ return nodeA;\n+ }\n+ nodeA = getParent(nodeA);\n+ nodeB = getParent(nodeB);\n+ }\n+ return null;\n+}\n+\n+function accumulateEnterLeaveListenersForEvent(\n+ event: ReactSyntheticEvent,\n+ target: Fiber,\n+ common: Fiber | null,\n+ capture: boolean,\n+): void {\n+ const registrationName = event.dispatchConfig.registrationName;\n+ if (registrationName === undefined) {\n+ return;\n+ }\n+ const dispatchListeners = [];\n+ const dispatchInstances: Array = [];\n+ const dispatchCurrentTargets = [];\n+\n+ let instance = target;\n+ while (instance !== null) {\n+ if (instance === common) {\n+ break;\n+ }\n+ const {alternate, stateNode, tag} = instance;\n+ if (alternate !== null && alternate === common) {\n+ break;\n+ }\n+ if (tag === HostComponent && stateNode !== null) {\n+ const currentTarget = stateNode;\n+ if (capture) {\n+ const captureListener = getListener(instance, registrationName);\n+ if (captureListener != null) {\n+ \/\/ Capture listeners\/instances should go at the start, so we\n+ \/\/ unshift them to the start of the array.\n+ dispatchListeners.unshift(captureListener);\n+ dispatchInstances.unshift(instance);\n+ dispatchCurrentTargets.unshift(currentTarget);\n+ }\n+ } else {\n+ const bubbleListener = getListener(instance, registrationName);\n+ if (bubbleListener != null) {\n+ \/\/ Bubble listeners\/instances should go at the end, so we\n+ \/\/ push them to the end of the array.\n+ dispatchListeners.push(bubbleListener);\n+ dispatchInstances.push(instance);\n+ dispatchCurrentTargets.push(currentTarget);\n+ }\n+ }\n+ }\n+ instance = instance.return;\n+ }\n+ \/\/ To prevent allocation to the event unless we actually\n+ \/\/ have listeners we check the length of one of the arrays.\n+ if (dispatchListeners.length > 0) {\n+ event._dispatchListeners = dispatchListeners;\n+ event._dispatchInstances = dispatchInstances;\n+ event._dispatchCurrentTargets = dispatchCurrentTargets;\n+ }\n+}\n+\n+export function accumulateEnterLeaveListeners(\n+ leaveEvent: ReactSyntheticEvent,\n+ enterEvent: ReactSyntheticEvent,\n+ from: Fiber | null,\n+ to: Fiber | null,\n+): void {\n+ const common = from && to ? getLowestCommonAncestor(from, to) : null;\n+\n+ if (from !== null) {\n+ accumulateEnterLeaveListenersForEvent(leaveEvent, from, common, false);\n+ }\n+ if (to !== null) {\n+ accumulateEnterLeaveListenersForEvent(enterEvent, to, common, true);\n+ }\n+}\ndiff --git a\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js b\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js\ndeleted file mode 100644\nindex cb5d448199..0000000000\n--- a\/packages\/react-dom\/src\/events\/accumulateEnterLeaveListeners.js\n+++ \/dev\/null\n@@ -1,144 +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 {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n-import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n-\n-import {HostComponent} from 'react-reconciler\/src\/ReactWorkTags';\n-import getListener from '.\/getListener';\n-\n-function getParent(inst: Fiber | null): Fiber | null {\n- if (inst === null) {\n- return null;\n- }\n- do {\n- inst = inst.return;\n- \/\/ TODO: If this is a HostRoot we might want to bail out.\n- \/\/ That is depending on if we want nested subtrees (layers) to bubble\n- \/\/ events to their parent. We could also go through parentNode on the\n- \/\/ host node but that wouldn't work for React Native and doesn't let us\n- \/\/ do the portal feature.\n- } while (inst && inst.tag !== HostComponent);\n- if (inst) {\n- return inst;\n- }\n- return null;\n-}\n-\n-\/**\n- * Return the lowest common ancestor of A and B, or null if they are in\n- * different trees.\n- *\/\n-function getLowestCommonAncestor(instA: Fiber, instB: Fiber): Fiber | null {\n- let nodeA = instA;\n- let nodeB = instB;\n- let depthA = 0;\n- for (let tempA = nodeA; tempA; tempA = getParent(tempA)) {\n- depthA++;\n- }\n- let depthB = 0;\n- for (let tempB = nodeB; tempB; tempB = getParent(tempB)) {\n- depthB++;\n- }\n-\n- \/\/ If A is deeper, crawl up.\n- while (depthA - depthB > 0) {\n- nodeA = getParent(nodeA);\n- depthA--;\n- }\n-\n- \/\/ If B is deeper, crawl up.\n- while (depthB - depthA > 0) {\n- nodeB = getParent(nodeB);\n- depthB--;\n- }\n-\n- \/\/ Walk in lockstep until we find a match.\n- let depth = depthA;\n- while (depth--) {\n- if (nodeA === nodeB || (nodeB !== null && nodeA === nodeB.alternate)) {\n- return nodeA;\n- }\n- nodeA = getParent(nodeA);\n- nodeB = getParent(nodeB);\n- }\n- return null;\n-}\n-\n-function accumulateEnterLeaveListenersForEvent(\n- event: ReactSyntheticEvent,\n- target: Fiber,\n- common: Fiber | null,\n- capture: boolean,\n-): void {\n- const registrationName = event.dispatchConfig.registrationName;\n- if (registrationName === undefined) {\n- return;\n- }\n- const dispatchListeners = [];\n- const dispatchInstances: Array = [];\n- const dispatchCurrentTargets = [];\n-\n- let instance = target;\n- while (instance !== null) {\n- if (instance === common) {\n- break;\n- }\n- const {alternate, stateNode, tag} = instance;\n- if (alternate !== null && alternate === common) {\n- break;\n- }\n- if (tag === HostComponent && stateNode !== null) {\n- const currentTarget = stateNode;\n- if (capture) {\n- const captureListener = getListener(instance, registrationName);\n- if (captureListener != null) {\n- \/\/ Capture listeners\/instances should go at the start, so we\n- \/\/ unshift them to the start of the array.\n- dispatchListeners.unshift(captureListener);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(currentTarget);\n- }\n- } else {\n- const bubbleListener = getListener(instance, registrationName);\n- if (bubbleListener != null) {\n- \/\/ Bubble listeners\/instances should go at the end, so we\n- \/\/ push them to the end of the array.\n- dispatchListeners.push(bubbleListener);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- instance = instance.return;\n- }\n- \/\/ To prevent allocation to the event unless we actually\n- \/\/ have listeners we check the length of one of the arrays.\n- if (dispatchListeners.length > 0) {\n- event._dispatchListeners = dispatchListeners;\n- event._dispatchInstances = dispatchInstances;\n- event._dispatchCurrentTargets = dispatchCurrentTargets;\n- }\n-}\n-\n-export default function accumulateEnterLeaveListeners(\n- leaveEvent: ReactSyntheticEvent,\n- enterEvent: ReactSyntheticEvent,\n- from: Fiber | null,\n- to: Fiber | null,\n-): void {\n- const common = from && to ? getLowestCommonAncestor(from, to) : null;\n-\n- if (from !== null) {\n- accumulateEnterLeaveListenersForEvent(leaveEvent, from, common, false);\n- }\n- if (to !== null) {\n- accumulateEnterLeaveListenersForEvent(enterEvent, to, common, true);\n- }\n-}\ndiff --git a\/packages\/react-dom\/src\/events\/accumulateEventTargetListeners.js b\/packages\/react-dom\/src\/events\/accumulateEventTargetListeners.js\ndeleted file mode 100644\nindex 41aee46931..0000000000\n--- a\/packages\/react-dom\/src\/events\/accumulateEventTargetListeners.js\n+++ \/dev\/null\n@@ -1,65 +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 {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n-import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n-import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n-\n-import {eventTargetEventListenerStore} from '.\/DOMModernPluginEventSystem';\n-\n-export default function accumulateEventTargetListeners(\n- event: ReactSyntheticEvent,\n- currentTarget: EventTarget,\n-): void {\n- const dispatchListeners = [];\n- const dispatchInstances: Array = [];\n- const dispatchCurrentTargets = [];\n-\n- const eventTypeMap = eventTargetEventListenerStore.get(currentTarget);\n- if (eventTypeMap !== undefined) {\n- const type = ((event.type: any): DOMTopLevelEventType);\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- const isCapturePhase = (event: any).eventPhase === 1;\n-\n- if (isCapturePhase) {\n- const captureListeners = Array.from(listeners.captured);\n-\n- for (let i = captureListeners.length - 1; i >= 0; i--) {\n- const listener = captureListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- \/\/ EventTarget listeners do not have instances, as there\n- \/\/ is no backing Fiber instance for them (window, document etc).\n- dispatchInstances.push(null);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- } else {\n- const bubbleListeners = Array.from(listeners.bubbled);\n-\n- for (let i = 0; i < bubbleListeners.length; i++) {\n- const listener = bubbleListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- \/\/ EventTarget listeners do not have instances, as there\n- \/\/ is no backing Fiber instance for them (window, document etc).\n- dispatchInstances.push(null);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- }\n- \/\/ To prevent allocation to the event unless we actually\n- \/\/ have listeners we check the length of one of the arrays.\n- if (dispatchListeners.length > 0) {\n- event._dispatchListeners = dispatchListeners;\n- event._dispatchInstances = dispatchInstances;\n- event._dispatchCurrentTargets = dispatchCurrentTargets;\n- }\n-}\ndiff --git a\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js b\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js\ndeleted file mode 100644\nindex aa39f1ab98..0000000000\n--- a\/packages\/react-dom\/src\/events\/accumulateTwoPhaseListeners.js\n+++ \/dev\/null\n@@ -1,150 +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 {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n-import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n-import type {ReactSyntheticEvent} from 'legacy-events\/ReactSyntheticEventType';\n-\n-import {\n- HostComponent,\n- ScopeComponent,\n-} from 'react-reconciler\/src\/ReactWorkTags';\n-import {\n- enableUseEventAPI,\n- enableScopeAPI,\n- enableModernEventSystem,\n-} from 'shared\/ReactFeatureFlags';\n-\n-import getListener from '.\/getListener';\n-import {getListenersFromTarget} from '..\/client\/ReactDOMComponentTree';\n-import {reactScopeListenerStore} from '.\/DOMModernPluginEventSystem';\n-\n-export default function accumulateTwoPhaseListeners(\n- event: ReactSyntheticEvent,\n- accumulateUseEventListeners?: boolean,\n-): void {\n- const phasedRegistrationNames = event.dispatchConfig.phasedRegistrationNames;\n- const dispatchListeners = [];\n- const dispatchInstances: Array = [];\n- const dispatchCurrentTargets = [];\n-\n- const {bubbled, captured} = phasedRegistrationNames;\n- \/\/ If we are not handling EventTarget only phase, then we're doing the\n- \/\/ usual two phase accumulation using the React fiber tree to pick up\n- \/\/ all relevant useEvent and on* prop events.\n- let instance = event._targetInst;\n- let lastHostComponent = null;\n-\n- \/\/ Accumulate all instances and listeners via the target -> root path.\n- while (instance !== null) {\n- const {stateNode, tag} = instance;\n- \/\/ Handle listeners that are on HostComponents (i.e.

)\n- if (tag === HostComponent && stateNode !== null) {\n- const currentTarget = stateNode;\n- lastHostComponent = currentTarget;\n- \/\/ For useEvent listenrs\n- if (\n- enableModernEventSystem &&\n- enableUseEventAPI &&\n- accumulateUseEventListeners\n- ) {\n- \/\/ useEvent event listeners\n- const targetType = event.type;\n- const listeners = getListenersFromTarget(currentTarget);\n-\n- if (listeners !== null) {\n- const listenersArr = Array.from(listeners);\n- for (let i = 0; i < listenersArr.length; i++) {\n- const listener = listenersArr[i];\n- const {\n- callback,\n- event: {capture, type},\n- } = listener;\n- if (type === targetType) {\n- if (capture === true) {\n- dispatchListeners.unshift(callback);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(currentTarget);\n- } else {\n- dispatchListeners.push(callback);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- }\n- }\n- \/\/ Standard React on* listeners, i.e. onClick prop\n- if (captured !== null) {\n- const captureListener = getListener(instance, captured);\n- if (captureListener != null) {\n- \/\/ Capture listeners\/instances should go at the start, so we\n- \/\/ unshift them to the start of the array.\n- dispatchListeners.unshift(captureListener);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(currentTarget);\n- }\n- }\n- if (bubbled !== null) {\n- const bubbleListener = getListener(instance, bubbled);\n- if (bubbleListener != null) {\n- \/\/ Bubble listeners\/instances should go at the end, so we\n- \/\/ push them to the end of the array.\n- dispatchListeners.push(bubbleListener);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(currentTarget);\n- }\n- }\n- }\n- if (\n- enableModernEventSystem &&\n- enableUseEventAPI &&\n- enableScopeAPI &&\n- accumulateUseEventListeners &&\n- tag === ScopeComponent &&\n- lastHostComponent !== null\n- ) {\n- const reactScope = stateNode.methods;\n- const eventTypeMap = reactScopeListenerStore.get(reactScope);\n- if (eventTypeMap !== undefined) {\n- const type = ((event.type: any): DOMTopLevelEventType);\n- const listeners = eventTypeMap.get(type);\n- if (listeners !== undefined) {\n- const captureListeners = Array.from(listeners.captured);\n- const bubbleListeners = Array.from(listeners.bubbled);\n- const lastCurrentTarget = ((lastHostComponent: any): Element);\n-\n- for (let i = 0; i < captureListeners.length; i++) {\n- const listener = captureListeners[i];\n- const {callback} = listener;\n- dispatchListeners.unshift(callback);\n- dispatchInstances.unshift(instance);\n- dispatchCurrentTargets.unshift(lastCurrentTarget);\n- }\n- for (let i = 0; i < bubbleListeners.length; i++) {\n- const listener = bubbleListeners[i];\n- const {callback} = listener;\n- dispatchListeners.push(callback);\n- dispatchInstances.push(instance);\n- dispatchCurrentTargets.push(lastCurrentTarget);\n- }\n- }\n- }\n- }\n- instance = instance.return;\n- }\n-\n- \/\/ To prevent allocation to the event unless we actually\n- \/\/ have listeners we check the length of one of the arrays.\n- if (dispatchListeners.length > 0) {\n- event._dispatchListeners = dispatchListeners;\n- event._dispatchInstances = dispatchInstances;\n- event._dispatchCurrentTargets = dispatchCurrentTargets;\n- }\n-}\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\nindex 96685f7c81..167a117e8a 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernBeforeInputEventPlugin.js\n@@ -28,7 +28,7 @@ import {\n } from '..\/FallbackCompositionState';\n import SyntheticCompositionEvent from '..\/SyntheticCompositionEvent';\n import SyntheticInputEvent from '..\/SyntheticInputEvent';\n-import accumulateTwoPhaseListeners from '..\/accumulateTwoPhaseListeners';\n+import {accumulateTwoPhaseListeners} from '..\/DOMModernPluginEventSystem';\n \n const END_KEYCODES = [9, 13, 27, 32]; \/\/ Tab, Return, Esc, Space\n const START_KEYCODE = 229;\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernChangeEventPlugin.js\nindex dbe3685f36..82c0ab6a80 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,6 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import {runEventsInBatch} from 'legacy-events\/EventBatching';\n import SyntheticEvent from 'legacy-events\/SyntheticEvent';\n import isTextInputElement from '..\/isTextInputElement';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n@@ -27,13 +26,12 @@ import {updateValueIfChanged} from '..\/..\/client\/inputValueTracking';\n import {setDefaultValue} from '..\/..\/client\/ReactDOMInput';\n import {enqueueStateRestore} from '..\/ReactDOMControlledComponent';\n \n-import {\n- disableInputAttributeSyncing,\n- enableModernEventSystem,\n-} from 'shared\/ReactFeatureFlags';\n-import accumulateTwoPhaseListeners from '..\/accumulateTwoPhaseListeners';\n+import {disableInputAttributeSyncing} from 'shared\/ReactFeatureFlags';\n import {batchedUpdates} from '..\/ReactDOMUpdateBatching';\n-import {dispatchEventsInBatch} from '..\/DOMModernPluginEventSystem';\n+import {\n+ dispatchEventsInBatch,\n+ accumulateTwoPhaseListeners,\n+} from '..\/DOMModernPluginEventSystem';\n \n const eventTypes = {\n change: {\n@@ -105,11 +103,7 @@ function manualDispatchChangeEvent(nativeEvent) {\n }\n \n function runEventInBatch(event) {\n- if (enableModernEventSystem) {\n- dispatchEventsInBatch([event]);\n- } else {\n- runEventsInBatch(event);\n- }\n+ dispatchEventsInBatch([event]);\n }\n \n function getInstIfValueChanged(targetInst) {\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\nindex cb51ed4546..14a18d8610 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernEnterLeaveEventPlugin.js\n@@ -11,20 +11,17 @@ import {\n TOP_POINTER_OUT,\n TOP_POINTER_OVER,\n } from '..\/DOMTopLevelEventTypes';\n-import {\n- IS_REPLAYED,\n- IS_FIRST_ANCESTOR,\n-} from 'react-dom\/src\/events\/EventSystemFlags';\n+import {IS_REPLAYED} from 'react-dom\/src\/events\/EventSystemFlags';\n import SyntheticMouseEvent from '..\/SyntheticMouseEvent';\n import SyntheticPointerEvent from '..\/SyntheticPointerEvent';\n import {\n getClosestInstanceFromNode,\n getNodeFromInstance,\n } from '..\/..\/client\/ReactDOMComponentTree';\n+import {accumulateEnterLeaveListeners} from '..\/DOMModernPluginEventSystem';\n+\n import {HostComponent, HostText} from 'react-reconciler\/src\/ReactWorkTags';\n import {getNearestMountedFiber} from 'react-reconciler\/src\/ReactFiberTreeReflection';\n-import {enableModernEventSystem} from 'shared\/ReactFeatureFlags';\n-import accumulateEnterLeaveListeners from '..\/accumulateEnterLeaveListeners';\n \n const eventTypes = {\n mouseEnter: {\n@@ -70,20 +67,12 @@ const EnterLeaveEventPlugin = {\n if (isOverEvent && (eventSystemFlags & IS_REPLAYED) === 0) {\n const related = nativeEvent.relatedTarget || nativeEvent.fromElement;\n if (related) {\n- if (enableModernEventSystem) {\n- \/\/ Due to the fact we don't add listeners to the document with the\n- \/\/ modern event system and instead attach listeners to roots, we\n- \/\/ need to handle the over event case. To ensure this, we just need to\n- \/\/ make sure the node that we're coming from is managed by React.\n- const inst = getClosestInstanceFromNode(related);\n- if (inst !== null) {\n- return null;\n- }\n- } else {\n- \/\/ If this is an over event with a target, then we've already dispatched\n- \/\/ the event in the out event of the other target. If this is replayed,\n- \/\/ then it's because we couldn't dispatch against this target previously\n- \/\/ so we have to do it now instead.\n+ \/\/ Due to the fact we don't add listeners to the document with the\n+ \/\/ modern event system and instead attach listeners to roots, we\n+ \/\/ need to handle the over event case. To ensure this, we just need to\n+ \/\/ make sure the node that we're coming from is managed by React.\n+ const inst = getClosestInstanceFromNode(related);\n+ if (inst !== null) {\n return null;\n }\n }\n@@ -176,15 +165,6 @@ const EnterLeaveEventPlugin = {\n \n accumulateEnterLeaveListeners(leave, enter, from, to);\n \n- if (!enableModernEventSystem) {\n- \/\/ If we are not processing the first ancestor, then we\n- \/\/ should not process the same nativeEvent again, as we\n- \/\/ will have already processed it in the first ancestor.\n- if ((eventSystemFlags & IS_FIRST_ANCESTOR) === 0) {\n- return [leave];\n- }\n- }\n-\n return [leave, enter];\n },\n };\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\nindex 0d1266b0bc..e280916fed 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n@@ -26,7 +26,7 @@ import {getNodeFromInstance} from '..\/..\/client\/ReactDOMComponentTree';\n import {hasSelectionCapabilities} from '..\/..\/client\/ReactInputSelection';\n import {DOCUMENT_NODE} from '..\/..\/shared\/HTMLNodeType';\n import {isListeningToAllDependencies} from '..\/DOMEventListenerMap';\n-import accumulateTwoPhaseListeners from '..\/accumulateTwoPhaseListeners';\n+import {accumulateTwoPhaseListeners} from '..\/DOMModernPluginEventSystem';\n \n const skipSelectionChangeEvent =\n canUseDOM && 'documentMode' in document && document.documentMode <= 11;\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\nindex cd61625518..d4e5765d96 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n@@ -24,6 +24,10 @@ import {\n topLevelEventsToDispatchConfig,\n simpleEventPluginEventTypes,\n } from '..\/DOMEventProperties';\n+import {\n+ accumulateEventTargetListeners,\n+ accumulateTwoPhaseListeners,\n+} from '..\/DOMModernPluginEventSystem';\n \n import SyntheticAnimationEvent from '..\/SyntheticAnimationEvent';\n import SyntheticClipboardEvent from '..\/SyntheticClipboardEvent';\n@@ -37,8 +41,6 @@ import SyntheticTransitionEvent from '..\/SyntheticTransitionEvent';\n import SyntheticUIEvent from '..\/SyntheticUIEvent';\n import SyntheticWheelEvent from '..\/SyntheticWheelEvent';\n import getEventCharCode from '..\/getEventCharCode';\n-import accumulateTwoPhaseListeners from '..\/accumulateTwoPhaseListeners';\n-import accumulateEventTargetListeners from '..\/accumulateEventTargetListeners';\n \n import {enableUseEventAPI} from 'shared\/ReactFeatureFlags';\n \ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernBeforeInputEventPlugin-test.internal.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernBeforeInputEventPlugin-test.internal.js\nindex ad4ecd7b81..87cde4eebe 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernBeforeInputEventPlugin-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernBeforeInputEventPlugin-test.internal.js\n@@ -11,6 +11,7 @@\n \n let React;\n let ReactDOM;\n+let ReactFeatureFlags;\n \n describe('BeforeInputEventPlugin', () => {\n let container;\n@@ -77,6 +78,8 @@ describe('BeforeInputEventPlugin', () => {\n }\n \n beforeEach(() => {\n+ ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.enableModernEventSystem = true;\n React = require('react');\n container = document.createElement('div');\n document.body.appendChild(container);\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernChangeEventPlugin-test.internal.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernChangeEventPlugin-test.internal.js\nindex c83cfc4548..7ada7be88e 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernChangeEventPlugin-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernChangeEventPlugin-test.internal.js\n@@ -470,6 +470,7 @@ describe('ChangeEventPlugin', () => {\n beforeEach(() => {\n jest.resetModules();\n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.enableModernEventSystem = true;\n \n React = require('react');\n ReactDOM = require('react-dom');\n@@ -720,6 +721,7 @@ describe('ChangeEventPlugin', () => {\n it('mouse enter\/leave should be user-blocking but not discrete', async () => {\n \/\/ This is currently behind a feature flag\n jest.resetModules();\n+ ReactFeatureFlags.enableModernEventSystem = true;\n React = require('react');\n ReactDOM = require('react-dom');\n TestUtils = require('react-dom\/test-utils');\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernEnterLeaveEventPlugin-test.internal.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernEnterLeaveEventPlugin-test.internal.js\nindex b7dcab6142..beda6392b1 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernEnterLeaveEventPlugin-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernEnterLeaveEventPlugin-test.internal.js\n@@ -11,6 +11,7 @@\n \n let React;\n let ReactDOM;\n+let ReactFeatureFlags;\n \n describe('EnterLeaveEventPlugin', () => {\n let container;\n@@ -18,6 +19,8 @@ describe('EnterLeaveEventPlugin', () => {\n beforeEach(() => {\n jest.resetModules();\n \n+ ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.enableModernEventSystem = true;\n React = require('react');\n ReactDOM = require('react-dom');\n \ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSelectEventPlugin-test.internal.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSelectEventPlugin-test.internal.js\nindex 8ab7eccf75..84afb834c1 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSelectEventPlugin-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSelectEventPlugin-test.internal.js\n@@ -11,11 +11,14 @@\n \n let React;\n let ReactDOM;\n+let ReactFeatureFlags;\n \n describe('SelectEventPlugin', () => {\n let container;\n \n beforeEach(() => {\n+ ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.enableModernEventSystem = true;\n React = require('react');\n ReactDOM = require('react-dom');\n \ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSimpleEventPlugin-test.internal.js b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSimpleEventPlugin-test.internal.js\nindex f015689703..598101683d 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSimpleEventPlugin-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/__tests__\/ModernSimpleEventPlugin-test.internal.js\n@@ -13,6 +13,7 @@ describe('SimpleEventPlugin', function() {\n let React;\n let ReactDOM;\n let Scheduler;\n+ let ReactFeatureFlags;\n \n let onClick;\n let container;\n@@ -36,6 +37,8 @@ describe('SimpleEventPlugin', function() {\n \n beforeEach(function() {\n jest.resetModules();\n+ ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.enableModernEventSystem = true;\n React = require('react');\n ReactDOM = require('react-dom');\n Scheduler = require('scheduler');\n","body":""}

dillon1000/react

Files changed