fix(system-rsc): extendVariants with defaultVariants (#3299)

nextui-org · Jun 22, 2024 · f785d1f · f785d1f
1 parent 6951b1f
commit f785d1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/clever-cherries-watch.md b/.changeset/clever-cherries-watch.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/system-rsc": patch
+---
+
+fixed `extendVariants` when having `defaultVariants` (#3009)
diff --git a/packages/core/system-rsc/src/extend-variants.js b/packages/core/system-rsc/src/extend-variants.js
@@ -31,22 +31,30 @@ function getClassNamesWithProps({
   hasSlots,
   opts,
 }) {
-  // Do not apply default variants when the props variant is different
+  const keys = [];
+
   if (defaultVariants && typeof defaultVariants === "object") {
     for (const key in defaultVariants) {
       const value = defaultVariants[key];
       const propValue = props?.[key];
 
       if (propValue && propValue !== value) {
-        delete defaultVariants[key];
+        keys.push(key);
       }
     }
   }
 
   const customTv = tv(
     {
       variants,
-      defaultVariants,
+      // Do not apply default variants when the props variant is different
+      defaultVariants: Object.keys(defaultVariants)
+        .filter((k) => !keys.includes(k))
+        .reduce((o, k) => {
+          o[k] = defaultVariants[k];
+
+          return o;
+        }, []),
       compoundVariants,
       ...(hasSlots && {slots}),
     },