fix(system-rsc): extendVariants typescript type (#4291)

* fix: ReactElement type * fix: extendVariants forwardRef return type * feat: add changeset * chore(changeset): change to patch --------- Co-authored-by: աӄա <wingkwong.code@gmail.com>
heroui-inc · Dec 17, 2024 · 1b2553a · 1b2553a
1 parent d9a55d0
commit 1b2553a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.changeset/twelve-ducks-thank.md b/.changeset/twelve-ducks-thank.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/system-rsc": patch
+---
+
+Fix data type returned by the extendVariants function (#4269)
diff --git a/packages/core/system-rsc/src/extend-variants.d.ts b/packages/core/system-rsc/src/extend-variants.d.ts
@@ -1,5 +1,11 @@
 import type {ClassValue, StringToBoolean, OmitUndefined, ClassProp} from "tailwind-variants";
-import type {ForwardRefRenderFunction, JSXElementConstructor, ReactElement} from "react";
+import type {
+  ForwardRefExoticComponent,
+  JSXElementConstructor,
+  PropsWithoutRef,
+  ReactElement,
+  RefAttributes,
+} from "react";
 
 type SlotsClassValue<S> = {
   [K in keyof S]?: ClassValue;
@@ -90,13 +96,13 @@ export type ExtendVariants = {
       slots?: S;
     },
     opts?: Options,
-  ): ForwardRefRenderFunction<
-    ReactElement,
-    {
+  ): ForwardRefExoticComponent<
+    PropsWithoutRef<{
       [key in keyof CP | keyof V]?:
         | (key extends keyof CP ? CP[key] : never)
         | (key extends keyof V ? StringToBoolean<keyof V[key]> : never);
-    }
+    }> &
+      RefAttributes<ReactElement>
   >;
 };