From 2fe0fbb05ef2c56db760122e995b923528e6ce8f Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Thu, 5 Mar 2020 00:04:27 +0000 Subject: [PATCH] Use accumulateTwoPhaseDispatchesSingle directly (#18203) --- packages/legacy-events/EventPropagators.js | 2 +- packages/react-dom/src/events/BeforeInputEventPlugin.js | 6 +++--- packages/react-dom/src/events/ChangeEventPlugin.js | 4 ++-- packages/react-dom/src/events/SelectEventPlugin.js | 4 ++-- packages/react-dom/src/events/SimpleEventPlugin.js | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/legacy-events/EventPropagators.js b/packages/legacy-events/EventPropagators.js index d916de99a3b4e..046a9764a0be4 100644 --- a/packages/legacy-events/EventPropagators.js +++ b/packages/legacy-events/EventPropagators.js @@ -66,7 +66,7 @@ function accumulateDirectionalDispatches(inst, phase, event) { * single traversal for the entire collection of events because each event may * have a different target. */ -function accumulateTwoPhaseDispatchesSingle(event) { +export function accumulateTwoPhaseDispatchesSingle(event) { if (event && event.dispatchConfig.phasedRegistrationNames) { traverseTwoPhase(event._targetInst, accumulateDirectionalDispatches, event); } diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js index 2508448f66654..d881f052415f9 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -7,7 +7,7 @@ import type {TopLevelType} from 'legacy-events/TopLevelEventTypes'; -import {accumulateTwoPhaseDispatches} from 'legacy-events/EventPropagators'; +import {accumulateTwoPhaseDispatchesSingle} from 'legacy-events/EventPropagators'; import {canUseDOM} from 'shared/ExecutionEnvironment'; import { @@ -276,7 +276,7 @@ function extractCompositionEvent( } } - accumulateTwoPhaseDispatches(event); + accumulateTwoPhaseDispatchesSingle(event); return event; } @@ -437,7 +437,7 @@ function extractBeforeInputEvent( ); event.data = chars; - accumulateTwoPhaseDispatches(event); + accumulateTwoPhaseDispatchesSingle(event); return event; } diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index 960cb7ffccf09..77564189cf2ca 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -6,7 +6,7 @@ */ import {runEventsInBatch} from 'legacy-events/EventBatching'; -import {accumulateTwoPhaseDispatches} from 'legacy-events/EventPropagators'; +import {accumulateTwoPhaseDispatchesSingle} from 'legacy-events/EventPropagators'; import {enqueueStateRestore} from 'legacy-events/ReactControlledComponent'; import {batchedUpdates} from 'legacy-events/ReactGenericBatching'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; @@ -59,7 +59,7 @@ function createAndAccumulateChangeEvent(inst, nativeEvent, target) { event.type = 'change'; // Flag this event loop as needing state restore. enqueueStateRestore(target); - accumulateTwoPhaseDispatches(event); + accumulateTwoPhaseDispatchesSingle(event); return event; } /** diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 2cb52b4dfedbf..5f1d468fd481b 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {accumulateTwoPhaseDispatches} from 'legacy-events/EventPropagators'; +import {accumulateTwoPhaseDispatchesSingle} from 'legacy-events/EventPropagators'; import {canUseDOM} from 'shared/ExecutionEnvironment'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; import isTextInputElement from 'shared/isTextInputElement'; @@ -135,7 +135,7 @@ function constructSelectEvent(nativeEvent, nativeEventTarget) { syntheticEvent.type = 'select'; syntheticEvent.target = activeElement; - accumulateTwoPhaseDispatches(syntheticEvent); + accumulateTwoPhaseDispatchesSingle(syntheticEvent); return syntheticEvent; } diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index 384c2ead552c6..21fbdfd6c0f21 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -16,7 +16,7 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber'; import type {PluginModule} from 'legacy-events/PluginModuleType'; import type {EventSystemFlags} from 'legacy-events/EventSystemFlags'; -import {accumulateTwoPhaseDispatches} from 'legacy-events/EventPropagators'; +import {accumulateTwoPhaseDispatchesSingle} from 'legacy-events/EventPropagators'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; import * as DOMTopLevelEventTypes from './DOMTopLevelEventTypes'; @@ -191,7 +191,7 @@ const SimpleEventPlugin: PluginModule = { nativeEvent, nativeEventTarget, ); - accumulateTwoPhaseDispatches(event); + accumulateTwoPhaseDispatchesSingle(event); return event; }, };