@health-samurai/react-components 0.0.0-alpha.4 → 0.0.0-alpha.6

package/src/shadcn/components/ui/badge.tsx

@@ -4,26 +4,75 @@ import type * as React from "react";
 
 import { cn } from "#shadcn/lib/utils";
 
-const badgeVariants = cva(
-	"inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",
-	{
-		variants: {
-			variant: {
-				default:
-					"border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
-				secondary:
-					"border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
-				destructive:
-					"border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
-				outline:
-					"text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
-			},
-		},
-		defaultVariants: {
-			variant: "default",
+// Base badge styles
+const baseBadgeStyles = cn(
+	// Layout
+	"inline-flex",
+	"items-center",
+	"justify-center",
+	"w-fit",
+	"whitespace-nowrap",
+	"shrink-0",
+	"gap-1",
+	"overflow-hidden",
+	// Shape
+	"rounded-md",
+	// Borders
+	"border",
+	// Spacing
+	"px-2",
+	"py-0.5",
+	// Typography
+	"text-xs",
+	"font-medium",
+	// SVG
+	"[&>svg]:size-3",
+	"[&>svg]:pointer-events-none",
+	// Transitions
+	"transition-[color,box-shadow]",
+	// Focus
+	"focus-visible:ring-2",
+	"focus-visible:ring-utility-blue/70",
+	// Invalid
+	"aria-invalid:ring-2",
+	"aria-invalid:ring-utility-red/70",
+	"aria-invalid:border-border-error",
+);
+
+const badgeVariants = cva(baseBadgeStyles, {
+	variants: {
+		variant: {
+			default: cn(
+				"border-transparent",
+				"bg-bg-link",
+				"text-text-primary_on-brand",
+				"[a&]:hover:bg-bg-link_hover",
+			),
+			secondary: cn(
+				"border-transparent",
+				"bg-bg-secondary",
+				"text-text-secondary",
+				"[a&]:hover:bg-bg-tertiary",
+			),
+			destructive: cn(
+				"border-transparent",
+				"bg-bg-error-primary_inverse",
+				"text-text-primary_on-brand",
+				"[a&]:hover:bg-bg-error-primary_inverse_hover",
+				"focus-visible:ring-utility-red/70",
+			),
+			outline: cn(
+				"text-text-primary",
+				"border-border-primary",
+				"[a&]:hover:bg-bg-secondary",
+				"[a&]:hover:text-text-primary",
+			),
 		},
 	},
-);
+	defaultVariants: {
+		variant: "default",
+	},
+});
 
 function Badge({
 	className,

package/src/shadcn/components/ui/breadcrumb.tsx

@@ -13,7 +13,13 @@ function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
 		<ol
 			data-slot="breadcrumb-list"
 			className={cn(
-				"text-text-tertiary typo-body flex flex-wrap items-center break-words gap-2",
+				"text-text-tertiary",
+				"typo-body",
+				"flex",
+				"flex-wrap",
+				"items-center",
+				"break-words",
+				"gap-2",
 				className,
 			)}
 			{...props}
@@ -25,7 +31,7 @@ function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {
 	return (
 		<li
 			data-slot="breadcrumb-item"
-			className={cn("inline-flex items-center", className)}
+			className={cn("inline-flex", "items-center", className)}
 			{...props}
 		/>
 	);
@@ -44,9 +50,17 @@ function BreadcrumbLink({
 		<Comp
 			data-slot="breadcrumb-link"
 			className={cn(
-				"typo-body bg-bg-tertiary text-text-tertiary rounded-md px-2 py-1 transition-colors",
+				"typo-body",
+				"bg-bg-tertiary",
+				"text-text-tertiary",
+				"rounded-md",
+				"px-2",
+				"py-1",
+				"transition-colors",
 				"hover:text-text-secondary",
-				"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+				"focus-visible:outline-none",
+				"focus-visible:ring-2",
+				"focus-visible:ring-utility-blue/70",
 				className,
 			)}
 			{...props}
@@ -64,7 +78,10 @@ function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
 			aria-disabled="true"
 			aria-current="page"
 			className={cn(
-				"typo-page-header text-text-primary px-0 py-0.5",
+				"typo-page-header",
+				"text-text-primary",
+				"px-0",
+				"py-0.5",
 				className,
 			)}
 			{...props}
@@ -82,7 +99,12 @@ function BreadcrumbSeparator({
 			data-slot="breadcrumb-separator"
 			role="presentation"
 			aria-hidden="true"
-			className={cn("[&>svg]:size-3.5 text-text-quternary text-xs", className)}
+			className={cn(
+				"[&>svg]:size-3.5",
+				"text-text-tertiary",
+				"text-xs",
+				className,
+			)}
 			{...props}
 		>
 			{children ?? "/"}
@@ -99,7 +121,13 @@ function BreadcrumbEllipsis({
 			data-slot="breadcrumb-ellipsis"
 			role="presentation"
 			aria-hidden="true"
-			className={cn("flex size-9 items-center justify-center", className)}
+			className={cn(
+				"flex",
+				"size-9",
+				"items-center",
+				"justify-center",
+				className,
+			)}
 			{...props}
 		>
 			<MoreHorizontal className="size-4" />

package/src/shadcn/components/ui/button.tsx

@@ -4,67 +4,128 @@ import type * as React from "react";
 
 import { cn } from "#shadcn/lib/utils";
 
-const buttonVariants = cva(
-	cn(
-		"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg transition-all ",
-		"outline-none cursor-pointer",
-		"disabled:cursor-not-allowed",
-		"[&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0",
-		"focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
-		"aria-invalid:ring-destructive/20",
-	),
-	{
-		variants: {
-			variant: {
-				primary:
-					"bg-bg-link text-text-primary_on-brand shadow-xs hover:bg-bg-link_hover active:bg-bg-link disabled:bg-bg-disabled",
-				secondary:
-					"border border-border-primary bg-bg-primary text-text-tertiary shadow-xs hover:text-fg-primary disabled:text-fg-disabled disabled:border-border-disabled hover:bg-bg-secondary active:bg-bg-primary active:text-text-tertiary disabled:hover:bg-bg-primary",
-				link: "text-text-secondary hover:text-text-primary disabled:text-text-disabled rounded-none",
-				ghost:
-					"text-text-secondary hover:text-text-primary disabled:text-text-disabled hover:bg-bg-secondary active:bg-bg-tertiary disabled:hover:bg-bg-primary",
-			},
-			size: {
-				regular: "h-9 px-4 typo-label",
-				small: "h-6 px-2 typo-button-label-xs gap-1 rounded-md",
-			},
-			danger: {
-				true: "",
-				false: "",
-			},
+const baseButtonStyles = cn(
+	// Layout
+	"inline-flex",
+	"items-center",
+	"justify-center",
+	"gap-2",
+	"whitespace-nowrap",
+	"shrink-0",
+	// Shape
+	"rounded-lg",
+	// Interaction
+	"transition-all",
+	"outline-none",
+	"cursor-pointer",
+	// Disabled states
+	"disabled:cursor-not-allowed",
+	// Icon styles
+	"[&_svg]:pointer-events-none",
+	"[&_svg:not([class*='size-'])]:size-4",
+	"[&_svg]:shrink-0",
+	// Focus states
+	"focus-visible:ring-2",
+	"focus-visible:ring-utility-blue/70",
+	// Invalid states
+	"aria-invalid:ring-2",
+	"aria-invalid:ring-utility-red/70",
+);
+
+const buttonVariants = cva(baseButtonStyles, {
+	variants: {
+		variant: {
+			primary: cn(
+				"bg-bg-link",
+				"text-text-primary_on-brand",
+				"hover:bg-bg-link_hover",
+				"active:bg-bg-link",
+				"disabled:bg-bg-disabled",
+				"disabled:text-text-disabled",
+			),
+			secondary: cn(
+				"border",
+				"border-border-primary",
+				"bg-bg-primary",
+				"text-text-secondary",
+				"hover:text-text-primary",
+				"hover:bg-bg-secondary",
+				"active:bg-bg-primary",
+				"active:text-text-tertiary",
+				"disabled:text-text-disabled",
+				"disabled:border-border-disabled",
+				"disabled:hover:bg-bg-primary",
+			),
+			link: cn(
+				"text-text-secondary",
+				"hover:text-text-primary",
+				"disabled:text-text-disabled",
+				"rounded-none",
+			),
+			ghost: cn(
+				"text-text-secondary",
+				"hover:text-text-primary",
+				"hover:bg-bg-secondary",
+				"active:bg-bg-tertiary",
+				"disabled:text-text-disabled",
+				"disabled:hover:bg-bg-primary",
+			),
+		},
+		size: {
+			regular: cn("h-9", "px-4", "typo-label"),
+			small: cn("h-6", "px-2", "gap-1", "typo-button-label-xs"),
 		},
-		compoundVariants: [
-			{
-				variant: "primary",
-				danger: true,
-				class:
-					"bg-bg-error-primary_inverse text-text-primary_on-brand hover:bg-bg-error-primary_inverse_hover active:bg-bg-error-primary_inverse disabled:bg-bg-disabled",
-			},
-			{
-				variant: "secondary",
-				danger: true,
-				class:
-					"border-border-error text-text-error-primary hover:text-text-error-primary_hover hover:bg-bg-error-secondary active:bg-bg-primary active:text-text-error-primary_on-brand",
-			},
-			{
-				variant: "link",
-				danger: true,
-				class: "text-text-error-secondary hover:text-text-error-primary",
-			},
-			{
-				variant: "ghost",
-				danger: true,
-				class:
-					"text-text-error-secondary hover:text-text-error-primary hover:bg-bg-error-secondary active:bg-bg-error-tertiary",
-			},
-		],
-		defaultVariants: {
+		danger: {
+			true: "",
+			false: "",
+		},
+	},
+	compoundVariants: [
+		{
 			variant: "primary",
-			size: "regular",
-			danger: false,
+			danger: true,
+			class: cn(
+				"bg-bg-error-primary_inverse",
+				"text-text-primary_on-brand",
+				"hover:bg-bg-error-primary_inverse_hover",
+				"active:bg-bg-error-primary_inverse",
+				"disabled:bg-bg-disabled",
+			),
 		},
+		{
+			variant: "secondary",
+			danger: true,
+			class: cn(
+				"border-border-error",
+				"text-text-error-primary",
+				"hover:text-text-error-primary",
+				"hover:bg-bg-error-secondary",
+				"active:bg-bg-primary",
+				"active:text-text-error-primary",
+			),
+		},
+		{
+			variant: "link",
+			danger: true,
+			class: cn("text-text-error-secondary", "hover:text-text-error-primary"),
+		},
+		{
+			variant: "ghost",
+			danger: true,
+			class: cn(
+				"text-text-error-secondary",
+				"hover:text-text-error-primary",
+				"hover:bg-bg-error-secondary",
+				"active:bg-bg-error-tertiary",
+			),
+		},
+	],
+	defaultVariants: {
+		variant: "primary",
+		size: "regular",
+		danger: false,
 	},
-);
+});
 
 function Button({
 	className,

package/src/shadcn/components/ui/card.tsx

@@ -2,16 +2,29 @@ import type * as React from "react";
 
 import { cn } from "#shadcn/lib/utils";
 
+// Card styles
+const cardStyles = cn(
+	// Layout
+	"flex",
+	"flex-col",
+	"gap-6",
+	// Shape
+	"rounded-xl",
+	// Borders
+	"border",
+	"border-border-primary",
+	// Background & Colors
+	"bg-bg-primary",
+	"text-text-primary",
+	// Spacing
+	"py-6",
+	// Shadow
+	"shadow-sm",
+);
+
 function Card({ className, ...props }: React.ComponentProps<"div">) {
 	return (
-		<div
-			data-slot="card"
-			className={cn(
-				"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
-				className,
-			)}
-			{...props}
-		/>
+		<div data-slot="card" className={cn(cardStyles, className)} {...props} />
 	);
 }
 
@@ -20,7 +33,15 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
 		<div
 			data-slot="card-header"
 			className={cn(
-				"@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
+				"@container/card-header",
+				"grid",
+				"auto-rows-min",
+				"grid-rows-[auto_auto]",
+				"items-start",
+				"gap-1.5",
+				"px-6",
+				"has-data-[slot=card-action]:grid-cols-[1fr_auto]",
+				"[.border-b]:pb-6",
 				className,
 			)}
 			{...props}
@@ -32,7 +53,7 @@ function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
 			data-slot="card-title"
-			className={cn("leading-none font-semibold", className)}
+			className={cn("leading-none", "font-semibold", className)}
 			{...props}
 		/>
 	);
@@ -42,7 +63,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
 			data-slot="card-description"
-			className={cn("text-muted-foreground text-sm", className)}
+			className={cn("text-text-secondary", "text-sm", className)}
 			{...props}
 		/>
 	);
@@ -53,7 +74,11 @@ function CardAction({ className, ...props }: React.ComponentProps<"div">) {
 		<div
 			data-slot="card-action"
 			className={cn(
-				"col-start-2 row-span-2 row-start-1 self-start justify-self-end",
+				"col-start-2",
+				"row-span-2",
+				"row-start-1",
+				"self-start",
+				"justify-self-end",
 				className,
 			)}
 			{...props}
@@ -75,7 +100,13 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
 			data-slot="card-footer"
-			className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
+			className={cn(
+				"flex",
+				"items-center",
+				"px-6",
+				"[.border-t]:pt-6",
+				className,
+			)}
 			{...props}
 		/>
 	);

package/src/shadcn/components/ui/checkbox.stories.tsx

@@ -14,36 +14,32 @@ export const Demo = {
 		<div className="flex flex-col gap-6">
 			<div className="flex items-center gap-3">
 				<Checkbox id="terms" />
-				<Label htmlFor="terms">Accept terms and conditions</Label>
+				<Label htmlFor="terms">Unchecked</Label>
 			</div>
-			<div className="flex items-start gap-3">
+			<div className="flex items-center gap-3">
 				<Checkbox id="terms-2" defaultChecked />
-				<div className="grid gap-2">
-					<Label htmlFor="terms-2">Accept terms and conditions</Label>
-					<p className="text-muted-foreground text-sm">
-						By clicking this checkbox, you agree to the terms and conditions.
-					</p>
-				</div>
+				<Label htmlFor="terms-2">Checked</Label>
+			</div>
+			<div className="flex items-center gap-3">
+				<Checkbox id="indeterminate" checked="indeterminate" />
+				<Label htmlFor="indeterminate">Indeterminate</Label>
+			</div>
+			<div className="flex items-center gap-3">
+				<Checkbox id="disabled" disabled />
+				<Label htmlFor="disabled">Disabled unchecked</Label>
 			</div>
-			<div className="flex items-start gap-3">
-				<Checkbox id="toggle" disabled />
-				<Label htmlFor="toggle">Enable notifications</Label>
+			<div className="flex items-center gap-3">
+				<Checkbox id="disabled-checked" disabled defaultChecked />
+				<Label htmlFor="disabled-checked">Disabled checked</Label>
 			</div>
-			<Label className="hover:bg-accent/50 flex items-start gap-3 rounded-lg border p-3 has-[[aria-checked=true]]:border-blue-600 has-[[aria-checked=true]]:bg-blue-50 dark:has-[[aria-checked=true]]:border-blue-900 dark:has-[[aria-checked=true]]:bg-blue-950">
+			<div className="flex items-center gap-3">
 				<Checkbox
-					id="toggle-2"
-					defaultChecked
-					className="data-[state=checked]:border-blue-600 data-[state=checked]:bg-blue-600 data-[state=checked]:text-white dark:data-[state=checked]:border-blue-700 dark:data-[state=checked]:bg-blue-700"
+					id="disabled-indeterminate"
+					disabled
+					checked="indeterminate"
 				/>
-				<div className="grid gap-1.5 font-normal">
-					<p className="text-sm leading-none font-medium">
-						Enable notifications
-					</p>
-					<p className="text-muted-foreground text-sm">
-						You can enable or disable notifications at any time.
-					</p>
-				</div>
-			</Label>
+				<Label htmlFor="disabled-indeterminate">Disabled indeterminate</Label>
+			</div>
 		</div>
 	),
 } satisfies Story;

package/src/shadcn/components/ui/checkbox.tsx

@@ -1,6 +1,6 @@
 "use client";
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
-import { CheckIcon } from "lucide-react";
+import { CheckIcon, MinusIcon } from "lucide-react";
 import type * as React from "react";
 
 import { cn } from "#shadcn/lib/utils";
@@ -13,16 +13,57 @@ function Checkbox({
 		<CheckboxPrimitive.Root
 			data-slot="checkbox"
 			className={cn(
-				"peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+				// Base styles
+				"peer",
+				"size-5",
+				"shrink-0",
+				"rounded-md",
+				"border-[1.5px]",
+				"transition-all",
+				"duration-200",
+				"outline-none",
+				"cursor-pointer",
+				"text-white",
+				// Click animation
+				"active:scale-90",
+				"active:duration-75",
+				// Default state
+				"border-border-primary",
+				"bg-transparent",
+				"hover:bg-bg-tertiary",
+				// Checked state
+				"data-[state=checked]:bg-bg-link",
+				"data-[state=checked]:border-border-link",
+				"data-[state=checked]:text-white",
+				// Indeterminate state
+				"data-[state=indeterminate]:bg-fg-link",
+				"data-[state=indeterminate]:border-fg-link",
+				"data-[state=indeterminate]:text-white",
+				// Disabled states
+				"disabled:cursor-not-allowed",
+				"disabled:active:scale-100",
+				"disabled:border-border-secondary",
+				"disabled:bg-transparent",
+				"disabled:data-[state=checked]:bg-fg-tertiary",
+				"disabled:data-[state=checked]:border-fg-tertiary",
+				"disabled:data-[state=indeterminate]:bg-fg-tertiary",
+				"disabled:data-[state=indeterminate]:border-fg-tertiary",
+				// Focus state
+				"focus-visible:ring-2",
+				"focus-visible:ring-utility-blue/70",
 				className,
 			)}
 			{...props}
 		>
 			<CheckboxPrimitive.Indicator
 				data-slot="checkbox-indicator"
-				className="flex items-center justify-center text-current transition-none"
+				className="flex items-center justify-center text-white"
 			>
-				<CheckIcon className="size-3.5" />
+				{props.checked === "indeterminate" ? (
+					<MinusIcon className="size-3.5" style={{ strokeWidth: 3 }} />
+				) : (
+					<CheckIcon className="size-3.5" style={{ strokeWidth: 3 }} />
+				)}
 			</CheckboxPrimitive.Indicator>
 		</CheckboxPrimitive.Root>
 	);

package/src/shadcn/components/ui/combobox.stories.tsx

@@ -0,0 +1,19 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { ComboboxDemo } from "./combobox";
+
+const meta = {
+	title: "Component/Combobox",
+	component: ComboboxDemo,
+	argTypes: {},
+} satisfies Meta;
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default = {
+	render: () => (
+		<div className="w-[560px]">
+			<ComboboxDemo />
+		</div>
+	),
+} satisfies Story;