Skip to content

Commit fcd7059

Browse files
committed
Rename again
1 parent 0a23522 commit fcd7059

7 files changed

Lines changed: 16 additions & 22 deletions

File tree

packages/react-native-gesture-handler/src/jestUtils/jestUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,12 @@ function getHandlerData(
445445
};
446446

447447
if (eventName === 'onGestureHandlerStateChange') {
448-
componentOrGesture.detectorCallbacks.defaultEventHandler?.({
448+
componentOrGesture.detectorCallbacks.jsEventHandler?.({
449449
oldState: oldState as State,
450450
...event,
451451
});
452452
} else if (eventName === 'onGestureHandlerEvent') {
453-
componentOrGesture.detectorCallbacks.defaultEventHandler?.(event);
453+
componentOrGesture.detectorCallbacks.jsEventHandler?.(event);
454454
}
455455
},
456456
};

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ export function NativeDetector<THandlerData, TConfig>({
5858
enableContextMenu={enableContextMenu}
5959
pointerEvents={'box-none'}
6060
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
61-
onGestureHandlerStateChange={
62-
gesture.detectorCallbacks.defaultEventHandler
63-
}
61+
onGestureHandlerStateChange={gesture.detectorCallbacks.jsEventHandler}
6462
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
65-
onGestureHandlerEvent={gesture.detectorCallbacks.defaultEventHandler}
63+
onGestureHandlerEvent={gesture.detectorCallbacks.jsEventHandler}
6664
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
67-
onGestureHandlerTouchEvent={gesture.detectorCallbacks.defaultEventHandler}
65+
onGestureHandlerTouchEvent={gesture.detectorCallbacks.jsEventHandler}
6866
// @ts-ignore This is a type mismatch between RNGH types and RN Codegen types
6967
onGestureHandlerReanimatedStateChange={
7068
reanimatedHandlers.onGestureHandlerReanimatedStateChange

packages/react-native-gesture-handler/src/v3/detectors/VirtualDetector/InterceptingGestureDetector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export function InterceptingGestureDetector<THandlerData, TConfig>({
215215
};
216216

217217
const jsEventHandler = useMemo(
218-
() => createGestureEventHandler('defaultEventHandler'),
218+
() => createGestureEventHandler('jsEventHandler'),
219219
[createGestureEventHandler]
220220
);
221221

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ export function useComposedGesture(
4343
);
4444
}
4545

46-
const defaultEventHandler = (
46+
const jsEventHandler = (
4747
event: GestureHandlerEventWithHandlerData<unknown>
4848
) => {
4949
for (const gesture of gestures) {
50-
if (gesture.detectorCallbacks.defaultEventHandler) {
51-
gesture.detectorCallbacks.defaultEventHandler(event);
50+
if (gesture.detectorCallbacks.jsEventHandler) {
51+
gesture.detectorCallbacks.jsEventHandler(event);
5252
}
5353
}
5454
};
@@ -83,7 +83,7 @@ export function useComposedGesture(
8383
type,
8484
config,
8585
detectorCallbacks: {
86-
defaultEventHandler,
86+
jsEventHandler,
8787
reanimatedEventHandler,
8888
animatedEventHandler,
8989
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function useGesture<THandlerData, TConfig>(
3636
prepareConfig(config);
3737

3838
// TODO: Call only necessary hooks depending on which callbacks are defined (?)
39-
const { defaultEventHandler, reanimatedEventHandler, animatedEventHandler } =
39+
const { jsEventHandler, reanimatedEventHandler, animatedEventHandler } =
4040
useGestureCallbacks(tag, config);
4141

4242
if (config.shouldUseReanimatedDetector && !reanimatedEventHandler) {
@@ -71,7 +71,7 @@ export function useGesture<THandlerData, TConfig>(
7171
type,
7272
config,
7373
detectorCallbacks: {
74-
defaultEventHandler,
74+
jsEventHandler,
7575
animatedEventHandler,
7676
reanimatedEventHandler,
7777
},
@@ -81,7 +81,7 @@ export function useGesture<THandlerData, TConfig>(
8181
tag,
8282
type,
8383
config,
84-
defaultEventHandler,
84+
jsEventHandler,
8585
reanimatedEventHandler,
8686
animatedEventHandler,
8787
gestureRelations,

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ export function useGestureCallbacks<THandlerData, TConfig>(
4242
) {
4343
const callbacks = useMemoizedGestureCallbacks(config);
4444

45-
const defaultEventHandler = useGestureEventHandler(
46-
handlerTag,
47-
callbacks,
48-
config
49-
);
45+
const jsEventHandler = useGestureEventHandler(handlerTag, callbacks, config);
5046

5147
let reanimatedEventHandler;
5248

@@ -81,7 +77,7 @@ export function useGestureCallbacks<THandlerData, TConfig>(
8177
}
8278

8379
return {
84-
defaultEventHandler,
80+
jsEventHandler,
8581
reanimatedEventHandler,
8682
animatedEventHandler,
8783
};

packages/react-native-gesture-handler/src/v3/types/DetectorTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from './EventTypes';
66

77
export type DetectorCallbacks<THandlerData> = {
8-
defaultEventHandler:
8+
jsEventHandler:
99
| undefined
1010
| ((event: GestureHandlerEventWithHandlerData<THandlerData>) => void);
1111
reanimatedEventHandler:

0 commit comments

Comments
 (0)