Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useMemo } from 'react';
import { BaseGestureConfig } from '../../../types';
import { extractStateChangeHandlers } from '../../utils';
import { getStateChangeHandler } from '../stateChangeHandler';
Expand All @@ -6,7 +7,8 @@ export function useGestureStateChangeEvent<THandlerData, TConfig>(
handlerTag: number,
config: BaseGestureConfig<THandlerData, TConfig>
) {
const handlers = extractStateChangeHandlers(config);

return getStateChangeHandler(handlerTag, handlers);
return useMemo(() => {
const handlers = extractStateChangeHandlers(config);
return getStateChangeHandler(handlerTag, handlers);
}, [handlerTag, config]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useMemo } from 'react';
import { BaseGestureConfig } from '../../../types';
import { extractTouchHandlers } from '../../utils';
import { getTouchEventHandler } from '../touchEventHandler';
Expand All @@ -6,7 +7,8 @@ export function useGestureTouchEvent<THandlerData, TConfig>(
handlerTag: number,
config: BaseGestureConfig<THandlerData, TConfig>
) {
const handlers = extractTouchHandlers(config);

return getTouchEventHandler(handlerTag, handlers);
return useMemo(() => {
const handlers = extractTouchHandlers(config);
return getTouchEventHandler(handlerTag, handlers);
}, [handlerTag, config]);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@ import { extractUpdateHandlers, isAnimatedEvent } from '../../utils';
import { ReanimatedContext } from '../../../../handlers/gestures/reanimatedWrapper';
import { getUpdateHandler } from '../updateHandler';
import { BaseGestureConfig } from '../../../types';
import { useMemo } from 'react';

export function useGestureUpdateEvent<THandlerData, TConfig>(
handlerTag: number,
config: BaseGestureConfig<THandlerData, TConfig>
) {
const { handlers, changeEventCalculator } = extractUpdateHandlers(config);
return useMemo(() => {
const { handlers, changeEventCalculator } = extractUpdateHandlers(config);

const jsContext: ReanimatedContext<THandlerData> = {
lastUpdateEvent: undefined,
};
const jsContext: ReanimatedContext<THandlerData> = {
lastUpdateEvent: undefined,
};

return isAnimatedEvent(config.onUpdate)
? undefined
: getUpdateHandler(handlerTag, handlers, jsContext, changeEventCalculator);
return isAnimatedEvent(config.onUpdate)
? undefined
: getUpdateHandler(
handlerTag,
handlers,
jsContext,
changeEventCalculator
);
}, [handlerTag, config]);
}
49 changes: 36 additions & 13 deletions packages/react-native-gesture-handler/src/v3/hooks/useGesture.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useMemo } from 'react';
import { useEffect, useMemo, useRef } from 'react';
import { getNextHandlerTag } from '../../handlers/getNextHandlerTag';
import RNGestureHandlerModule from '../../RNGestureHandlerModule';
import { useGestureCallbacks } from './useGestureCallbacks';
Expand Down Expand Up @@ -69,12 +69,20 @@ export function useGesture<THandlerData, TConfig>(
throw new Error(tagMessage('Failed to create reanimated event handlers.'));
}

const gestureRelations = prepareRelations(config, tag);
const gestureRelations = useMemo(
() => prepareRelations(config, tag),
[config, tag]
);

useMemo(() => {
const currentGestureRef = useRef({ type: '', tag: -1 });
if (
currentGestureRef.current.tag !== tag ||
currentGestureRef.current.type !== (type as string)
) {
currentGestureRef.current = { type, tag };
RNGestureHandlerModule.createGestureHandler(type, tag, {});
RNGestureHandlerModule.flushOperations();
}, [type, tag]);
}

useEffect(() => {
return () => {
Expand All @@ -93,21 +101,36 @@ export function useGesture<THandlerData, TConfig>(
return () => {
unbindSharedValues(config, tag);
};
}, [tag, config]);
}, [tag, config, type]);

return {
tag,
type,
config,
detectorCallbacks: {
return useMemo(
() => ({
tag,
type,
config,
detectorCallbacks: {
onGestureHandlerStateChange,
onGestureHandlerEvent,
onGestureHandlerTouchEvent,
onReanimatedStateChange,
onReanimatedUpdateEvent,
onReanimatedTouchEvent,
onGestureHandlerAnimatedEvent,
},
gestureRelations,
}),
[
tag,
type,
config,
onGestureHandlerStateChange,
onGestureHandlerEvent,
onGestureHandlerTouchEvent,
onReanimatedStateChange,
onReanimatedUpdateEvent,
onReanimatedTouchEvent,
onGestureHandlerAnimatedEvent,
},
gestureRelations,
};
gestureRelations,
]
);
}
Loading