From a46e5e152662616faf1de83ec76ab0c49bb6f8b9 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 8 Nov 2023 12:47:25 +0530 Subject: [PATCH 1/3] fix: descendants compound variants resolution --- packages/react/src/styled.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 92e2573d..2f9c09ba 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -455,7 +455,7 @@ function setStateAndColorModeCssIdsAndProps( passingProps: mergedPassingProps, } = getMergedStateAndColorModeCSSIdsAndProps( //@ts-ignore - componentDescendantStyleIds, + componentDescendantStyleIds[key], componentDescendantFlattenStyleObject[key]?.[ 'componentBaseStyleFlatternStyleIdObject' ], From 7638ee2561df0e81d28a4784ceb1addae9704430 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 8 Nov 2023 13:08:27 +0530 Subject: [PATCH 2/3] v1.0.15 --- packages/react/CHANGELOG.md | 6 ++++++ packages/react/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 682382ba..722b7c9c 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -1,5 +1,11 @@ # @gluestack-style/react +## 1.0.15 + +### Patch Changes + +- Fixed descendants compound variant resolution [PR](https://github.com/gluestack/gluestack-style/pull/526) + ## 1.0.14 ### Patch Changes diff --git a/packages/react/package.json b/packages/react/package.json index 5a08558d..c7d56163 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": "1.0.14", + "version": "1.0.15", "keywords": [ "React Native", "Next.js", From 6310c998cb7deb1aad38ffd7a686c370e88ad071 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 8 Nov 2023 13:57:23 +0530 Subject: [PATCH 3/3] fix: descendants compound variants resolution --- packages/react/src/styled.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 2f9c09ba..75dfc3ed 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -492,7 +492,7 @@ function setStateAndColorModeCssIdsAndProps( passingProps: mergedPassingProps, } = getMergedStateAndColorModeCSSIdsAndProps( //@ts-ignore - sxDescendantStyleIds.current, + sxDescendantStyleIds.current[key], sxDescendantFlattenStyleObject[key]?.[ 'componentBaseStyleFlatternStyleIdObject' ],