fix(core): extend variants function, destructuring order changed (#1642)

* fix(core): extend variants function, destructuring order changed * chore(core): changeset added
nextui-org · Sep 16, 2023 · f6531c5 · f6531c5 · vercel · Sep 16, 2023
1 parent 37d5f12
commit f6531c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/moody-fans-stare.md b/.changeset/moody-fans-stare.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/system-rsc": patch
+---
+
+Fix #1541 `extendVariants`function gives more priority to final component props over the `extendVariants` props
diff --git a/packages/core/system-rsc/src/extend-variants.js b/packages/core/system-rsc/src/extend-variants.js
@@ -43,7 +43,7 @@ export function extendVariants(BaseComponent, styles = {}, opts = {}) {
   const ForwardedComponent = React.forwardRef((originalProps, ref) => {
     const [baseProps, variantProps] = mapPropsVariants(originalProps, customTv.variantKeys, false);
 
-    const newProps = {...baseProps, ...defaultVariants, ref};
+    const newProps = {...defaultVariants, ...baseProps, ref};
 
     let classNames = {};