Merge pull request #449 from gluestack/fix/context-styles

feat: gluestack style anscestor order fixed
gluestack · Sep 21, 2023 · 86d12ba · 86d12ba
2 parents 2de002e + 5b186bd
commit 86d12ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx
@@ -1765,14 +1765,14 @@ export function verboseStyled<P, Variants, ComCon>(
           ancestorStyleContext
         ) {
           const sxDescendantCSSIds = mergeArraysInObjects(
+            ancestorStyleContext.sx,
             applySxDescendantStyleCSSIdsAndPropsWithKey.current,
-            applySxDescendantStateStyleCSSIdsAndPropsWithKey.current,
-            ancestorStyleContext.component
+            applySxDescendantStateStyleCSSIdsAndPropsWithKey.current
           );
           const componentDescendantCSSIds = mergeArraysInObjects(
+            ancestorStyleContext.component,
             applyDescendantsStyleCSSIdsAndPropsWithKey,
-            applyDescendantStateStyleCSSIdsAndPropsWithKey,
-            ancestorStyleContext.sx
+            applyDescendantStateStyleCSSIdsAndPropsWithKey
           );
 
           return {

diff --git a/yarn.lock b/yarn.lock
@@ -2505,14 +2505,6 @@
     inline-style-prefixer "^6.0.1"
     normalize-css-color "^1.0.2"
 
-"@gluestack-style/react@^0.2.11-alpha.0", "@gluestack-style/react@^0.2.16", "@gluestack-style/react@^0.2.21":
-  version "0.2.46"
-  resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.46.tgz#c408f4c05a7374690c8ebd952aa95b0a1d390c4e"
-  integrity sha512-ujpOIrt/b08svtUSLn4wSCn548H7lIe3oHlBCTHwDvmjheuVsXyIrECtNBA+mrL5mtkCaBmkB9iUJTWD601V+A==
-  dependencies:
-    inline-style-prefixer "^6.0.1"
-    normalize-css-color "^1.0.2"
-
 "@gluestack-ui/actionsheet@^0.2.16", "@gluestack-ui/actionsheet@^0.2.7", "@gluestack-ui/actionsheet@latest":
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.16.tgz#052a733966c517450a3cd6f832932ccf77924867"