Skip to content

fix: scroll draggable modal with isScrollable prop #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: scroll draggable modal with isScrollable prop #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/docs/pages/docs/Components/draggable-modal.en-US.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 26 additions & 10 deletions packages/react-native-ficus-ui/src/components/draggable-modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { mergeRefs } from '../utils/merge-refs';
interface DraggableModalOptions {
isOpen?: boolean;
onClose?: () => void;
isScrollable?: boolean;
scrollViewProps?: BottomSheetScrollViewProps;
}

Expand All @@ -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) {
Expand Down Expand Up @@ -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}
Expand All @@ -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>
);
});