Skip to content

Commit 125d1a1

Browse files
gaearongaearon
authored
Move event things around (facebook#19433)
* Put all synthetic events in one file * Inline other helpers * Remove Modern from filenames
1 parent 1aae05c commit 125d1a1

29 files changed

+441
-594
lines changed

‎packages/react-dom/src/client/ReactDOMComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ import {
8989
listenToReactEvent,
9090
mediaEventTypes,
9191
listenToNonDelegatedEvent,
92-
} from '../events/DOMModernPluginEventSystem';
92+
} from '../events/DOMPluginEventSystem';
9393
import {getEventListenerMap} from './ReactDOMComponentTree';
9494
import {
9595
TOP_LOAD,

‎packages/react-dom/src/client/ReactDOMEventHandle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {ELEMENT_NODE, COMMENT_NODE} from '../shared/HTMLNodeType';
2525
import {
2626
listenToNativeEvent,
2727
addEventTypeToDispatchConfig,
28-
} from '../events/DOMModernPluginEventSystem';
28+
} from '../events/DOMPluginEventSystem';
2929

3030
import {HostRoot, HostPortal} from 'react-reconciler/src/ReactWorkTags';
3131
import {

‎packages/react-dom/src/client/ReactDOMHostConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import {
8080
} from 'shared/ReactFeatureFlags';
8181
import {HostComponent, HostText} from 'react-reconciler/src/ReactWorkTags';
8282
import {TOP_BEFORE_BLUR, TOP_AFTER_BLUR} from '../events/DOMTopLevelEventTypes';
83-
import {listenToReactEvent} from '../events/DOMModernPluginEventSystem';
83+
import {listenToReactEvent} from '../events/DOMPluginEventSystem';
8484

8585
export type Type = string;
8686
export type Props = {

‎packages/react-dom/src/events/DOMModernPluginEventSystem.js renamed to ‎packages/react-dom/src/events/DOMPluginEventSystem.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ import {
9999
} from './EventListener';
100100
import {removeTrappedEventListener} from './DeprecatedDOMEventResponderSystem';
101101
import {topLevelEventsToReactNames} from './DOMEventProperties';
102-
import * as ModernBeforeInputEventPlugin from './plugins/ModernBeforeInputEventPlugin';
103-
import * as ModernChangeEventPlugin from './plugins/ModernChangeEventPlugin';
104-
import * as ModernEnterLeaveEventPlugin from './plugins/ModernEnterLeaveEventPlugin';
105-
import * as ModernSelectEventPlugin from './plugins/ModernSelectEventPlugin';
106-
import * as ModernSimpleEventPlugin from './plugins/ModernSimpleEventPlugin';
102+
import * as BeforeInputEventPlugin from './plugins/BeforeInputEventPlugin';
103+
import * as ChangeEventPlugin from './plugins/ChangeEventPlugin';
104+
import * as EnterLeaveEventPlugin from './plugins/EnterLeaveEventPlugin';
105+
import * as SelectEventPlugin from './plugins/SelectEventPlugin';
106+
import * as SimpleEventPlugin from './plugins/SimpleEventPlugin';
107107

108108
type DispatchListener = {|
109109
instance: null | Fiber,
@@ -119,11 +119,11 @@ type DispatchEntry = {|
119119
export type DispatchQueue = Array<DispatchEntry>;
120120

121121
// TODO: remove top-level side effect.
122-
ModernSimpleEventPlugin.registerEvents();
123-
ModernEnterLeaveEventPlugin.registerEvents();
124-
ModernChangeEventPlugin.registerEvents();
125-
ModernSelectEventPlugin.registerEvents();
126-
ModernBeforeInputEventPlugin.registerEvents();
122+
SimpleEventPlugin.registerEvents();
123+
EnterLeaveEventPlugin.registerEvents();
124+
ChangeEventPlugin.registerEvents();
125+
SelectEventPlugin.registerEvents();
126+
BeforeInputEventPlugin.registerEvents();
127127

128128
function extractEvents(
129129
dispatchQueue: DispatchQueue,
@@ -140,7 +140,7 @@ function extractEvents(
140140
// should probably be inlined somewhere and have its logic
141141
// be core the to event system. This would potentially allow
142142
// us to ship builds of React without the polyfilled plugins below.
143-
ModernSimpleEventPlugin.extractEvents(
143+
SimpleEventPlugin.extractEvents(
144144
dispatchQueue,
145145
topLevelType,
146146
targetInst,
@@ -169,7 +169,7 @@ function extractEvents(
169169
// that might cause other unknown side-effects that we
170170
// can't forsee right now.
171171
if (shouldProcessPolyfillPlugins) {
172-
ModernEnterLeaveEventPlugin.extractEvents(
172+
EnterLeaveEventPlugin.extractEvents(
173173
dispatchQueue,
174174
topLevelType,
175175
targetInst,
@@ -178,7 +178,7 @@ function extractEvents(
178178
eventSystemFlags,
179179
targetContainer,
180180
);
181-
ModernChangeEventPlugin.extractEvents(
181+
ChangeEventPlugin.extractEvents(
182182
dispatchQueue,
183183
topLevelType,
184184
targetInst,
@@ -187,7 +187,7 @@ function extractEvents(
187187
eventSystemFlags,
188188
targetContainer,
189189
);
190-
ModernSelectEventPlugin.extractEvents(
190+
SelectEventPlugin.extractEvents(
191191
dispatchQueue,
192192
topLevelType,
193193
targetInst,
@@ -196,7 +196,7 @@ function extractEvents(
196196
eventSystemFlags,
197197
targetContainer,
198198
);
199-
ModernBeforeInputEventPlugin.extractEvents(
199+
BeforeInputEventPlugin.extractEvents(
200200
dispatchQueue,
201201
topLevelType,
202202
targetInst,
@@ -297,7 +297,7 @@ export function processDispatchQueue(
297297
for (let i = 0; i < dispatchQueue.length; i++) {
298298
const {event, listeners} = dispatchQueue[i];
299299
processDispatchQueueItemsInOrder(event, listeners, inCapturePhase);
300-
// Modern event system doesn't use pooling.
300+
// event system doesn't use pooling.
301301
}
302302
// This would be a good time to rethrow if any of the event handlers threw.
303303
rethrowCaughtError();
@@ -816,9 +816,9 @@ export function accumulateSinglePhaseListeners(
816816
}
817817

818818
// We should only use this function for:
819-
// - ModernBeforeInputEventPlugin
820-
// - ModernChangeEventPlugin
821-
// - ModernSelectEventPlugin
819+
// - BeforeInputEventPlugin
820+
// - ChangeEventPlugin
821+
// - SelectEventPlugin
822822
// This is because we only process these plugins
823823
// in the bubble phase, so we need to accumulate two
824824
// phase event listeners (via emulation).
@@ -969,7 +969,7 @@ function accumulateEnterLeaveListenersForEvent(
969969
}
970970

971971
// We should only use this function for:
972-
// - ModernEnterLeaveEventPlugin
972+
// - EnterLeaveEventPlugin
973973
// This is because we only process this plugin
974974
// in the bubble phase, so we need to accumulate two
975975
// phase event listeners.

‎packages/react-dom/src/events/ReactDOMEventListener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
DiscreteEvent,
5252
} from 'shared/ReactTypes';
5353
import {getEventPriorityForPluginSystem} from './DOMEventProperties';
54-
import {dispatchEventForPluginEventSystem} from './DOMModernPluginEventSystem';
54+
import {dispatchEventForPluginEventSystem} from './DOMPluginEventSystem';
5555
import {
5656
flushDiscreteUpdatesIfNeeded,
5757
discreteUpdates,

‎packages/react-dom/src/events/ReactDOMEventReplaying.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ import {
128128
TOP_FOCUS_OUT,
129129
} from './DOMTopLevelEventTypes';
130130
import {IS_REPLAYED} from './EventSystemFlags';
131-
import {listenToNativeEvent} from './DOMModernPluginEventSystem';
131+
import {listenToNativeEvent} from './DOMPluginEventSystem';
132132
import {addResponderEventSystemEvent} from './DeprecatedDOMEventResponderSystem';
133133

134134
type QueuedReplayableEvent = {|

‎packages/react-dom/src/events/SyntheticAnimationEvent.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎packages/react-dom/src/events/SyntheticClipboardEvent.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎packages/react-dom/src/events/SyntheticCompositionEvent.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎packages/react-dom/src/events/SyntheticDragEvent.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)