diff --git a/.changeset/sharp-bobcats-happen.md b/.changeset/sharp-bobcats-happen.md new file mode 100644 index 0000000000..b4345443fb --- /dev/null +++ b/.changeset/sharp-bobcats-happen.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/system-rsc": patch +--- + +handled defaultVariants null case in extendVariants (#3502) diff --git a/packages/core/system-rsc/src/extend-variants.js b/packages/core/system-rsc/src/extend-variants.js index 27387cdf9a..21145d34a7 100644 --- a/packages/core/system-rsc/src/extend-variants.js +++ b/packages/core/system-rsc/src/extend-variants.js @@ -47,14 +47,17 @@ function getClassNamesWithProps({ const customTv = tv( { variants, - // 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; - }, []), + defaultVariants: + defaultVariants && typeof defaultVariants === "object" + ? // Do not apply default variants when the props variant is different + Object.keys(defaultVariants) + .filter((k) => !keys.includes(k)) + .reduce((o, k) => { + o[k] = defaultVariants[k]; + + return o; + }, []) + : defaultVariants, compoundVariants, ...(hasSlots && {slots}), },