[Flare] Remove references to EventComponent (#16206)
Dominic Gannaway committed
Jul 25, 2019 at 16:41 UTC
ed72f402579ccd65c70ac3eb950f74636492c934
4 files changed
+20
-26
packages/react-dom/src/events/DOMEventResponderSystem.js
+3
-3
@@ -192,7 +192,7 @@ const eventResponderContext: ReactDOMResponderContext = {
192
validateResponderContext();
193
for (let i = 0; i < rootEventTypes.length; i++) {
194
const rootEventType = rootEventTypes[i];
195
- let rootEventComponents = rootEventTypesToEventResponderInstances.get(
195
+ let rootEventResponders = rootEventTypesToEventResponderInstances.get(
196
rootEventType,
197
);
198
let rootEventTypesSet = ((currentInstance: any): ReactDOMEventResponderInstance)
@@ -200,8 +200,8 @@ const eventResponderContext: ReactDOMResponderContext = {
200
if (rootEventTypesSet !== null) {
201
rootEventTypesSet.delete(rootEventType);
202
}
203
- if (rootEventComponents !== undefined) {
204
- rootEventComponents.delete(
203
+ if (rootEventResponders !== undefined) {
204
+ rootEventResponders.delete(
205
((currentInstance: any): ReactDOMEventResponderInstance),
206
);
207
}
packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js
+1
-1
@@ -28,7 +28,7 @@ function createEventResponder({
28
onOwnershipChange,
29
getInitialState,
30
}) {
31
- return React.unstable_createResponder('TestEventComponent', {
31
+ return React.unstable_createResponder('TestEventResponder', {
32
targetEventTypes,
33
rootEventTypes,
34
onEvent,
packages/react-native-renderer/src/ReactFabricEventResponderSystem.js
+15
-15
@@ -156,8 +156,8 @@ const eventResponderContext: ReactNativeResponderContext = {
156
validateResponderContext();
157
for (let i = 0; i < rootEventTypes.length; i++) {
158
const rootEventType = rootEventTypes[i];
159
- const eventComponentInstance = ((currentInstance: any): ReactNativeEventResponderInstance);
160
- registerRootEventType(rootEventType, eventComponentInstance);
159
+ const eventResponderInstance = ((currentInstance: any): ReactNativeEventResponderInstance);
160
+ registerRootEventType(rootEventType, eventResponderInstance);
161
}
162
},
163
removeRootEventTypes(rootEventTypes: Array<string>): void {
@@ -165,7 +165,7 @@ const eventResponderContext: ReactNativeResponderContext = {
165
for (let i = 0; i < rootEventTypes.length; i++) {
166
const rootEventType = rootEventTypes[i];
167
168
- let rootEventComponents = rootEventTypesToEventResponderInstances.get(
168
+ let rootEventResponders = rootEventTypesToEventResponderInstances.get(
169
rootEventType,
170
);
171
let rootEventTypesSet = ((currentInstance: any): ReactNativeEventResponderInstance)
@@ -173,8 +173,8 @@ const eventResponderContext: ReactNativeResponderContext = {
173
if (rootEventTypesSet !== null) {
174
rootEventTypesSet.delete(rootEventType);
175
}
176
- if (rootEventComponents !== undefined) {
177
- rootEventComponents.delete(
176
+ if (rootEventResponders !== undefined) {
177
+ rootEventResponders.delete(
178
((currentInstance: any): ReactNativeEventResponderInstance),
179
);
180
}
@@ -696,21 +696,21 @@ export function unmountEventResponder(
696
697
function registerRootEventType(
698
rootEventType: string,
699
- eventComponentInstance: ReactNativeEventResponderInstance,
699
+ responderInstance: ReactNativeEventResponderInstance,
700
) {
701
- let rootEventComponentInstances = rootEventTypesToEventResponderInstances.get(
701
+ let rootEventResponderInstances = rootEventTypesToEventResponderInstances.get(
702
rootEventType,
703
);
704
- if (rootEventComponentInstances === undefined) {
705
- rootEventComponentInstances = new Set();
704
+ if (rootEventResponderInstances === undefined) {
705
+ rootEventResponderInstances = new Set();
706
rootEventTypesToEventResponderInstances.set(
707
rootEventType,
708
- rootEventComponentInstances,
708
+ rootEventResponderInstances,
709
);
710
}
711
- let rootEventTypesSet = eventComponentInstance.rootEventTypes;
711
+ let rootEventTypesSet = responderInstance.rootEventTypes;
712
if (rootEventTypesSet === null) {
713
- rootEventTypesSet = eventComponentInstance.rootEventTypes = new Set();
713
+ rootEventTypesSet = responderInstance.rootEventTypes = new Set();
714
}
715
invariant(
716
!rootEventTypesSet.has(rootEventType),
@@ -720,15 +720,15 @@ function registerRootEventType(
720
rootEventType,
721
);
722
rootEventTypesSet.add(rootEventType);
723
- rootEventComponentInstances.add(eventComponentInstance);
723
+ rootEventResponderInstances.add(responderInstance);
724
}
725
726
export function addRootEventTypesForResponderInstance(
727
- eventComponentInstance: ReactNativeEventResponderInstance,
727
+ responderInstance: ReactNativeEventResponderInstance,
728
rootEventTypes: Array<string>,
729
): void {
730
for (let i = 0; i < rootEventTypes.length; i++) {
731
const rootEventType = rootEventTypes[i];
732
- registerRootEventType(rootEventType, eventComponentInstance);
732
+ registerRootEventType(rootEventType, responderInstance);
733
}
734
}
packages/shared/ReactTypes.js
+1
-7
@@ -13,8 +13,7 @@ export type ReactNode =
13
| ReactText
14
| ReactFragment
15
| ReactProvider<any>
16
- | ReactConsumer<any>
17
- | ReactEventComponent<any, any>;
16
+ | ReactConsumer<any>;
17
18
export type ReactEmpty = null | void | boolean;
19
@@ -108,11 +107,6 @@ export type ReactEventResponder<E, C> = {
107
| ((context: C, props: Object, state: Object) => void),
108
};
109
111
-export type ReactEventComponent<E, C> = {|
112
- $$typeof: Symbol | number,
113
- responder: ReactEventResponder<E, C>,
114
-|};
115
-
110
export type EventPriority = 0 | 1 | 2;
111
112
export const DiscreteEvent: EventPriority = 0;