Merge pull request #2292 from gluestack/main

Backmerge Main -> Patch
gluestack · Jul 12, 2024 · 3ef4121 · 3ef4121
2 parents a93b3b8 + 54e2461
commit 3ef4121
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 28 deletions.
diff --git a/.changeset/few-rules-refuse.md b/.changeset/few-rules-refuse.md
diff --git a/example/storybook-nativewind/.storybook/preview.js b/example/storybook-nativewind/.storybook/preview.js
@@ -95,7 +95,7 @@ export const parameters = {
           'Recipes',
           ['Linear Gradient'],
           'More',
-          ['FAQ', 'Releases', 'Roadmap', 'Troubleshooting'],
+          ['FAQs', 'Releases', 'Roadmap', 'Troubleshooting'],
         ],
       ],
       icons: [

diff --git 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.34",
+    "@gluestack-ui/themed": "^1.1.35",
     "@gluestack/design-system": "^0.5.36",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.10",
     "@legendapp/motion": "^2.2.0",

diff --git a/.../src/guides/more/FAQ/index.nw.stories.mdx → ...src/guides/more/FAQs/index.nw.stories.mdx b/.../src/guides/more/FAQ/index.nw.stories.mdx → ...src/guides/more/FAQs/index.nw.stories.mdx
@@ -1,7 +1,7 @@
 ---
-title: Roadmap | gluestack-ui
+title: FAQs | gluestack-ui
 
-description: To stay updated on upcoming features, improvements, and innovations.
+description: FAQs.
 
 ---
 
@@ -13,9 +13,9 @@ import {
 } from '@gluestack/design-system';
 
 
-<Meta title="with-nativewind/Guides/More/FAQ" />
+<Meta title="with-nativewind/Guides/More/FAQs" />
 
-# FAQ
+# FAQs
 
 ## Migration and Compatibility
 

diff --git a/example/storybook-nativewind/src/home/overview/Introduction/index.nw.stories.mdx b/example/storybook-nativewind/src/home/overview/Introduction/index.nw.stories.mdx
@@ -105,9 +105,3 @@ Stay updated about our company and collaborate on enterprise-level projects.
 ## All Components
 
 Explore 30+ components for React, Next.js & React Native [See All](/ui/docs/components/all-components).
-
-# FAQs
-
-### What are the new components in the pipeline?
-
-We're currently working on adding new components which include Table, Tabs and many more. We've already prepared API drafts for some of these components, which you can find in our documentation. You can check out our new component development roadmap [here](/ui/docs/home/more/roadmap).
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -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.34",
-    "@gluestack-ui/toast": "1.0.5",
+    "@gluestack-ui/themed": "1.1.35",
+    "@gluestack-ui/toast": "1.0.6",
     "@gluestack-ui/tooltip": "0.1.31",
     "@legendapp/motion": "latest"
   },
   "peerDependencies": {
     "@gluestack-style/react": ">=1.0.57",
-    "@gluestack-ui/themed": ">=1.1.34"
+    "@gluestack-ui/themed": ">=1.1.35"
   },
   "release-it": {
     "git": {

diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gluestack-ui/themed
 
+## 1.1.35
+
+### Patch Changes
+
+- Updated dependencies
+  - @gluestack-ui/toast@1.0.6
+
 ## 1.1.34
 
 ### Patch Changes

diff --git a/packages/themed/package.json b/packages/themed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/themed",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "module": "build/index",
@@ -65,7 +65,7 @@
     "@gluestack-ui/switch": "0.1.22",
     "@gluestack-ui/tabs": "0.1.16",
     "@gluestack-ui/textarea": "0.1.23",
-    "@gluestack-ui/toast": "1.0.5",
+    "@gluestack-ui/toast": "1.0.6",
     "@gluestack-ui/tooltip": "0.1.31",
     "@legendapp/motion": "latest"
   },

diff --git a/packages/unstyled/toast/CHANGELOG.md b/packages/unstyled/toast/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @gluestack-ui/toast
 
+## 1.0.6
+
+### Patch Changes
+
+- ### Fixes
+
+  - Fixed `isActive` always returning false by [Andrew M](https://github.com/evelant).
+  - Removed almost all instances of `any`, replaced with actual types by [Andrew M](https://github.com/evelant).
+  - Fixed duplicate toasts when calling `show` with an existing id by [Andrew M](https://github.com/evelant).
+  - Removed unnecessary `@ts-ignore` usages by [Andrew M](https://github.com/evelant).
+
 ## 1.0.5
 
 ### Patch Changes

diff --git a/packages/unstyled/toast/package.json b/packages/unstyled/toast/package.json
@@ -15,7 +15,7 @@
     "ios",
     "nextjs"
   ],
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",