From b0f7e0a7eea4cd1c6315b6944eb8fdc68219fa92 Mon Sep 17 00:00:00 2001
From: hguillaume <heloise.guillaume@bearstudio.fr>
Date: Wed, 1 Oct 2025 18:28:20 +0200
Subject: [PATCH] fix: scroll draggable modal with isScrollable prop

---
 .../docs/Components/draggable-modal.en-US.mdx |  7 ++++
 .../src/components/draggable-modal/index.tsx  | 36 +++++++++++++------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/apps/docs/pages/docs/Components/draggable-modal.en-US.mdx b/apps/docs/pages/docs/Components/draggable-modal.en-US.mdx
index 8989dee..fd5db7f 100644
--- a/apps/docs/pages/docs/Components/draggable-modal.en-US.mdx
+++ b/apps/docs/pages/docs/Components/draggable-modal.en-US.mdx
@@ -72,6 +72,13 @@ Extends every `Box` props and `BottomSheetModalProps` from `@gorhom/bottom-sheet
   prop={{ type: "() => void", required: false }}
 />
 
+### `isScrollable`
+
+<PropsTable
+description="Boolean to indicate if the modal should be scrollable."
+prop={{ type: "boolean", required: false }}
+/>
+
 ### `scrollViewProps`
 
 <PropsTable
diff --git a/packages/react-native-ficus-ui/src/components/draggable-modal/index.tsx b/packages/react-native-ficus-ui/src/components/draggable-modal/index.tsx
index 01d74f8..ff1dc1e 100644
--- a/packages/react-native-ficus-ui/src/components/draggable-modal/index.tsx
+++ b/packages/react-native-ficus-ui/src/components/draggable-modal/index.tsx
@@ -18,6 +18,7 @@ import { mergeRefs } from '../utils/merge-refs';
 interface DraggableModalOptions {
   isOpen?: boolean;
   onClose?: () => void;
+  isScrollable?: boolean;
   scrollViewProps?: BottomSheetScrollViewProps;
 }
 
@@ -35,7 +36,15 @@ export const DraggableModal = forwardRef<
   const { colorMode } = useColorMode();
 
   const bottomSheetModalRef = mergeRefs(_ref, ref);
-  const { children, isOpen, onClose, h, scrollViewProps, ...rest } = props;
+  const {
+    children,
+    isOpen,
+    onClose,
+    h,
+    isScrollable,
+    scrollViewProps,
+    ...rest
+  } = props;
 
   useEffect(() => {
     if (isOpen) {
@@ -86,6 +95,15 @@ export const DraggableModal = forwardRef<
   const safeAreaViewStyle = {
     flex: 1,
   };
+
+  const modalContent = (
+    <Box h={h ?? '100%'}>
+      <SafeAreaView style={safeAreaViewStyle}>
+        {children as ReactNode}
+      </SafeAreaView>
+    </Box>
+  );
+
   return (
     <ficus.BottomSheetModal
       ref={bottomSheetModalRef}
@@ -95,15 +113,13 @@ export const DraggableModal = forwardRef<
       backgroundStyle={bottomSheetBackgroundStyleObject as ViewStyle}
       handleIndicatorStyle={handleStyleObject}
     >
-      <BottomSheetScrollView {...scrollViewProps}>
-        <ficus.BottomSheetView {...rest}>
-          <Box h={h ?? '100%'}>
-            <SafeAreaView style={safeAreaViewStyle}>
-              {children as ReactNode}
-            </SafeAreaView>
-          </Box>
-        </ficus.BottomSheetView>
-      </BottomSheetScrollView>
+      {isScrollable ? (
+        <BottomSheetScrollView {...scrollViewProps}>
+          {modalContent}
+        </BottomSheetScrollView>
+      ) : (
+        <ficus.BottomSheetView {...rest}>{modalContent}</ficus.BottomSheetView>
+      )}
     </ficus.BottomSheetModal>
   );
 });