Skip to content

Commit c64b330

Browse files
trueadmtrueadm
authored
Move EventTypes to ReactTypes (#15364)
1 parent 4c78ac0 commit c64b330

File tree

8 files changed

+109
-103
lines changed

8 files changed

+109
-103
lines changed

‎packages/events/EventTypes.js

-53
This file was deleted.

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
* @flow
77
*/
88

9-
import type {
10-
ResponderContext,
11-
ResponderEvent,
12-
ResponderDispatchEventOptions,
13-
} from 'events/EventTypes';
149
import {
1510
type EventSystemFlags,
1611
IS_PASSIVE,
@@ -24,6 +19,9 @@ import {
2419
import type {
2520
ReactEventResponderEventType,
2621
ReactEventComponentInstance,
22+
ReactResponderContext,
23+
ReactResponderEvent,
24+
ReactResponderDispatchEventOptions,
2725
} from 'shared/ReactTypes';
2826
import type {DOMTopLevelEventType} from 'events/TopLevelEventTypes';
2927
import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
@@ -58,10 +56,10 @@ let currentOwner = null;
5856
let currentInstance: ReactEventComponentInstance;
5957
let currentEventQueue: EventQueue;
6058

61-
const eventResponderContext: ResponderContext = {
59+
const eventResponderContext: ReactResponderContext = {
6260
dispatchEvent(
6361
possibleEventObject: Object,
64-
{capture, discrete, stopPropagation}: ResponderDispatchEventOptions,
62+
{capture, discrete, stopPropagation}: ReactResponderDispatchEventOptions,
6563
): void {
6664
const eventQueue = currentEventQueue;
6765
const {listener, target, type} = possibleEventObject;
@@ -260,7 +258,7 @@ function createResponderEvent(
260258
nativeEvent: AnyNativeEvent,
261259
nativeEventTarget: Element | Document,
262260
eventSystemFlags: EventSystemFlags,
263-
): ResponderEvent {
261+
): ReactResponderEvent {
264262
return {
265263
nativeEvent: nativeEvent,
266264
target: nativeEventTarget,
@@ -342,7 +340,7 @@ function getTargetEventTypes(
342340

343341
function handleTopLevelType(
344342
topLevelType: DOMTopLevelEventType,
345-
responderEvent: ResponderEvent,
343+
responderEvent: ReactResponderEvent,
346344
eventComponentInstance: ReactEventComponentInstance,
347345
isRootLevelEvent: boolean,
348346
): void {

‎packages/react-events/src/Drag.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
* @flow
88
*/
99

10-
import type {ResponderEvent, ResponderContext} from 'events/EventTypes';
10+
import type {
11+
ReactResponderEvent,
12+
ReactResponderContext,
13+
} from 'shared/ReactTypes';
1114
import {REACT_EVENT_COMPONENT_TYPE} from 'shared/ReactSymbols';
1215

1316
const targetEventTypes = ['pointerdown', 'pointercancel'];
@@ -62,7 +65,7 @@ function createDragEvent(
6265
}
6366

6467
function dispatchDragEvent(
65-
context: ResponderContext,
68+
context: ReactResponderContext,
6669
name: DragEventType,
6770
listener: DragEvent => void,
6871
state: DragState,
@@ -88,8 +91,8 @@ const DragResponder = {
8891
};
8992
},
9093
onEvent(
91-
event: ResponderEvent,
92-
context: ResponderContext,
94+
event: ReactResponderEvent,
95+
context: ReactResponderContext,
9396
props: Object,
9497
state: DragState,
9598
): void {

‎packages/react-events/src/Focus.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
* @flow
88
*/
99

10-
import type {ResponderEvent, ResponderContext} from 'events/EventTypes';
10+
import type {
11+
ReactResponderEvent,
12+
ReactResponderContext,
13+
} from 'shared/ReactTypes';
1114
import {REACT_EVENT_COMPONENT_TYPE} from 'shared/ReactSymbols';
1215

1316
type FocusProps = {
@@ -47,8 +50,8 @@ function createFocusEvent(
4750
}
4851

4952
function dispatchFocusInEvents(
50-
event: ResponderEvent,
51-
context: ResponderContext,
53+
event: ReactResponderEvent,
54+
context: ReactResponderContext,
5255
props: FocusProps,
5356
) {
5457
const {nativeEvent, target} = event;
@@ -69,8 +72,8 @@ function dispatchFocusInEvents(
6972
}
7073

7174
function dispatchFocusOutEvents(
72-
event: ResponderEvent,
73-
context: ResponderContext,
75+
event: ReactResponderEvent,
76+
context: ReactResponderContext,
7477
props: FocusProps,
7578
) {
7679
const {nativeEvent, target} = event;
@@ -98,8 +101,8 @@ const FocusResponder = {
98101
};
99102
},
100103
onEvent(
101-
event: ResponderEvent,
102-
context: ResponderContext,
104+
event: ReactResponderEvent,
105+
context: ReactResponderContext,
103106
props: Object,
104107
state: FocusState,
105108
): void {

‎packages/react-events/src/Hover.js

+12-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
* @flow
88
*/
99

10-
import type {ResponderEvent, ResponderContext} from 'events/EventTypes';
10+
import type {
11+
ReactResponderEvent,
12+
ReactResponderContext,
13+
} from 'shared/ReactTypes';
1114
import {REACT_EVENT_COMPONENT_TYPE} from 'shared/ReactSymbols';
1215

1316
type HoverProps = {
@@ -64,8 +67,8 @@ function createHoverEvent(
6467
}
6568

6669
function dispatchHoverChangeEvent(
67-
event: ResponderEvent,
68-
context: ResponderContext,
70+
event: ReactResponderEvent,
71+
context: ReactResponderContext,
6972
props: HoverProps,
7073
state: HoverState,
7174
): void {
@@ -81,8 +84,8 @@ function dispatchHoverChangeEvent(
8184
}
8285

8386
function dispatchHoverStartEvents(
84-
event: ResponderEvent,
85-
context: ResponderContext,
87+
event: ReactResponderEvent,
88+
context: ReactResponderContext,
8689
props: HoverProps,
8790
state: HoverState,
8891
): void {
@@ -132,8 +135,8 @@ function dispatchHoverStartEvents(
132135
}
133136

134137
function dispatchHoverEndEvents(
135-
event: ResponderEvent,
136-
context: ResponderContext,
138+
event: ReactResponderEvent,
139+
context: ReactResponderContext,
137140
props: HoverProps,
138141
state: HoverState,
139142
) {
@@ -199,8 +202,8 @@ const HoverResponder = {
199202
};
200203
},
201204
onEvent(
202-
event: ResponderEvent,
203-
context: ResponderContext,
205+
event: ReactResponderEvent,
206+
context: ReactResponderContext,
204207
props: HoverProps,
205208
state: HoverState,
206209
): void {

‎packages/react-events/src/Press.js

+18-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
* @flow
88
*/
99

10-
import type {ResponderEvent, ResponderContext} from 'events/EventTypes';
10+
import type {
11+
ReactResponderEvent,
12+
ReactResponderContext,
13+
} from 'shared/ReactTypes';
1114
import {REACT_EVENT_COMPONENT_TYPE} from 'shared/ReactSymbols';
1215

1316
type PressProps = {
@@ -89,7 +92,7 @@ function createPressEvent(
8992
}
9093

9194
function dispatchEvent(
92-
context: ResponderContext,
95+
context: ReactResponderContext,
9396
state: PressState,
9497
name: PressEventType,
9598
listener: (e: Object) => void,
@@ -100,7 +103,7 @@ function dispatchEvent(
100103
}
101104

102105
function dispatchPressChangeEvent(
103-
context: ResponderContext,
106+
context: ReactResponderContext,
104107
props: PressProps,
105108
state: PressState,
106109
): void {
@@ -111,7 +114,7 @@ function dispatchPressChangeEvent(
111114
}
112115

113116
function dispatchLongPressChangeEvent(
114-
context: ResponderContext,
117+
context: ReactResponderContext,
115118
props: PressProps,
116119
state: PressState,
117120
): void {
@@ -150,7 +153,7 @@ function deactivate(context, props, state) {
150153
}
151154

152155
function dispatchPressStartEvents(
153-
context: ResponderContext,
156+
context: ReactResponderContext,
154157
props: PressProps,
155158
state: PressState,
156159
): void {
@@ -212,7 +215,7 @@ function dispatchPressStartEvents(
212215
}
213216

214217
function dispatchPressEndEvents(
215-
context: ResponderContext,
218+
context: ReactResponderContext,
216219
props: PressProps,
217220
state: PressState,
218221
): void {
@@ -265,7 +268,7 @@ function calculateDelayMS(delay: ?number, min = 0, fallback = 0) {
265268
}
266269

267270
function unmountResponder(
268-
context: ResponderContext,
271+
context: ReactResponderContext,
269272
props: PressProps,
270273
state: PressState,
271274
): void {
@@ -293,8 +296,8 @@ const PressResponder = {
293296
};
294297
},
295298
onEvent(
296-
event: ResponderEvent,
297-
context: ResponderContext,
299+
event: ReactResponderEvent,
300+
context: ReactResponderContext,
298301
props: PressProps,
299302
state: PressState,
300303
): void {
@@ -491,12 +494,16 @@ const PressResponder = {
491494
}
492495
}
493496
},
494-
onUnmount(context: ResponderContext, props: PressProps, state: PressState) {
497+
onUnmount(
498+
context: ReactResponderContext,
499+
props: PressProps,
500+
state: PressState,
501+
) {
495502
unmountResponder(context, props, state);
496503
},
497504
// TODO This method doesn't work as of yet
498505
onOwnershipChange(
499-
context: ResponderContext,
506+
context: ReactResponderContext,
500507
props: PressProps,
501508
state: PressState,
502509
) {

‎packages/react-events/src/Swipe.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
* @flow
88
*/
99

10-
import type {ResponderEvent, ResponderContext} from 'events/EventTypes';
10+
import type {
11+
ReactResponderEvent,
12+
ReactResponderContext,
13+
} from 'shared/ReactTypes';
1114
import {REACT_EVENT_COMPONENT_TYPE} from 'shared/ReactSymbols';
1215

1316
const targetEventTypes = ['pointerdown', 'pointercancel'];
@@ -52,7 +55,7 @@ function createSwipeEvent(
5255
}
5356

5457
function dispatchSwipeEvent(
55-
context: ResponderContext,
58+
context: ReactResponderContext,
5659
name: SwipeEventType,
5760
listener: SwipeEvent => void,
5861
state: SwipeState,
@@ -92,8 +95,8 @@ const SwipeResponder = {
9295
};
9396
},
9497
onEvent(
95-
event: ResponderEvent,
96-
context: ResponderContext,
98+
event: ReactResponderEvent,
99+
context: ReactResponderContext,
97100
props: Object,
98101
state: SwipeState,
99102
): void {

0 commit comments

Comments
 (0)