fix: theme passing props

gluestack · Oct 18, 2023 · 93599d6 · 93599d6
1 parent 3ea1418
commit 93599d6
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx
@@ -1198,7 +1198,7 @@ export function verboseStyled<P, Variants, ComCon>(
 
     const {
       variantProps: defaultVariantProps,
-      restProps: defaultComponentPropsWithoutVariants,
+      restProps: defaultThemePropsWithoutVariants,
     } = getVariantProps(themeDefaultProps, theme);
 
     const {
@@ -1384,7 +1384,7 @@ export function verboseStyled<P, Variants, ComCon>(
     const defaultResolvedInlineProps = resolveInlineProps(
       componentStyleConfig,
       componentExtendedConfig,
-      defaultComponentPropsWithoutVariants,
+      defaultThemePropsWithoutVariants,
       CONFIG
     );
 
@@ -1404,17 +1404,19 @@ export function verboseStyled<P, Variants, ComCon>(
 
     const { sx: filteredComponentSx, rest: filteredComponentRemainingProps } =
       convertUtiltiyToSXFromProps(
-        Object.assign(
-          defaultComponentPropsWithoutVariants,
-          inlineComponentPropsWithoutVariants
-        ),
+        // Object.assign(
+        //   defaultThemePropsWithoutVariants,
+        inlineComponentPropsWithoutVariants,
         styledSystemProps,
         componentStyleConfig
       );
 
     let { sx: filteredPassingSx, rest: filteredPassingRemainingProps } =
       convertUtiltiyToSXFromProps(
-        shallowMerge({ ...passingProps }, applyAncestorPassingProps),
+        shallowMerge(
+          { ...defaultThemePropsWithoutVariants, ...passingProps },
+          applyAncestorPassingProps
+        ),
         styledSystemProps,
         componentStyleConfig
       );