Merge pull request #48 from kivvvvv/fix/component-props-from-attrs-sh…

…ould-respect-transient-props

fix component props from attrs not respecting provided transient props

.github/composite-actions/install/action.yml

@@ -4,9 +4,9 @@ description: "Sets up Node.js and runs install"
 runs:
   using: composite
   steps:
-    - uses: pnpm/action-setup@v2.2.4
+    - uses: pnpm/action-setup@v4
       with:
-        version: 8
+        version: 9
 
     - name: Setup Node.js
       uses: actions/setup-node@v3

src/index.test.tsx

@@ -279,4 +279,20 @@ describe("twc", () => {
     expect(svg).toBeDefined();
     expect(svg.tagName).toBe("SVG");
   });
+
+  test("component props from attrs should respect provided transient props", () => {
+    type ButtonProps = TwcComponentProps<"button"> & {
+      variant: "primary" | "secondary";
+    };
+    const Button = twc.button
+      .transientProps(["variant"])
+      .attrs<ButtonProps>(({ type = "button", variant }) => {
+        expect(variant).toBe("primary");
+        return { type };
+      })`text-xl`;
+    render(<Button data-testid="button" variant="primary" />);
+
+    const renderedButton = screen.getByTestId("button");
+    expect(renderedButton.getAttribute("variant")).toBeNull();
+  });
 });

src/index.tsx

@@ -171,7 +171,7 @@ export const createTwc = <TCompose extends AbstractCompose = typeof clsx>(
 
       if (attrs === undefined) {
         template.attrs = (attrs: Attributes) => {
-          return createTemplate(attrs);
+          return createTemplate(attrs, shouldForwardProp);
         };
       }