diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx index 9b571791..5fa314ef 100644 --- a/src/components/ui/Button.tsx +++ b/src/components/ui/Button.tsx @@ -1,5 +1,5 @@ import { Slot } from "@radix-ui/react-slot"; -import * as React from "react"; +import { ButtonHTMLAttributes, forwardRef } from "react"; import { cva, VariantProps } from "^/lib/cva"; export const buttonVariants = cva( @@ -33,12 +33,12 @@ export const buttonVariants = cva( ); export interface ButtonProps - extends React.ButtonHTMLAttributes, + extends ButtonHTMLAttributes, VariantProps { asChild?: boolean; } -const Button = React.forwardRef( +const Button = forwardRef( ({ className, variant, size, asChild = false, ...props }, ref) => { const Comp = asChild ? Slot : "button"; return ( diff --git a/src/components/ui/Stack.tsx b/src/components/ui/Stack.tsx index 470de9e9..ef38b095 100644 --- a/src/components/ui/Stack.tsx +++ b/src/components/ui/Stack.tsx @@ -1,4 +1,4 @@ -import { forwardRef } from "react"; +import { forwardRef, HTMLAttributes } from "react"; import { cva, VariantProps } from "^/lib/cva"; const stackVariants = cva("flex", { @@ -30,7 +30,7 @@ const stackVariants = cva("flex", { }); export interface StackProps - extends React.HTMLAttributes, + extends HTMLAttributes, VariantProps {} const Stack = forwardRef(