fix: as props spepcificity

gluestack · Sep 6, 2023 · 1c0cbe6 · 1c0cbe6
1 parent 30662e5
commit 1c0cbe6
Showing 1 changed file with 2 additions and 6 deletions.
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') {