From 1c0cbe6d24251fdf1391a8a569243038f142d3bd Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 6 Sep 2023 19:45:01 +0530 Subject: [PATCH 1/2] fix: as props spepcificity --- packages/react/src/styled.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index c534a509b..eba8b706b 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -704,8 +704,8 @@ export function getVariantProps( variantProps[variant] = props[variant]; restProps = { - ...restProps, ...theme?.variants[variant][props[variant]]?.props, + ...restProps, }; if (shouldDeleteVariants) { @@ -924,7 +924,6 @@ export function verboseStyled( const NewComp = ( { - as, children, //@ts-ignore orderedResolved: BUILD_TIME_ORDERED_RESOLVED = [], @@ -1722,10 +1721,7 @@ export function verboseStyled( // activeTheme ); const AsComp: any = - (as as any) || - resolvedStyleProps.as || - (passingProps.as as any) || - undefined; + resolvedStyleProps.as || (passingProps.as as any) || undefined; let resolvedStyleMemo = [passingProps?.style, ...resolvedStyleProps?.style]; if (Platform.OS === 'web') { From 240924f20534d391b63d0b8ae1e84bdeea2a1dc1 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 6 Sep 2023 19:45:32 +0530 Subject: [PATCH 2/2] v0.2.2 --- packages/babel-plugin-styled-resolver/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-plugin-styled-resolver/package.json b/packages/babel-plugin-styled-resolver/package.json index c2ec716c4..a0948d850 100644 --- a/packages/babel-plugin-styled-resolver/package.json +++ b/packages/babel-plugin-styled-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@gluestack-style/babel-plugin-styled-resolver", - "version": "0.2.2-alpha.1", + "version": "0.2.2", "description": "A gluestack-style babel plugin that transpiles your styled function calls and resolves the component styling in build time.", "keywords": [ "css-in-js",