From d3312e31dc553599e2ee6b13c1146d4680c7d9d5 Mon Sep 17 00:00:00 2001
From: Jakub Kosmydel <jakub.kosmydel@discordapp.com>
Date: Thu, 27 Nov 2025 11:15:45 +0100
Subject: [PATCH] fix: thumbstick

---
 .../BottomSheetDraggableView.tsx                       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/bottomSheetDraggableView/BottomSheetDraggableView.tsx b/src/components/bottomSheetDraggableView/BottomSheetDraggableView.tsx
index d721fee7a..03702ccfb 100644
--- a/src/components/bottomSheetDraggableView/BottomSheetDraggableView.tsx
+++ b/src/components/bottomSheetDraggableView/BottomSheetDraggableView.tsx
@@ -24,6 +24,7 @@ const BottomSheetDraggableViewComponent = ({
     activeOffsetY,
     failOffsetX,
     failOffsetY,
+    animatedScrollableContentOffsetY,
   } = useBottomSheetInternal();
   const { contentPanGestureHandler } = useBottomSheetGestureHandlers();
   //#endregion
@@ -59,6 +60,14 @@ const BottomSheetDraggableViewComponent = ({
       .enabled(enableContentPanningGesture)
       .shouldCancelWhenOutside(false)
       .runOnJS(false)
+      .manualActivation(true)
+      .onTouchesMove((_, stateManager) => {
+        if (animatedScrollableContentOffsetY.value !== 0) {
+          stateManager.fail();
+          return;
+        }
+        stateManager.activate();
+      })
       .onStart(contentPanGestureHandler.handleOnStart)
       .onChange(contentPanGestureHandler.handleOnChange)
       .onEnd(contentPanGestureHandler.handleOnEnd)
@@ -99,6 +108,7 @@ const BottomSheetDraggableViewComponent = ({
     failOffsetY,
     simultaneousHandlers,
     waitFor,
+    animatedScrollableContentOffsetY,
     contentPanGestureHandler.handleOnChange,
     contentPanGestureHandler.handleOnEnd,
     contentPanGestureHandler.handleOnFinalize,