fix: prevent closing when sheet is out of screen (#322)

gorhom · Mar 4, 2021 · 0aa88ad · 0aa88ad
1 parent a47c300
commit 0aa88ad
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/components/bottomSheet/BottomSheet.tsx b/src/components/bottomSheet/BottomSheet.tsx
@@ -201,6 +201,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
         ? safeContainerHeight
         : snapPoints[currentIndexRef.current];
     }, [snapPoints, animateOnMount, safeContainerHeight]);
+    const currentPositionRef = useRef<number>(initialPosition);
     //#endregion
 
     //#region gestures
@@ -369,7 +370,11 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
     );
     const handleClose = useCallback(() => {
       const currentIndexValue = currentIndexRef.current;
-      if (currentIndexValue === -1 || isClosing.current) {
+      if (
+        currentIndexValue === -1 ||
+        isClosing.current ||
+        currentPositionRef.current === safeContainerHeight
+      ) {
         return;
       }
       isClosing.current = true;
@@ -565,6 +570,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
             });
 
             currentIndexRef.current = currentPositionIndex;
+            currentPositionRef.current = args[0];
             refreshUIElements();
             handleOnChange(currentPositionIndex);
           }),