Skip to content

Commit 6605a36

Browse files
authored
Split types (#3750)
## Description This PR splits `types.ts` file into multiple files to improve readability. ## Test plan 1. `yarn ts-check` 2. `yarn lint-js` 3. `yarn circular-dependency-check`
1 parent 1df7e30 commit 6605a36

File tree

13 files changed

+346
-315
lines changed

13 files changed

+346
-315
lines changed

packages/react-native-gesture-handler/src/v3/LogicDetector.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import { findNodeHandle, Platform } from 'react-native';
44
import { useDetectorContext } from './NativeDetector/useDetectorContext';
55
import { NativeDetectorProps } from './NativeDetector/NativeDetector';
66
import { isComposedGesture } from './hooks/utils/relationUtils';
7-
import { GestureEvents } from './types';
7+
import { DetectorCallbacks } from './types';
88

99
export function LogicDetector<THandlerData, TConfig>(
1010
props: NativeDetectorProps<THandlerData, TConfig>
1111
) {
1212
const { register, unregister } = useDetectorContext();
1313
const viewRef = useRef(null);
1414
const [viewTag, setViewTag] = useState<number>(-1);
15-
const logicMethods = useRef(props.gesture.gestureEvents);
15+
const logicMethods = useRef(props.gesture.detectorCallbacks);
1616

1717
const handleRef = useCallback((node: any) => {
1818
viewRef.current = node;
@@ -31,8 +31,8 @@ export function LogicDetector<THandlerData, TConfig>(
3131
}, []);
3232

3333
useEffect(() => {
34-
logicMethods.current = props.gesture.gestureEvents;
35-
}, [props.gesture.gestureEvents]);
34+
logicMethods.current = props.gesture.detectorCallbacks;
35+
}, [props.gesture.detectorCallbacks]);
3636

3737
useEffect(() => {
3838
if (viewTag === -1) {
@@ -60,7 +60,7 @@ export function LogicDetector<THandlerData, TConfig>(
6060
Object.assign(logicProps, { viewRef });
6161
}
6262

63-
register(logicProps, logicMethods as RefObject<GestureEvents<unknown>>);
63+
register(logicProps, logicMethods as RefObject<DetectorCallbacks<unknown>>);
6464

6565
return () => {
6666
unregister(viewTag);

packages/react-native-gesture-handler/src/v3/NativeDetector/NativeDetector.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { tagMessage } from '../../utils';
55
import {
66
LogicChildren,
77
Gesture,
8-
GestureEvents,
8+
DetectorCallbacks,
99
GestureHandlerEvent,
1010
} from '../types';
1111
import { DetectorContext } from './useDetectorContext';
@@ -29,9 +29,9 @@ export function NativeDetector<THandlerData, TConfig>({
2929
children,
3030
}: NativeDetectorProps<THandlerData, TConfig>) {
3131
const [logicChildren, setLogicChildren] = useState<LogicChildren[]>([]);
32-
const logicMethods = useRef<Map<number, RefObject<GestureEvents<unknown>>>>(
33-
new Map()
34-
);
32+
const logicMethods = useRef<
33+
Map<number, RefObject<DetectorCallbacks<unknown>>>
34+
>(new Map());
3535

3636
const NativeDetectorComponent = gesture.config.dispatchesAnimatedEvents
3737
? AnimatedNativeDetector
@@ -40,7 +40,7 @@ export function NativeDetector<THandlerData, TConfig>({
4040
: HostGestureDetector;
4141

4242
const register = useCallback(
43-
(child: LogicChildren, methods: RefObject<GestureEvents<unknown>>) => {
43+
(child: LogicChildren, methods: RefObject<DetectorCallbacks<unknown>>) => {
4444
setLogicChildren((prev) => {
4545
const index = prev.findIndex((c) => c.viewTag === child.viewTag);
4646
if (index !== -1) {
@@ -74,10 +74,10 @@ export function NativeDetector<THandlerData, TConfig>({
7474

7575
configureRelations(gesture);
7676

77-
const handleGestureEvent = (key: keyof GestureEvents<THandlerData>) => {
77+
const handleGestureEvent = (key: keyof DetectorCallbacks<THandlerData>) => {
7878
return (e: GestureHandlerEvent<THandlerData>) => {
79-
if (gesture.gestureEvents[key]) {
80-
gesture.gestureEvents[key](e);
79+
if (gesture.detectorCallbacks[key]) {
80+
gesture.detectorCallbacks[key](e);
8181
}
8282

8383
logicMethods.current.forEach((ref) => {
@@ -90,12 +90,12 @@ export function NativeDetector<THandlerData, TConfig>({
9090
};
9191

9292
const getHandlers = useCallback(
93-
(key: keyof GestureEvents<unknown>) => {
93+
(key: keyof DetectorCallbacks<unknown>) => {
9494
const handlers: ((e: GestureHandlerEvent<THandlerData>) => void)[] = [];
9595

96-
if (gesture.gestureEvents[key]) {
96+
if (gesture.detectorCallbacks[key]) {
9797
handlers.push(
98-
gesture.gestureEvents[key] as (
98+
gesture.detectorCallbacks[key] as (
9999
e: GestureHandlerEvent<unknown>
100100
) => void
101101
);
@@ -112,7 +112,7 @@ export function NativeDetector<THandlerData, TConfig>({
112112

113113
return handlers;
114114
},
115-
[logicChildren, gesture.gestureEvents]
115+
[logicChildren, gesture.detectorCallbacks]
116116
);
117117

118118
const reanimatedEventHandler = Reanimated?.useComposedEventHandler(
@@ -136,7 +136,7 @@ export function NativeDetector<THandlerData, TConfig>({
136136
onGestureHandlerEvent={handleGestureEvent('onGestureHandlerEvent')}
137137
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
138138
onGestureHandlerAnimatedEvent={
139-
gesture.gestureEvents.onGestureHandlerAnimatedEvent
139+
gesture.detectorCallbacks.onGestureHandlerAnimatedEvent
140140
}
141141
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
142142
onGestureHandlerTouchEvent={handleGestureEvent(

packages/react-native-gesture-handler/src/v3/NativeDetector/useDetectorContext.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { createContext, RefObject, useContext } from 'react';
2-
import { GestureEvents, LogicChildren } from '../types';
2+
import { DetectorCallbacks, LogicChildren } from '../types';
33

44
type DetectorContextType = {
55
register: (
66
child: LogicChildren,
7-
methods: RefObject<GestureEvents<unknown>>
7+
methods: RefObject<DetectorCallbacks<unknown>>
88
) => void;
99
unregister: (child: number) => void;
1010
};

packages/react-native-gesture-handler/src/v3/hooks/relations/useComposedGesture.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,56 +47,57 @@ export function useComposedGesture(
4747

4848
const onGestureHandlerStateChange = (event: StateChangeEvent<unknown>) => {
4949
for (const gesture of gestures) {
50-
if (gesture.gestureEvents.onGestureHandlerStateChange) {
51-
gesture.gestureEvents.onGestureHandlerStateChange(event);
50+
if (gesture.detectorCallbacks.onGestureHandlerStateChange) {
51+
gesture.detectorCallbacks.onGestureHandlerStateChange(event);
5252
}
5353
}
5454
};
5555

5656
const onGestureHandlerEvent = (event: UpdateEvent<unknown>) => {
5757
for (const gesture of gestures) {
58-
if (gesture.gestureEvents.onGestureHandlerEvent) {
59-
gesture.gestureEvents.onGestureHandlerEvent(event);
58+
if (gesture.detectorCallbacks.onGestureHandlerEvent) {
59+
gesture.detectorCallbacks.onGestureHandlerEvent(event);
6060
}
6161
}
6262
};
6363

6464
const onGestureHandlerTouchEvent = (event: TouchEvent) => {
6565
for (const gesture of gestures) {
66-
if (gesture.gestureEvents.onGestureHandlerTouchEvent) {
67-
gesture.gestureEvents.onGestureHandlerTouchEvent(event);
66+
if (gesture.detectorCallbacks.onGestureHandlerTouchEvent) {
67+
gesture.detectorCallbacks.onGestureHandlerTouchEvent(event);
6868
}
6969
}
7070
};
7171

7272
const onReanimatedStateChange = Reanimated?.useComposedEventHandler(
7373
gestures.map(
74-
(gesture) => gesture.gestureEvents.onReanimatedStateChange || null
74+
(gesture) => gesture.detectorCallbacks.onReanimatedStateChange || null
7575
)
7676
);
7777

7878
const onReanimatedUpdateEvent = Reanimated?.useComposedEventHandler(
7979
gestures.map(
80-
(gesture) => gesture.gestureEvents.onReanimatedUpdateEvent || null
80+
(gesture) => gesture.detectorCallbacks.onReanimatedUpdateEvent || null
8181
)
8282
);
8383

8484
const onReanimatedTouchEvent = Reanimated?.useComposedEventHandler(
8585
gestures.map(
86-
(gesture) => gesture.gestureEvents.onReanimatedTouchEvent || null
86+
(gesture) => gesture.detectorCallbacks.onReanimatedTouchEvent || null
8787
)
8888
);
8989

9090
let onGestureHandlerAnimatedEvent;
9191

9292
const gesturesWithAnimatedEvent = gestures.filter(
9393
(gesture) =>
94-
gesture.gestureEvents.onGestureHandlerAnimatedEvent !== undefined
94+
gesture.detectorCallbacks.onGestureHandlerAnimatedEvent !== undefined
9595
);
9696

9797
if (gesturesWithAnimatedEvent.length > 0) {
9898
onGestureHandlerAnimatedEvent =
99-
gesturesWithAnimatedEvent[0].gestureEvents.onGestureHandlerAnimatedEvent;
99+
gesturesWithAnimatedEvent[0].detectorCallbacks
100+
.onGestureHandlerAnimatedEvent;
100101

101102
if (__DEV__ && gesturesWithAnimatedEvent.length > 1) {
102103
console.warn(
@@ -111,7 +112,7 @@ export function useComposedGesture(
111112
tags,
112113
type,
113114
config,
114-
gestureEvents: {
115+
detectorCallbacks: {
115116
onGestureHandlerStateChange,
116117
onGestureHandlerEvent,
117118
onGestureHandlerTouchEvent,

packages/react-native-gesture-handler/src/v3/hooks/useGesture.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export function useGesture<THandlerData, TConfig>(
9999
tag,
100100
type,
101101
config,
102-
gestureEvents: {
102+
detectorCallbacks: {
103103
onGestureHandlerStateChange,
104104
onGestureHandlerEvent,
105105
onGestureHandlerTouchEvent,

0 commit comments

Comments
 (0)