diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json index 5e07a6791..8de3f4b58 100644 --- a/example/storybook-nativewind/package.json +++ b/example/storybook-nativewind/package.json @@ -32,7 +32,7 @@ "@gluestack-style/animation-resolver": "^1.0.4", "@gluestack-style/react": "^1.0.57", "@gluestack-ui/config": "^1.1.19", - "@gluestack-ui/themed": "^1.1.45", + "@gluestack-ui/themed": "^1.1.46", "@gluestack/design-system": "^0.5.36", "@gorhom/bottom-sheet": "^5.0.0-alpha.10", "@legendapp/motion": "^2.2.0", diff --git a/example/storybook-nativewind/src/components/Actionsheet/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Actionsheet/index.nw.stories.mdx index 1c20ee6e1..e3677ac1e 100644 --- a/example/storybook-nativewind/src/components/Actionsheet/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/Actionsheet/index.nw.stories.mdx @@ -440,6 +440,8 @@ It inherits all the properties of React Native's [View](https://reactnative.dev/ +> Note: If **snapPoints** are not provided to `Actionsheet`, then it's essential to set **maxHeight** to `ActionsheetContent`. + #### ActionsheetBackdrop It is React Native's [Pressable](https://reactnative.dev/docs/pressable) component, created using [@legendapp/motion's](https://legendapp.com/open-source/motion/) `createMotionAnimatedComponent` function to add animation to the component. You can use any declarative animation library you prefer. diff --git a/example/storybook-nativewind/src/components/FormControl/index.nw.stories.mdx b/example/storybook-nativewind/src/components/FormControl/index.nw.stories.mdx index 828aff7f3..0f981d7a8 100644 --- a/example/storybook-nativewind/src/components/FormControl/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/FormControl/index.nw.stories.mdx @@ -159,19 +159,20 @@ The Radio Component can be incorporated within the FormControl. showArgsController={false} metaData={{ code: ` + function App () { + const [values, setValues] = React.useState("Mango"); + return ( Favourite fruit - + - - - + Mango @@ -179,9 +180,7 @@ The Radio Component can be incorporated within the FormControl. - - - + Apple @@ -189,9 +188,7 @@ The Radio Component can be incorporated within the FormControl. - - - + Orange @@ -205,9 +202,11 @@ The Radio Component can be incorporated within the FormControl. + ) + } `, transformCode: (code) => { - return transformedCode(code); + return transformedCode(code, 'function', 'App'); }, scope: { Wrapper, diff --git a/example/storybook-nativewind/src/components/Select/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Select/index.nw.stories.mdx index ddf021c4f..5b16f1764 100644 --- a/example/storybook-nativewind/src/components/Select/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/Select/index.nw.stories.mdx @@ -461,6 +461,8 @@ It inherits all the properties of React Native's [Pressable](https://reactnative It is internally mapped wth gluestack-ui's [Actionsheet](/ui/docs/components/disclosure/actionsheet) component, which inherits all the properties of React Native's [View](https://reactnative.dev/docs/view) component. +> Note: If **snapPoints** are not provided to `SelectPortal`, then it's essential to set **maxHeight** to `SelectContent`. + #### SelectBackdrop It is internally mapped wth gluestack-ui's [ActionsheetBackdrop](https://ui.gluestack.io/docs/components/disclosure/actionsheet) component, which is React Native's [Pressable](https://reactnative.dev/docs/pressable) component, created using [@legendapp/motion's](https://legendapp.com/open-source/motion/) `createMotionAnimatedComponent` function to add animation to the component. You can use any declarative animation library you prefer. diff --git a/example/storybook-nativewind/src/core-components/nativewind/dependencies.json b/example/storybook-nativewind/src/core-components/nativewind/dependencies.json new file mode 100644 index 000000000..8ac6247e6 --- /dev/null +++ b/example/storybook-nativewind/src/core-components/nativewind/dependencies.json @@ -0,0 +1,193 @@ +{ + "gluestack-ui-provider": { + "dependencies": { + "tailwindcss": "", + "nativewind": "4.0.36", + "@gluestack-ui/overlay": "latest", + "@gluestack-ui/toast": "latest", + "@gluestack-ui/nativewind-utils": "latest", + "react-native-svg": "13.4.0" + }, + "devDependencies": { + "jscodeshift": "0.15.2" + } + }, + "accordion": { + "dependencies": { + "@gluestack-ui/accordion": "latest", + "@expo/html-elements": "latest" + } + }, + "actionsheet": { + "dependencies": { + "@legendapp/motion": "latest", + "@gluestack-ui/actionsheet": "latest" + } + }, + "alert": { + "dependencies": { + "@gluestack-ui/alert": "latest" + } + }, + "alert-dialog": { + "dependencies": { + "@gluestack-ui/alert-dialog": "latest", + "@legendapp/motion": "latest" + } + }, + "avatar": { + "dependencies": { + "@gluestack-ui/avatar": "latest" + } + }, + "badge": { "dependencies": {} }, + "box": { "dependencies": {} }, + "button": { + "dependencies": { + "@gluestack-ui/button": "latest" + } + }, + "card": { "dependencies": {} }, + "center": { "dependencies": {} }, + "checkbox": { + "dependencies": { + "@gluestack-ui/checkbox": "latest" + } + }, + "divider": { + "dependencies": { + "@gluestack-ui/divider": "latest" + } + }, + "fab": { + "dependencies": { + "@gluestack-ui/fab": "latest" + } + }, + "flat-list": { + "dependencies": {} + }, + "form-control": { + "dependencies": { + "@gluestack-ui/form-control": "latest" + } + }, + "heading": { + "dependencies": { + "@expo/html-elements": "latest" + } + }, + "hstack": { + "dependencies": {} + }, + "icon": { + "dependencies": { + "@gluestack-ui/icon": "latest" + } + }, + "image": { + "dependencies": { + "@gluestack-ui/image": "latest" + } + }, + "image-background": { + "dependencies": {} + }, + "input": { + "dependencies": { + "@gluestack-ui/input": "latest" + } + }, + "input-accessory-view": { + "dependencies": {} + }, + "keyboard-avoiding-view": { + "dependencies": {} + }, + "link": { + "dependencies": { + "@gluestack-ui/link": "latest" + } + }, + "menu": { + "dependencies": { + "@gluestack-ui/menu": "latest", + "@legendapp/motion": "latest" + } + }, + "modal": { + "dependencies": { + "@gluestack-ui/modal": "latest", + "@legendapp/motion": "latest" + } + }, + "popover": { + "dependencies": { + "@gluestack-ui/popover": "latest", + "@legendapp/motion": "latest" + } + }, + "pressable": { + "dependencies": { + "@gluestack-ui/pressable": "latest" + } + }, + "progress": { + "dependencies": { + "@gluestack-ui/progress": "latest" + } + }, + "radio": { + "dependencies": { + "@gluestack-ui/radio": "latest" + } + }, + "refresh-control": { "dependencies": {} }, + "safe-area-view": { "dependencies": {} }, + "scroll-view": { "dependencies": {} }, + "section-list": { + "dependencies": {} + }, + "select": { + "dependencies": { + "@gluestack-ui/select": "latest" + } + }, + "slider": { + "dependencies": { + "@gluestack-ui/slider": "latest" + } + }, + "spinner": { + "dependencies": { + "@gluestack-ui/spinner": "latest" + } + }, + "status-bar": { "dependencies": {} }, + "switch": { + "dependencies": { + "@gluestack-ui/switch": "latest" + } + }, + "text": { "dependencies": {} }, + "textarea": { + "dependencies": { + "@gluestack-ui/textarea": "latest" + } + }, + "toast": { + "dependencies": { + "@gluestack-ui/toast": "latest", + "@legendapp/motion": "latest" + } + }, + "tooltip": { + "dependencies": { + "@gluestack-ui/tooltip": "latest", + "@legendapp/motion": "latest" + } + }, + "view": { "dependencies": {} }, + "virtualized-list": { "dependencies": {} }, + "vstack": { "dependencies": {} } +} diff --git a/packages/config/package.json b/packages/config/package.json index 95f930851..eff045653 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -39,7 +39,7 @@ "@gluestack-style/legend-motion-animation-driver": "1.0.3", "@gluestack-style/react": "1.0.57", "@gluestack-ui/accordion": "1.0.6", - "@gluestack-ui/actionsheet": "0.2.43", + "@gluestack-ui/actionsheet": "0.2.44", "@gluestack-ui/alert": "0.1.15", "@gluestack-ui/alert-dialog": "0.1.30", "@gluestack-ui/avatar": "0.1.17", @@ -66,14 +66,14 @@ "@gluestack-ui/switch": "0.1.22", "@gluestack-ui/tabs": "0.1.16", "@gluestack-ui/textarea": "0.1.23", - "@gluestack-ui/themed": "1.1.45", + "@gluestack-ui/themed": "1.1.46", "@gluestack-ui/toast": "1.0.7", "@gluestack-ui/tooltip": "0.1.32", "@legendapp/motion": "latest" }, "peerDependencies": { "@gluestack-style/react": ">=1.0.57", - "@gluestack-ui/themed": ">=1.1.45" + "@gluestack-ui/themed": ">=1.1.46" }, "release-it": { "git": { diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md index 7ccca3bc9..b350e3f8f 100644 --- a/packages/themed/CHANGELOG.md +++ b/packages/themed/CHANGELOG.md @@ -1,5 +1,12 @@ # @gluestack-ui/themed +## 1.1.46 + +### Patch Changes + +- Updated dependencies + - @gluestack-ui/actionsheet@0.2.44 + ## 1.1.45 ### Patch Changes diff --git a/packages/themed/package.json b/packages/themed/package.json index 3cbaf5440..e3782b24f 100644 --- a/packages/themed/package.json +++ b/packages/themed/package.json @@ -1,6 +1,6 @@ { "name": "@gluestack-ui/themed", - "version": "1.1.45", + "version": "1.1.46", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index", @@ -38,7 +38,7 @@ "@gluestack-style/animation-resolver": "1.0.4", "@gluestack-style/legend-motion-animation-driver": "1.0.3", "@gluestack-ui/accordion": "1.0.6", - "@gluestack-ui/actionsheet": "0.2.43", + "@gluestack-ui/actionsheet": "0.2.44", "@gluestack-ui/alert": "0.1.15", "@gluestack-ui/alert-dialog": "0.1.30", "@gluestack-ui/avatar": "0.1.17", diff --git a/packages/unstyled/actionsheet/CHANGELOG.md b/packages/unstyled/actionsheet/CHANGELOG.md index 34a07c24d..f4cc3a066 100644 --- a/packages/unstyled/actionsheet/CHANGELOG.md +++ b/packages/unstyled/actionsheet/CHANGELOG.md @@ -1,5 +1,11 @@ # @gluestack-ui/actionsheet +## 0.2.44 + +### Patch Changes + +- fix snappoint bottom issue in android + ## 0.2.43 ### Patch Changes diff --git a/packages/unstyled/actionsheet/package.json b/packages/unstyled/actionsheet/package.json index 6544b84d1..14b2d6370 100644 --- a/packages/unstyled/actionsheet/package.json +++ b/packages/unstyled/actionsheet/package.json @@ -15,7 +15,7 @@ "ios", "nextjs" ], - "version": "0.2.43", + "version": "0.2.44", "main": "lib/commonjs/index", "module": "lib/module/index", "types": "lib/typescript/index.d.ts", diff --git a/packages/unstyled/actionsheet/src/ActionsheetContent.tsx b/packages/unstyled/actionsheet/src/ActionsheetContent.tsx index dd4e6c022..fcce0860c 100644 --- a/packages/unstyled/actionsheet/src/ActionsheetContent.tsx +++ b/packages/unstyled/actionsheet/src/ActionsheetContent.tsx @@ -16,7 +16,7 @@ import { mergeRefs } from '@gluestack-ui/utils'; import { useDialog } from '@react-native-aria/dialog'; import { usePreventScroll } from '@react-native-aria/overlays'; -const windowHeight = Dimensions.get('window').height; +const windowHeight = Dimensions.get('screen').height; function ActionsheetContent( StyledActionsheetContent: any, AnimatePresence?: any