eny.space Landingpage
Merge branch 'fix/vercel-build' into feature/dashboard
+43
-38
+22
-18
app/actions/components/ui/badge.tsx
+22
-18
app/actions/components/ui/badge.tsx
···
1
1
import * as React from "react"
2
2
import { cva, type VariantProps } from "class-variance-authority"
3
-
import { Slot } from "radix-ui"
3
+
import { Slot } from "@radix-ui/react-slot"
4
4
5
5
import { cn } from "@/actions/lib/utils"
6
6
···
27
27
}
28
28
)
29
29
30
-
function Badge({
31
-
className,
32
-
variant = "default",
33
-
asChild = false,
34
-
...props
35
-
}: React.ComponentProps<"span"> &
36
-
VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
37
-
const Comp = asChild ? Slot.Root : "span"
30
+
type BadgeProps = React.HTMLAttributes<HTMLSpanElement> &
31
+
VariantProps<typeof badgeVariants> & {
32
+
asChild?: boolean
33
+
}
38
34
39
-
return (
40
-
<Comp
41
-
data-slot="badge"
42
-
data-variant={variant}
43
-
className={cn(badgeVariants({ variant }), className)}
44
-
{...props}
45
-
/>
46
-
)
47
-
}
35
+
const Badge = React.forwardRef<HTMLSpanElement, BadgeProps>(
36
+
({ className, variant = "default", asChild = false, ...props }, ref) => {
37
+
const Comp = asChild ? Slot : "span"
38
+
39
+
return (
40
+
<Comp
41
+
data-slot="badge"
42
+
data-variant={variant}
43
+
className={cn(badgeVariants({ variant }), className)}
44
+
ref={ref}
45
+
{...props}
46
+
/>
47
+
)
48
+
}
49
+
)
50
+
51
+
Badge.displayName = "Badge"
48
52
49
53
export { Badge, badgeVariants }