Merge pull request #400 from gluestack/release/@gluestack-style/babel…

…[email protected] Release/@gluestack style/babel plugin styled [email protected]
gluestack · Sep 6, 2023 · 53d4af4 · 53d4af4
2 parents 6476e78 + 240924f
commit 53d4af4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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",

diff --git 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<P, Variants, ComCon>(
 
   const NewComp = (
     {
-      as,
       children,
       //@ts-ignore
       orderedResolved: BUILD_TIME_ORDERED_RESOLVED = [],
@@ -1722,10 +1721,7 @@ export function verboseStyled<P, Variants, ComCon>(
       // 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') {