fix: fix className type

gregberge · Dec 25, 2023 · 0383b5d · 0383b5d
1 parent a5bd67b
commit 0383b5d
Show file tree

Hide file tree

Showing 4 changed files with 224 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
   },
   "devDependencies": {
     "@ampproject/filesize": "^4.3.0",
+    "@radix-ui/react-accordion": "^1.1.2",
     "@swc/core": "^1.3.101",
     "@testing-library/react": "^14.1.2",
     "@types/react": "^18.2.42",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.test.tsx b/src/index.test.tsx
@@ -8,6 +8,7 @@ import {
   Button as AriaButton,
   ButtonProps as AriaButtonProps,
 } from "react-aria-components";
+import * as AccordionPrimitive from "@radix-ui/react-accordion";
 
 describe("twc", () => {
   beforeEach(cleanup);
@@ -226,4 +227,11 @@ describe("twc", () => {
     expect(button.classList.contains("bg-gray-700")).toBe(true);
     expect(button.classList.contains("opacity-35")).toBe(true);
   });
+
+  test("props are correctly typed", () => {
+    const Accordion = twc(AccordionPrimitive.Root)<
+      React.ComponentProps<typeof AccordionPrimitive.Root>
+    >`py-2`;
+    render(<Accordion type="single" collapsible></Accordion>);
+  });
 });
diff --git a/src/index.tsx b/src/index.tsx
@@ -100,7 +100,7 @@ function filterProps(
 
 type Attributes = Record<string, any> | ((props: any) => Record<string, any>);
 
-export const createTwc = <TCompose extends AbstractCompose>(
+export const createTwc = <TCompose extends AbstractCompose = typeof clsx>(
   config: Config<TCompose> = {},
 ) => {
   const compose = config.compose || clsx;