More precise scroll dragging protection

bluesky-social · Oct 5, 2023 · 26183ee · 26183ee
1 parent 9abe15f
commit 26183ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx b/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx
@@ -158,6 +158,7 @@ const ImageItem = ({
   delayLongPress,
   swipeToCloseEnabled = true,
   doubleTapToZoomEnabled = true,
+  isDragging,
   gestureRef,
 }: Props) => {
   const [isScaled, setIsScaled] = useState(false)
@@ -228,12 +229,16 @@ const ImageItem = ({
 
   const consumeHScroll = Gesture.Manual()
     .onTouchesDown((e, manager) => {
+      if (isDragging) {
+        manager.activate();
+        return;
+      }
       const measurement = measure(containerRef);
       if (!measurement || measurement.pageX !== 0) {
         manager.activate();
-      } else {
-        manager.fail();
+        return;
       }
+      manager.fail();
     })
 
   const pinch = Gesture.Pinch()

diff --git a/src/view/com/lightbox/ImageViewing/index.tsx b/src/view/com/lightbox/ImageViewing/index.tsx
@@ -165,6 +165,7 @@ function ImageViewing({
               swipeToCloseEnabled={swipeToCloseEnabled}
               doubleTapToZoomEnabled={doubleTapToZoomEnabled}
               gestureRef={gestureRefs.get(imageSrc)}
+              isDragging={isDragging}
             />
           )}
           renderScrollComponent={props => (