Merge pull request #1310 from gluestack/release/@gluestack-ui/themed@…

…1.0.7 Release/@gluestack UI/[email protected]
gluestack · Oct 18, 2023 · 28e0ea6 · 28e0ea6
2 parents 33d4c0d + dfe95c6
commit 28e0ea6
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 33 deletions.
diff --git a/example/storybook/.storybook/main.js b/example/storybook/.storybook/main.js
@@ -47,6 +47,14 @@ module.exports = {
         '../../../packages/themed/src'
       ),
     };
+
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      '@gluestack-ui/config': path.join(
+        __dirname,
+        '../../../packages/config/src/gluestack-ui.config'
+      ),
+    };
     config.module.rules.push({
       test: /\.mjs$/,
       include: /node_modules/,

diff --git a/example/storybook/babel.config.js b/example/storybook/babel.config.js
@@ -10,14 +10,14 @@ module.exports = function (api) {
             'module-resolver',
             {
               alias: {
-                // '@gluestack-ui/themed': path.join(
-                //   __dirname,
-                //   '../../packages/themed/src'
-                // ),
-                // '@gluestack-ui/config': path.join(
-                //   __dirname,
-                //   '../../packages/config/src/gluestack-ui.config'
-                // ),
+                '@gluestack-ui/themed': path.join(
+                  __dirname,
+                  '../../packages/themed/src'
+                ),
+                '@gluestack-ui/config': path.join(
+                  __dirname,
+                  '../../packages/config/src/gluestack-ui.config'
+                ),
                 // '@gluestack-style/react': path.join(
                 //   __dirname,
                 //   '../../../dank-style/packages/react/src'

diff --git a/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx b/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx
@@ -40,7 +40,7 @@ const ActionsheetBasic = ({ showActionsheetProp, ...props }: any) => {
 
   return (
     <Center>
-      <Button onPress={() => setShowActionsheet(true)}>
+      <Button>
         <ButtonText>Open</ButtonText>
       </Button>
       <Actionsheet

diff --git a/example/storybook/src/components/Feedback/Toast/Basic.tsx b/example/storybook/src/components/Feedback/Toast/Basic.tsx
@@ -16,7 +16,7 @@ const ToastPlacement = ({ placement = 'top', ...props }: any) => {
           placement: placement,
           render: ({ id }) => {
             return (
-              <Toast nativeID={id} {...props}>
+              <Toast nativeID={`toast-${id}`} {...props}>
                 <ToastTitle
                   dataSet={{
                     'component-props': JSON.stringify({

diff --git a/example/storybook/src/components/Feedback/Toast/index.stories.mdx b/example/storybook/src/components/Feedback/Toast/index.stories.mdx
@@ -643,7 +643,7 @@ A dismissable Toast component offers users the ability to dismiss or close the t
                   placement: 'top',
                   render: ({ id }) => {
                     return (
-                      <Toast bg='$success700' nativeID={id}>
+                      <Toast bg='$success700' nativeID={`toast-${id}`}>
                         <Icon as={CheckIcon} color='$white' mt='$1' mr='$3' />
                         <VStack space='xs'>
                         <ToastTitle color='$textLight50' >Download Complete</ToastTitle>
@@ -706,7 +706,7 @@ A Toast component with custom duration allows for specifying the length of time
                   duration: duration,
                   render: ({ id }) => {
                     return (
-                      <Toast bg='$secondary700' nativeID={id} p='$3'>
+                      <Toast bg='$secondary700' nativeID={`toast-${id}`} p='$3'>
                         <Icon as={MessageCircle}  color='$white' mt='$1' mr='$3' />
                         <VStack space='xs'>
                         <ToastTitle color='$textLight50'>New Message</ToastTitle>
@@ -774,7 +774,7 @@ A Toast component with preserve toast functionality retains the notification on
                   duration: null,
                   render: ({ id }) => {
                     return (
-                      <Toast bg='$error700' nativeID={id} p='$3'>
+                      <Toast bg='$error700' nativeID={`toast-${id}`} p='$3'>
                         <Icon as={AlertTriangleIcon} color='$white' mt='$1' mr='$3' />
                         <VStack space='xs'>
                         <ToastTitle color='$textLight50' >Account Security Alert</ToastTitle>
@@ -883,7 +883,7 @@ export default () => {
           placement: placement,
           render: ({ id }) => {
             return (
-              <Toast nativeID={id}>
+              <Toast nativeID={`toast-${id}`}>
                 <ToastTitle>Hello World Toast {id}</ToastTitle>
               </Toast>
             );

diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
@@ -0,0 +1,8 @@
+# @gluestack-ui/config
+
+## 1.0.2
+
+### Patch Changes
+
+- `@gluestack-style/react` version upgrade
+  - Typing issue fixes
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/config",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "build/gluestack-ui.config.js",
   "types": "build/gluestack-ui.config.d.ts",
   "module": "build/gluestack-ui.config",
@@ -29,8 +29,8 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@gluestack-style/react": "^1.0.5",
-    "@gluestack-ui/themed": "^1.0.5"
+    "@gluestack-style/react": "^1.0.7",
+    "@gluestack-ui/themed": "^1.0.7"
   },
   "peerDependencies": {
     "@gluestack-style/react": ">=1.0",
@@ -47,6 +47,5 @@
     "github": {
       "release": true
     }
-  },
-  "dependencies": {}
+  }
 }
diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gluestack-ui/themed
 
+## 1.0.7
+
+### Patch Changes
+
+- `@gluestack-style/react` version upgrade
+  - Typing issue fixes
+
 ## 1.0.6
 
 ### Patch Changes

diff --git a/packages/themed/package.json b/packages/themed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/themed",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "module": "build/index",
@@ -70,7 +70,7 @@
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@gluestack-style/react": "^1.0.3",
+    "@gluestack-style/react": "^1.0.7",
     "@types/react-native": "^0.71.6",
     "file-loader": "^6.2.0",
     "react": "^18.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2524,14 +2524,6 @@
   resolved "https://registry.yarnpkg.com/@gluestack-style/legend-motion-animation-driver/-/legend-motion-animation-driver-1.0.2.tgz#051c26b0d501e03b12e4dbfe01b292eee5c29c8f"
   integrity sha512-rB5HIhVzpgPQ9C1JJvY30a1bP0sQRWWFgUHVaiefH8dA/XRAQpmAIMF48JDctrvoBi/tKp5xN10mLE5CtnDRHg==
 
-"@gluestack-style/react@^0.2.54-alpha.3":
-  version "0.2.54-alpha.5"
-  resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.54-alpha.5.tgz#75ef100236ad81a631f247d43a366981ad4fd976"
-  integrity sha512-mFnEym5cXH9ZXqKQ/BVQ5OyCZpIASFxMbjn1nwxidta6azi04lyV8i2rX3NWyoHizgT/Z3cV6R5ORCf5SRDqpw==
-  dependencies:
-    inline-style-prefixer "^6.0.1"
-    normalize-css-color "^1.0.2"
-
 "@gluestack-style/react@^0.2.9":
   version "0.2.43"
   resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.43.tgz#1e1cf0fd9b3ab6d2396453a19feb14ba35575768"
@@ -2540,10 +2532,10 @@
     inline-style-prefixer "^6.0.1"
     normalize-css-color "^1.0.2"
 
-"@gluestack-style/react@^1.0.3":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.5.tgz#80c3255d935cf619eaff3423f182560765bf058e"
-  integrity sha512-zVyt74Tn/uqzo/F9ctYIaYoyggG+oWDw2XfOBDcuCGTwkclvAcprYdXWPDkCvy4aBOfIRUkwlz1qaEgaD40G0w==
+"@gluestack-style/react@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.7.tgz#583fec8b1d15dba3882dccdc0f691de725e47ab7"
+  integrity sha512-a5B/QXmrwmW90nv8Z2kAyb9ARJrrKKLEf8wHge3bsjZVgyY2mW34/9vCOGWS6+5aipMhBQrwYwXXgC3EDA8TRg==
   dependencies:
     inline-style-prefixer "^6.0.1"
     normalize-css-color "^1.0.2"