Skip to content

feat: add support for icons and warning variant in Badge component #17350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 11, 2025
Merged

feat: add support for icons and warning variant in Badge component #17350

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
799f61e
feat: update badge to support icons and warning variant
jaaydenh Apr 10, 2025
a07d4d0
fix: format
jaaydenh Apr 10, 2025
2e26fc2
chore: add stories
jaaydenh Apr 10, 2025
4cd8de2
Merge branch 'main' into jaaydenh/badge-update
jaaydenh Apr 11, 2025
b17ed7d
Merge branch 'main' into jaaydenh/badge-update
jaaydenh Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: format
  • Loading branch information
@jaaydenh
jaaydenh committed Apr 10, 2025
commit a07d4d0843f78f39412a850c0910fdeda7fa3053
10 changes: 5 additions & 5 deletions site/src/components/Badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Copied from shadc/ui on 11/13/2024
* @see {@link https://ui.shadcn.com/docs/components/badge}
*/
import { type VariantProps, cva } from "class-variance-authority";
import { forwardRef } from "react";
import { Slot } from "@radix-ui/react-slot";
import { type VariantProps, cva } from "class-variance-authority";
import { forwardRef } from "react";
import { cn } from "utils/cn";

export const badgeVariants = cva(
Expand Down Expand Up @@ -34,12 +34,12 @@ export const badgeVariants = cva(
export interface BadgeProps
extends React.HTMLAttributes<HTMLDivElement>,
VariantProps<typeof badgeVariants> {
asChild?: boolean;
}
asChild?: boolean;
}

export const Badge = forwardRef<HTMLDivElement, BadgeProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "div"
const Comp = asChild ? Slot : "div";

return (
<Comp
Expand Down