From 5b186bd5b00d1101f740cc9b22f17b6b6aed8b88 Mon Sep 17 00:00:00 2001 From: Meenu Makkar Date: Thu, 21 Sep 2023 17:37:46 +0530 Subject: [PATCH 1/2] feat: gluestack style anscestor order fixed --- packages/react/src/styled.tsx | 8 ++++---- yarn.lock | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 572bfe8f2..f9b0d8573 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -1733,14 +1733,14 @@ export function verboseStyled( 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 index 6d54f753f..f186a0857 100644 --- 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" From a8ab0acc865cf6f3a215dfa10f69cc0230eb8d20 Mon Sep 17 00:00:00 2001 From: Suraj Date: Thu, 21 Sep 2023 17:39:13 +0530 Subject: [PATCH 2/2] v0.2.51 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 5ea46cbc0..fd9c7fe33 100644 --- 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.2.50", + "version": "0.2.51", "keywords": [ "React Native", "Next.js",