Merge pull request #1908 from gluestack/release/@gluestack-style/reac…

…[email protected] Release/@gluestack style/[email protected]
gluestack · Mar 6, 2024 · c507e0c · c507e0c
2 parents 0926977 + 9d2d310
commit c507e0c
Show file tree

Hide file tree

Showing 335 changed files with 14,671 additions and 4,048 deletions.
diff --git a/.github/workflows/auto-assign-pr.yml → .github/workflows/auto-assign-pr.yml_old b/.github/workflows/auto-assign-pr.yml → .github/workflows/auto-assign-pr.yml_old
diff --git a/.github/workflows/trigger-ui-update-docs.yml b/.github/workflows/trigger-ui-update-docs.yml
@@ -0,0 +1,25 @@
+name: Trigger gluestack-style-website | Create PR when pushed to master
+
+on:
+  pull_request:
+    branches:
+      - patch
+
+jobs:
+  build:
+    name: Dispatch to 'gluestack-style-website'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Emit repository_dispatch
+        uses: mvasigh/dispatch-action@main
+        with:
+          # You should create a personal access token and store it in your repository
+          token: ${{ secrets.MY_GITHUB_TOKEN }}
+          repo: ui-website
+          owner: gluestack
+          event_type: build_ui_docs
+          message: |
+            {
+              "repo": "ui",
+              "branch": "${{ github.head_ref }}"
+            }
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,2 @@
 node_modules
-
+*.mdx
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,7 +17,13 @@
   "prettier.ignorePath": ".prettierignore",
   // If true, puts the `>` of a multi-line jsx element at the end of the last line instead of being alone on the next line
   "editor.wordWrap": "on",
-  "cSpell.words": ["Actionsheet", "gluestack", "nativewind", "themeable"],
+  "cSpell.words": [
+    "Actionsheet",
+    "gluestack",
+    "nativewind",
+    "tailwindcss",
+    "themeable"
+  ],
   "cSpell.enableFiletypes": ["mdx"],
   "tailwindCSS.experimental.classRegex": [
     ["tva\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]

diff --git a/example/storybook-nativewind/.storybook/preview.js b/example/storybook-nativewind/.storybook/preview.js
@@ -3,12 +3,12 @@ import { DocsContainer } from '@storybook/addon-docs/blocks';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
 
-import { GluestackUIProvider as GluestackUIWithNativewindProvider } from '../src/components-example/nativewind/GluestackUIProvider';
+import { GluestackUIProvider as GluestackUIWithNativewindProvider } from '../src/core-components/nativewind/gluestack-ui-provider';
 
 // global css getting resolved from babel.config.js
 import 'global.css';
 
-import { GluestackUIProvider as GluestackUIWithGluestackStyleProvider } from '../src/components-example/themed/GluestackUIProvider';
+import { GluestackUIProvider as GluestackUIWithGluestackStyleProvider } from '../src/core-components/themed/gluestack-ui-provider';
 
 import gstheme from './gstheme';
 import { themes } from '@storybook/theming';
@@ -45,24 +45,26 @@ export const parameters = {
           'Feedback',
           ['Alert', 'Progress', 'Spinner', 'Toast'],
           'Data Display',
-          ['Badge'],
+          ['Badge', 'Card'],
           'Forms',
           [
             'Button',
             'Checkbox',
             'FormControl',
+            'Input',
             'Link',
             'Pressable',
             'Radio',
             'Slider',
             'Switch',
+            'Textarea',
           ],
           'Overlay',
           ['AlertDialog', 'Modal', 'Popover', 'Tooltip'],
           'Disclosure',
           ['Actionsheet', 'Accordion'],
           'Media And Icons',
-          ['Avatar', 'Image'],
+          ['Avatar', 'Image', 'Icon'],
           'Others',
           ['Fab'],
         ],

diff --git a/example/storybook-nativewind/babel.config.js b/example/storybook-nativewind/babel.config.js
@@ -14,8 +14,8 @@ module.exports = function (api) {
           alias: {
             '@/components/ui':
               process.env.STYLE_ENGINE === 'nativewind'
-                ? path.resolve(__dirname, './src/components-example/nativewind')
-                : path.resolve(__dirname, './src/components-example/themed'),
+                ? path.resolve(__dirname, './src/core-components/nativewind')
+                : path.resolve(__dirname, './src/core-components/themed'),
 
             'global.css':
               process.env.STYLE_ENGINE === 'nativewind'
@@ -46,6 +46,10 @@ module.exports = function (api) {
               __dirname,
               '../../packages/unstyled/button/src'
             ),
+            '@gluestack-ui/link': path.resolve(
+              __dirname,
+              '../../packages/unstyled/link/src'
+            ),
             '@gluestack-ui/accordion': path.resolve(
               __dirname,
               '../../packages/unstyled/accordion/src'

diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json
@@ -27,7 +27,7 @@
     "@expo/html-elements": "^0.4.2",
     "@expo/webpack-config": "^0.17.2",
     "@geometricpanda/storybook-addon-iframe": "^0.2.2",
-    "@gluestack-style/react": "^1.0.26",
+    "@gluestack-style/react": "^1.0.49",
     "@gluestack-ui/config": "^1.1.10",
     "@gluestack-ui/themed": "^1.1.8",
     "@gluestack/design-system": "^0.5.27",