Skip to content

Commit 32018dd

Browse files
authored
Merge branch 'next' into @latekvo/remove-paper-support-new
2 parents 632cb0f + 319fe86 commit 32018dd

3 files changed

Lines changed: 16 additions & 11 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { CallbackHandlers, UpdateEvent } from '../../types';
1212
import { tagMessage } from '../../../utils';
1313

1414
export function useGestureHandlerEvent(handlerTag: number, config: any) {
15-
const handlers: CallbackHandlers = {
16-
onUpdate: config.onUpdate,
17-
};
15+
const { onUpdate } = config;
16+
17+
const handlers: CallbackHandlers = { ...(onUpdate && { onUpdate }) };
1818

1919
const onGestureHandlerEvent = (
2020
event: UpdateEvent<Record<string, unknown>>,

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ import { Reanimated } from '../../../handlers/gestures/reanimatedWrapper';
99
import { CallbackHandlers, StateChangeEvent } from '../../types';
1010

1111
export function useGestureStateChangeEvent(handlerTag: number, config: any) {
12+
const { onBegin, onStart, onEnd, onFinalize } = config;
13+
1214
const handlers: CallbackHandlers = {
13-
onBegin: config.onBegin,
14-
onStart: config.onStart,
15-
onEnd: config.onEnd,
16-
onFinalize: config.onFinalize,
15+
...(onBegin && { onBegin }),
16+
...(onStart && { onStart }),
17+
...(onEnd && { onEnd }),
18+
...(onFinalize && { onFinalize }),
1719
};
1820

1921
const onGestureHandlerStateChange = (

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ import { CallbackHandlers, TouchEvent } from '../../types';
1111
import { NativeSyntheticEvent } from 'react-native';
1212

1313
export function useTouchEvent(handlerTag: number, config: any) {
14+
const { onTouchesDown, onTouchesMove, onTouchesUp, onTouchesCancelled } =
15+
config;
16+
1417
const handlers: CallbackHandlers = {
15-
onTouchesDown: config.onTouchesDown,
16-
onTouchesMove: config.onTouchesMove,
17-
onTouchesUp: config.onTouchesUp,
18-
onTouchesCancelled: config.onTouchesCancelled,
18+
...(onTouchesDown && { onTouchesDown }),
19+
...(onTouchesMove && { onTouchesMove }),
20+
...(onTouchesUp && { onTouchesUp }),
21+
...(onTouchesCancelled && { onTouchesCancelled }),
1922
};
2023

2124
const onGestureHandlerTouchEvent = (event: TouchEvent) => {

0 commit comments

Comments
 (0)