diff --git a/example/storybook-nativewind/babel.config.js b/example/storybook-nativewind/babel.config.js index f92684484..7671f2a18 100644 --- a/example/storybook-nativewind/babel.config.js +++ b/example/storybook-nativewind/babel.config.js @@ -12,6 +12,11 @@ module.exports = function (api) { 'module-resolver', { alias: { + '@/components/ui/gluestack-ui-provider/providerContext': + path.resolve( + __dirname, + './src/extra-components/storybook-components/useMode.tsx' + ), '@/components/ui': process.env.STYLE_ENGINE === 'nativewind' ? path.resolve(__dirname, './src/core-components/nativewind') diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json index 11fd71835..ae7a2e889 100644 --- a/example/storybook-nativewind/package.json +++ b/example/storybook-nativewind/package.json @@ -52,8 +52,9 @@ "@react-native-community/slider": "4.2.4", "@react-stately/collections": "^3.6.0", "@react-stately/tree": "^3.5.0", - "@unitools/link": "^0.0.4", + "@typescript-eslint/parser": "^8.10.0", "@unitools/image": "^0.0.5", + "@unitools/link": "^0.0.4", "expo": "^47.0.0", "expo-linear-gradient": "^12.3.0", "expo-status-bar": "~1.4.2", @@ -61,6 +62,8 @@ "lucide-react-native": "^0.236.0", "nativewind": "^4.0.36", "next": "^13.5.3", + "prettier": "^3.3.3", + "prettier-standalone": "^1.3.1-0", "prism-react-renderer": "^1.3.5", "re-resizable": "^6.9.11", "react": "^18.2.0", diff --git a/example/storybook-nativewind/public/images/codeblock/assets/android-frame.png b/example/storybook-nativewind/public/images/codeblock/assets/android-frame.png new file mode 100644 index 000000000..196215c5e Binary files /dev/null and b/example/storybook-nativewind/public/images/codeblock/assets/android-frame.png differ diff --git a/example/storybook-nativewind/public/images/codeblock/assets/dark-android-frame.png b/example/storybook-nativewind/public/images/codeblock/assets/dark-android-frame.png new file mode 100644 index 000000000..4a8345bb2 Binary files /dev/null and b/example/storybook-nativewind/public/images/codeblock/assets/dark-android-frame.png differ diff --git a/example/storybook-nativewind/public/images/codeblock/assets/dark-iphone-frame.png b/example/storybook-nativewind/public/images/codeblock/assets/dark-iphone-frame.png new file mode 100644 index 000000000..f3a25d0cc Binary files /dev/null and b/example/storybook-nativewind/public/images/codeblock/assets/dark-iphone-frame.png differ diff --git a/example/storybook-nativewind/public/images/codeblock/assets/iphone-frame.png b/example/storybook-nativewind/public/images/codeblock/assets/iphone-frame.png new file mode 100644 index 000000000..72e9dc1fd Binary files /dev/null and b/example/storybook-nativewind/public/images/codeblock/assets/iphone-frame.png differ diff --git a/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx index ff163646d..7d2a9a9e3 100644 --- a/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx @@ -31,12 +31,12 @@ import colors from 'tailwindcss/colors'; import { transformedCode } from '../../utils'; import { AppProvider, - CodePreview, Table, TableContainer, InlineCode, Tabs } from '@gluestack/design-system'; +import { CodePreview } from '../../extra-components/design-system/CodePreview' import { CollapsibleCode } from '@gluestack/design-system'; import Wrapper from '../../core-components/nativewind/Wrapper'; import AnatomyImage from '../../extra-components/nativewind/AnatomyImage'; @@ -49,7 +49,7 @@ This is an illustration of **Avatar** component. showArgsController = { true} metaData = {{ code: ` - + Jane Doe - + John Doe + Verified @@ -257,7 +256,7 @@ An example of the Badge component being used with the Avatar component to displa metaData={{ code: ` - + SS - + This is the Box diff --git a/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx index 21f8d7cb9..5127863fe 100644 --- a/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx @@ -36,12 +36,12 @@ import { import { transformedCode } from '../../utils'; import { AppProvider, - CodePreview, Table, TableContainer, InlineCode, Tabs } from '@gluestack/design-system'; +import { CodePreview } from '../../extra-components/design-system/CodePreview' import Wrapper from '../../core-components/nativewind/Wrapper'; import { CollapsibleCode } from '@gluestack/design-system'; import colors from 'tailwindcss/colors'; diff --git a/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx index 4206bd5d3..45a98fa37 100644 --- a/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx +++ b/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx @@ -37,7 +37,6 @@ import { } from '../../core-components/nativewind'; import { AppProvider, - CodePreview, Table, TableContainer, InlineCode, @@ -47,6 +46,7 @@ import { transformedCode } from '../../utils'; import Wrapper from '../../core-components/nativewind/Wrapper'; import { CollapsibleCode } from '@gluestack/design-system'; +import { CodePreview } from '../../extra-components/design-system/CodePreview' This is an illustration of a **Card** component. @@ -275,7 +275,7 @@ function App(){ source={{ uri: 'https://images.unsplash.com/photo-1529693662653-9d480530a697?q=80&w=2831&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D', }} - className="mb-6 h-[240px] w-full rounded-md" + className="mb-6 min-h-[160px] max-h-[240px] w-full rounded-md" />