Skip to content
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

feat: added gorhom bottom sheet #2224

Merged
merged 4 commits into from
Jun 12, 2024
Merged

feat: added gorhom bottom sheet #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a8dc30
feat: added gorhom bottom sheet
Jun 10, 2024
c83cb62
Merge branch 'patch' of github.com:gluestack/gluestack-ui into feat/a…
Jun 10, 2024
2096f35
fix: unstyled trigger
Jun 10, 2024
f58d048
feat: added gorhom bottom sheet documentation
Jun 11, 2024
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
21 changes: 13 additions & 8 deletions example/storybook-nativewind/.ondevice/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const parameters = {

import { useDarkMode } from '../src/hooks/useDarkMode';
import { Platform } from 'react-native';
import { GestureHandlerRootView } from 'react-native-gesture-handler';

export const decorators = [
withBackgrounds,
Expand All @@ -45,11 +46,13 @@ export const decorators = [
}
}
return (
<GluestackUIProvider config={config}>
<Box flex={1} p="$10">
<Story />
</Box>
</GluestackUIProvider>
<GestureHandlerRootView style={{ flex: 1 }}>
<GluestackUIProvider config={config}>
<Box flex={1} p="$10">
<Story />
</Box>
</GluestackUIProvider>
</GestureHandlerRootView>
);
},
];
Expand All @@ -75,9 +78,11 @@ addParameters({
}
return (
<DocsContainer context={context}>
<GluestackUIProvider config={config} colorMode={getColorMode()}>
{children}
</GluestackUIProvider>
<GestureHandlerRootView style={{ flex: 1 }}>
<GluestackUIProvider config={config} colorMode={getColorMode()}>
{children}
</GluestackUIProvider>
</GestureHandlerRootView>
</DocsContainer>
);
},
Expand Down
45 changes: 27 additions & 18 deletions example/storybook-nativewind/.storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { OverlayProvider } from '@gluestack-ui/overlay';
import { ToastProvider } from '@gluestack-ui/toast';

import { GluestackUIProvider as GluestackUIWithNativewindProvider } from '../src/core-components/nativewind/gluestack-ui-provider';
import { GestureHandlerRootView } from 'react-native-gesture-handler';

// global css getting resolved from babel.config.js
import 'global.css';
Expand Down Expand Up @@ -136,21 +137,27 @@ export const decorators = [

return (
<GluestackUIWithGluestackStyleProvider colorMode={getColorMode()}>
<GluestackUIWithNativewindProvider mode={getColorMode()}>
<OverlayProvider style={{ flex: 1 }}>
<ToastProvider>
<View
style={{
flex: 1,
justifyContent: 'center',
alignItems: 'center',
}}
>
<Story />
</View>
</ToastProvider>
</OverlayProvider>
</GluestackUIWithNativewindProvider>
<GestureHandlerRootView
style={{ flex: 1, display: 'flex', height: '100vh' }}
>
<GluestackUIWithNativewindProvider mode={getColorMode()}>
<OverlayProvider style={{ flex: 1, display: 'flex' }}>
<ToastProvider>
<View
style={{
flex: 1,
display: 'flex',
width: '100%',
justifyContent: 'center',
alignItems: 'center',
}}
>
<Story />
</View>
</ToastProvider>
</OverlayProvider>
</GluestackUIWithNativewindProvider>
</GestureHandlerRootView>
</GluestackUIWithGluestackStyleProvider>
);
},
Expand All @@ -165,9 +172,11 @@ addParameters({
<GluestackUIWithGluestackStyleProvider>
<GluestackUIWithNativewindProvider>
<DocsContainer context={context}>
<OverlayProvider style={{ flex: 1 }}>
<ToastProvider>{children}</ToastProvider>
</OverlayProvider>
<GestureHandlerRootView style={{ flex: 1 }}>
<OverlayProvider style={{ flex: 1 }}>
<ToastProvider>{children}</ToastProvider>
</OverlayProvider>
</GestureHandlerRootView>
</DocsContainer>
</GluestackUIWithNativewindProvider>
</GluestackUIWithGluestackStyleProvider>
Expand Down
5 changes: 3 additions & 2 deletions example/storybook-nativewind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@gluestack-ui/config": "^1.1.18",
"@gluestack-ui/themed": "^1.1.28",
"@gluestack/design-system": "^0.5.36",
"@gorhom/bottom-sheet": "^5.0.0-alpha.10",
"@legendapp/motion": "^2.2.0",
"@react-aria/button": "^3.7.0",
"@react-aria/focus": "^3.11.0",
Expand Down Expand Up @@ -62,8 +63,8 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.72.4",
"react-native-gesture-handler": "^2.12.1",
"react-native-reanimated": "~3.3.0",
"react-native-gesture-handler": "~2.14.0",
"react-native-reanimated": "~3.6.2",
"react-native-safe-area-context": "^4.4.1",
"react-native-svg": "13.4.0",
"react-native-vector-icons": "^10.0.0",
Expand Down
12 changes: 12 additions & 0 deletions example/storybook-nativewind/src/components/BottomSheet/BottomSheet.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import type { ComponentMeta } from '@storybook/react-native';
import BottomSheet from './BottomSheet';

const BottomSheetMeta: ComponentMeta<typeof BottomSheet> = {
title: 'stories/BottomSheet',
component: BottomSheet,
argTypes: {},
};

export default BottomSheetMeta;

export { BottomSheet };
50 changes: 50 additions & 0 deletions example/storybook-nativewind/src/components/BottomSheet/BottomSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import React from 'react';
import {
BottomSheet,
BottomSheetBackdrop,
BottomSheetContent,
BottomSheetDragIndicator,
BottomSheetItem,
BottomSheetItemText,
BottomSheetPortal,
BottomSheetTrigger,
} from '@/components/ui/bottomsheet';
import { Text } from '@/components/ui/text';

const BottomSheetBasic = ({
text = 'Open Action Sheet',
_colorMode,
...props
}: any) => {
return (
<BottomSheet {...props}>
<BottomSheetTrigger>
<Text>{text}</Text>
</BottomSheetTrigger>
<BottomSheetPortal
snapPoints={['25%', '50%']}
backdropComponent={BottomSheetBackdrop}
handleComponent={BottomSheetDragIndicator}
>
<BottomSheetContent>
<BottomSheetItem>
<BottomSheetItemText>Item 1</BottomSheetItemText>
</BottomSheetItem>
<BottomSheetItem>
<BottomSheetItemText>Item 2</BottomSheetItemText>
</BottomSheetItem>
<BottomSheetItem>
<BottomSheetItemText>Item 3</BottomSheetItemText>
</BottomSheetItem>
</BottomSheetContent>
</BottomSheetPortal>
</BottomSheet>
);
};

BottomSheetBasic.description =
'This is a basic BottomSheet component example. The BottomSheet component lets you quickly and easily add status indicators to your interface for improved usability. They are designed to be attention-grabbing and quickly convey important information.';

export default BottomSheetBasic;

export { BottomSheet };
Loading
Loading