Merge branch 'patch' of github.com:gluestack/gluestack-ui into patch

gluestack · Jul 12, 2024 · 3a0845c · 3a0845c
2 parents dca911d + 586060c
commit 3a0845c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
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.36",
+    "@gluestack-ui/themed": "^1.1.37",
     "@gluestack/design-system": "^0.5.36",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.10",
     "@legendapp/motion": "^2.2.0",

diff --git a/example/storybook-nativewind/src/core-components/nativewind/toast/index.tsx b/example/storybook-nativewind/src/core-components/nativewind/toast/index.tsx
@@ -28,7 +28,7 @@ cssInterop(UIToast.Title, { className: 'style' });
 cssInterop(UIToast.Description, { className: 'style' });
 
 const toastStyle = tva({
-  base: 'p-4 m-3 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
+  base: 'p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
   variants: {
     action: {
       error: 'bg-error-700',

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.36",
-    "@gluestack-ui/toast": "1.0.6",
+    "@gluestack-ui/themed": "1.1.37",
+    "@gluestack-ui/toast": "1.0.7",
     "@gluestack-ui/tooltip": "0.1.32",
     "@legendapp/motion": "latest"
   },
   "peerDependencies": {
     "@gluestack-style/react": ">=1.0.57",
-    "@gluestack-ui/themed": ">=1.1.36"
+    "@gluestack-ui/themed": ">=1.1.37"
   },
   "release-it": {
     "git": {

diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gluestack-ui/themed
 
+## 1.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @gluestack-ui/toast@1.0.7
+
 ## 1.1.36
 
 ### 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.36",
+  "version": "1.1.37",
   "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.6",
+    "@gluestack-ui/toast": "1.0.7",
     "@gluestack-ui/tooltip": "0.1.32",
     "@legendapp/motion": "latest"
   },

diff --git a/packages/unstyled/toast/CHANGELOG.md b/packages/unstyled/toast/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-ui/toast
 
+## 1.0.7
+
+### Patch Changes
+
+- - Fixed toast animation
+
 ## 1.0.6
 
 ### 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.6",
+  "version": "1.0.7",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",

diff --git a/packages/unstyled/toast/src/ToastList.tsx b/packages/unstyled/toast/src/ToastList.tsx
@@ -113,6 +113,15 @@ export const ToastList = () => {
                           opacity: 1,
                           y: 0,
                         }}
+                        exit={{
+                          opacity: 0,
+                          y: transitionConfig[position],
+                        }}
+                        transition={{
+                          type: 'timing',
+                          duration: 150,
+                        }}
+                        key={toast.id}
                         {...toast.config?.containerStyle}
                         style={{ pointerEvents: 'box-none' }}
                       >