From 8b8fba72843a7875dbedd3c9add6d2487b818bc5 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 20 Sep 2023 03:46:59 +0100 Subject: [PATCH] Inline createPanResponder (#1483) --- .../ImageViewing/hooks/usePanResponder.ts | 25 ++++++----- src/view/com/lightbox/ImageViewing/utils.ts | 43 +------------------ 2 files changed, 15 insertions(+), 53 deletions(-) diff --git a/src/view/com/lightbox/ImageViewing/hooks/usePanResponder.ts b/src/view/com/lightbox/ImageViewing/hooks/usePanResponder.ts index c35b1c3d..7908504e 100644 --- a/src/view/com/lightbox/ImageViewing/hooks/usePanResponder.ts +++ b/src/view/com/lightbox/ImageViewing/hooks/usePanResponder.ts @@ -1,4 +1,3 @@ -/* eslint-disable react-hooks/exhaustive-deps */ /** * Copyright (c) JOB TODAY S.A. and its affiliates. * @@ -7,19 +6,19 @@ * */ -import {useMemo, useEffect} from 'react' +import {useEffect} from 'react' import { Animated, Dimensions, GestureResponderEvent, GestureResponderHandlers, NativeTouchEvent, + PanResponder, PanResponderGestureState, } from 'react-native' import {Position} from '../@types' import { - createPanResponder, getDistanceBetweenTouches, getImageTranslate, getImageDimensionsByTranslate, @@ -160,8 +159,12 @@ const usePanResponder = ({ longPressHandlerRef && clearTimeout(longPressHandlerRef) } - const handlers = { - onGrant: ( + const panResponder = PanResponder.create({ + onStartShouldSetPanResponder: () => true, + onStartShouldSetPanResponderCapture: () => true, + onMoveShouldSetPanResponder: () => true, + onMoveShouldSetPanResponderCapture: () => true, + onPanResponderGrant: ( _: GestureResponderEvent, gestureState: PanResponderGestureState, ) => { @@ -173,7 +176,7 @@ const usePanResponder = ({ longPressHandlerRef = setTimeout(onLongPress, delayLongPress) }, - onStart: ( + onPanResponderStart: ( event: GestureResponderEvent, gestureState: PanResponderGestureState, ) => { @@ -234,7 +237,7 @@ const usePanResponder = ({ lastTapTS = Date.now() } }, - onMove: ( + onPanResponderMove: ( event: GestureResponderEvent, gestureState: PanResponderGestureState, ) => { @@ -356,7 +359,7 @@ const usePanResponder = ({ tmpTranslate = {x: nextTranslateX, y: nextTranslateY} } }, - onRelease: () => { + onPanResponderRelease: () => { cancelLongPressHandle() if (isDoubleTapPerformed) { @@ -418,9 +421,9 @@ const usePanResponder = ({ tmpTranslate = null } }, - } - - const panResponder = useMemo(() => createPanResponder(handlers), [handlers]) + onPanResponderTerminationRequest: () => false, + onShouldBlockNativeResponder: () => false, + }) return [panResponder.panHandlers, scaleValue, translateValue] } diff --git a/src/view/com/lightbox/ImageViewing/utils.ts b/src/view/com/lightbox/ImageViewing/utils.ts index 8c9c1b34..d56eea4f 100644 --- a/src/view/com/lightbox/ImageViewing/utils.ts +++ b/src/view/com/lightbox/ImageViewing/utils.ts @@ -6,14 +6,7 @@ * */ -import { - Animated, - GestureResponderEvent, - PanResponder, - PanResponderGestureState, - PanResponderInstance, - NativeTouchEvent, -} from 'react-native' +import {Animated, NativeTouchEvent} from 'react-native' import {Dimensions, Position} from './@types' type CacheStorageItem = {key: string; value: any} @@ -131,40 +124,6 @@ export const getImageTranslateForScale = ( return getImageTranslate(targetImageDimensions, screen) } -type HandlerType = ( - event: GestureResponderEvent, - state: PanResponderGestureState, -) => void - -type PanResponderProps = { - onGrant: HandlerType - onStart?: HandlerType - onMove: HandlerType - onRelease?: HandlerType - onTerminate?: HandlerType -} - -export const createPanResponder = ({ - onGrant, - onStart, - onMove, - onRelease, - onTerminate, -}: PanResponderProps): PanResponderInstance => - PanResponder.create({ - onStartShouldSetPanResponder: () => true, - onStartShouldSetPanResponderCapture: () => true, - onMoveShouldSetPanResponder: () => true, - onMoveShouldSetPanResponderCapture: () => true, - onPanResponderGrant: onGrant, - onPanResponderStart: onStart, - onPanResponderMove: onMove, - onPanResponderRelease: onRelease, - onPanResponderTerminate: onTerminate, - onPanResponderTerminationRequest: () => false, - onShouldBlockNativeResponder: () => false, - }) - export const getDistanceBetweenTouches = ( touches: NativeTouchEvent[], ): number => {