Fix multiple double taps, reduce velocity on edges

pavelbabenko · Nov 23, 2023 · 8939bd0 · 8939bd0
1 parent 122c0e4
commit 8939bd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/index.tsx b/src/index.tsx
@@ -210,7 +210,6 @@ const ResizableImage = React.memo(
       focalY,
     }: Record<'focalX' | 'focalY', number>) => {
       'worklet';
-
       adjustedFocal.x.value = focalX - (CENTER.x + offset.x.value);
       adjustedFocal.y.value = focalY - (CENTER.y + offset.y.value);
     };
@@ -536,13 +535,15 @@ const ResizableImage = React.memo(
         const newWidth = scale.value * layout.x.value;
         const newHeight = scale.value * layout.y.value;
         if (
+          isMoving.x.value &&
           offset.x.value < (newWidth - width) / 2 - translation.x.value &&
           offset.x.value > -(newWidth - width) / 2 - translation.x.value
         ) {
           cancelAnimation(offset.x);
         }
 
         if (
+          isMoving.y.value &&
           offset.y.value < (newHeight - height) / 2 - translation.y.value &&
           offset.y.value > -(newHeight - height) / 2 - translation.y.value
         ) {
@@ -717,12 +718,9 @@ const ResizableImage = React.memo(
                 (newWidth - width) / 2 - translation.x.value,
               ],
             },
-            (edge) => {
+            () => {
               'worklet';
               isMoving.x.value = 0;
-              if (edge.isEdge) {
-                isMoving.y.value = 0;
-              }
             }
           );
         }
@@ -745,12 +743,9 @@ const ResizableImage = React.memo(
                 (newHeight - height) / 2 - translation.y.value,
               ],
             },
-            (edge) => {
+            () => {
               'worklet';
               isMoving.y.value = 0;
-              if (edge.isEdge) {
-                isMoving.x.value = 0;
-              }
             }
           );
         } else {

diff --git a/src/utils/withDecaySpring.ts b/src/utils/withDecaySpring.ts
@@ -125,7 +125,7 @@ export function withDecaySpring(
             animation.toValue =
               nextX <= config.clamp[0] ? config.clamp[0] : config.clamp[1];
 
-            callback?.({ isEdge: true });
+            v = v / 3;
           }
         }
       }