Skip to content

Commit

Permalink
Merge pull request #1990 from gluestack/patch
Browse files Browse the repository at this point in the history
Patch
Viraj-10 authored Mar 21, 2024
2 parents 2f01b15 + e1f1224 commit f54607e
Showing 247 changed files with 7,297 additions and 1,885 deletions.
2 changes: 1 addition & 1 deletion example/storybook-nativewind/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ export const parameters = {
'Textarea',
],
'Overlay',
['AlertDialog', 'Modal', 'Popover', 'Tooltip'],
['AlertDialog', 'Menu', 'Modal', 'Popover', 'Tooltip'],
'Disclosure',
['Actionsheet', 'Accordion'],
'Media And Icons',
14 changes: 9 additions & 5 deletions example/storybook-nativewind/babel.config.js
Original file line number Diff line number Diff line change
@@ -46,6 +46,10 @@ module.exports = function (api) {
__dirname,
'../../packages/unstyled/button/src'
),
'@gluestack-ui/menu': path.resolve(
__dirname,
'../../packages/unstyled/menu/src'
),
'@gluestack-ui/link': path.resolve(
__dirname,
'../../packages/unstyled/link/src'
@@ -68,24 +72,24 @@ module.exports = function (api) {
),
'@gluestack-ui/nativewind-utils/withStyleContext': path.resolve(
__dirname,
'../../packages/nativewind/utils/src/withStyleContext'
'../../packages/nativewind/utils/withStyleContext'
),
'@gluestack-ui/nativewind-utils/withStyleContextAndStates':
path.resolve(
__dirname,
'../../packages/nativewind/utils/src/withStyleContextAndStates'
'../../packages/nativewind/utils/withStyleContextAndStates'
),
'@gluestack-ui/nativewind-utils/cssInterop': path.resolve(
__dirname,
'../../packages/nativewind/utils/src/cssInterop'
'../../packages/nativewind/utils/cssInterop'
),
'@gluestack-ui/nativewind-utils/tva': path.resolve(
__dirname,
'../../packages/nativewind/utils/src/tva'
'../../packages/nativewind/utils/tva'
),
'@gluestack-ui/nativewind-utils': path.resolve(
__dirname,
'../../packages/nativewind/utils/src'
'../../packages/nativewind/utils/'
),
},
},
8 changes: 4 additions & 4 deletions example/storybook-nativewind/package.json
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@
"@geometricpanda/storybook-addon-iframe": "^0.2.2",
"@gluestack-style/react": "^1.0.52",
"@gluestack-ui/config": "^1.1.17",
"@gluestack-ui/themed": "^1.1.14",
"@gluestack/design-system": "^0.5.27",
"@gluestack-ui/themed": "^1.1.15",
"@gluestack/design-system": "^0.5.36",
"@legendapp/motion": "^2.2.0",
"@react-aria/button": "^3.7.0",
"@react-aria/focus": "^3.11.0",
@@ -39,8 +39,8 @@
"@react-aria/overlays": "^3.13.0",
"@react-aria/separator": "^3.3.0",
"@react-aria/utils": "^3.15.0",
"@react-native-aria/button": "^0.2.6",
"@react-native-aria/overlays": "^0.3.10",
"@react-native-aria/button": "^0.2.7",
"@react-native-aria/overlays": "^0.3.12",
"@react-native-aria/separator": "^0.2.6",
"@react-native-async-storage/async-storage": "~1.17.3",
"@react-native-community/datetimepicker": "6.5.2",
Loading

0 comments on commit f54607e

Please sign in to comment.