Merge pull request #296 from gluestack/release/@gluestack-style/react…

…@0.1.28 Release/@gluestack style/[email protected]
gluestack · Jun 30, 2023 · e666b4e · e666b4e
2 parents 10e7a2a + 56f451e
commit e666b4e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/example/babel-plugin-styled-resolver-expo/package.json b/example/babel-plugin-styled-resolver-expo/package.json
@@ -11,7 +11,7 @@
     "build": "bob build"
   },
   "dependencies": {
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "expo": "~47.0.8",
     "expo-status-bar": "~1.4.2",
     "find-yarn-workspace-root": "^2.0.0"
@@ -27,10 +27,10 @@
     "babel-plugin-relative-path-import": "^2.0.1",
     "ts-loader": "~8.2.0",
     "typescript": "^4.6.3",
-    "@gluestack-style/react": "^0.1.27"
+    "@gluestack-style/react": "^0.1.28"
   },
   "peerDependencies": {
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "react": "*",
     "react-dom": "*",
     "react-native": "*",

diff --git a/example/expo-app/package.json b/example/expo-app/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@gluestack-style/babel-plugin-styled-resolver": "^0.1.0",
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "expo": "~47.0.12",
     "expo-status-bar": "~1.4.2",
     "react": "18.1.0",

diff --git a/example/next/package.json b/example/next/package.json
@@ -23,7 +23,7 @@
     "react-native-vector-icons": "^9.1.0",
     "react-native-vector-icons-for-web": "^0.1.7",
     "react-native-web-linear-gradient": "^1.1.2",
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "@gluestack-style/babel-plugin-styled-resolver": "^0.1.6"
   },
   "devDependencies": {

diff --git a/example/storybook/package.json b/example/storybook/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@gluestack-style/animation-plugin": "^0.1.7",
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "@gluestack/design-system": "latest",
     "@legendapp/motion": "^2.2.0",
     "@react-native-async-storage/async-storage": "~1.17.3",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@gluestack-style/animation-plugin": "^0.1.7",
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "@storybook/addon-actions": "^6.5.14",
     "@storybook/addon-controls": "^6.5.14",
     "@storybook/addon-docs": "^6.5.15",
@@ -69,7 +69,7 @@
     "typescript": "4.9.4"
   },
   "peerDependencies": {
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "react": "*",
     "react-dom": "*",
     "react-native": "*",

diff --git a/packages/benchmark-next/package.json b/packages/benchmark-next/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@gluestack-style/babel-plugin-styled-resolver": "^0.1.6",
-    "@gluestack-style/react": "^0.1.27",
+    "@gluestack-style/react": "^0.1.28",
     "@emotion/styled": "^11.3.0",
     "@expo/next-adapter": "^4.0.13",
     "@types/react": "17.0.1",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-style/react
 
+## 0.1.28
+
+### Patch Changes
+
+- - Global style merging issue fixes
+
 ## 0.1.27
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@gluestack-style/react",
   "description": "A universal & performant styling library for React Native, Next.js & React",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx
@@ -604,7 +604,8 @@ export function verboseStyled<P, Variants>(
       theme = {
         ...theme,
         baseStyle: {
-          ...deepMerge(globalStyle?.baseStyle, theme.baseStyle),
+          ...globalStyle?.baseStyle,
+          ...theme.baseStyle,
         },
         //@ts-ignore
         compoundVariants: [