@selvajs/ui 6.5.1-beta.1 → 6.6.0-beta.12

package/src/lib/components/primitives/FilterableDropdown.svelte

@@ -1,14 +1,16 @@
 <script lang="ts">
 	import type { Component } from 'svelte';
-	import { Search, ChevronDown, Check } from '@lucide/svelte';
+	import { ChevronDown } from '@lucide/svelte';
 	import { cn } from '$lib/utils.js';
+	import { buttonVariants } from './button';
+	import * as Popover from './popover';
+	import * as Command from './command';
 
 	export interface FilterableDropdownItem {
 		id: string;
 		label: string;
 		icon?: Component;
 		iconClass?: string;
-		iconStyle?: string;
 	}
 
 	interface Props {
@@ -19,6 +21,7 @@
 		placeholder?: string;
 		triggerIcon?: Component;
 		searchPlaceholder?: string;
+		/** Above this many items the list gets a filter box. */
 		searchThreshold?: number;
 		disabled?: boolean;
 		class?: string;
@@ -38,149 +41,59 @@
 	}: Props = $props();
 
 	let open = $state(false);
-	let query = $state('');
-	let highlighted = $state(0);
-	let inputRef = $state<HTMLInputElement>();
-	let containerRef = $state<HTMLDivElement>();
 
 	const selected = $derived(items.find((item) => item.id === value) ?? null);
-	const showSearch = $derived(items.length > searchThreshold);
-
-	const matches = $derived.by(() => {
-		const q = query.trim().toLowerCase();
-		if (!q) return items;
-		return items.filter((item) => item.label.toLowerCase().includes(q));
-	});
-
-	$effect(() => {
-		void matches;
-		highlighted = 0;
-	});
-
-	$effect(() => {
-		if (open) {
-			queueMicrotask(() => inputRef?.focus());
-		} else {
-			query = '';
-		}
-	});
+	const SelectedIcon = $derived(selected?.icon ?? TriggerIcon);
 
 	function pick(item: FilterableDropdownItem) {
 		onChange(item.id);
 		open = false;
 	}
-
-	function handleKey(e: KeyboardEvent) {
-		if (e.key === 'ArrowDown') {
-			e.preventDefault();
-			highlighted = Math.min(highlighted + 1, matches.length - 1);
-		} else if (e.key === 'ArrowUp') {
-			e.preventDefault();
-			highlighted = Math.max(highlighted - 1, 0);
-		} else if (e.key === 'Enter') {
-			e.preventDefault();
-			const m = matches[highlighted];
-			if (m) pick(m);
-		} else if (e.key === 'Escape') {
-			e.preventDefault();
-			open = false;
-		}
-	}
-
-	function handleDocClick(e: MouseEvent) {
-		if (!open) return;
-		if (containerRef && !containerRef.contains(e.target as Node)) open = false;
-	}
-
-	$effect(() => {
-		if (!open) return;
-		document.addEventListener('mousedown', handleDocClick);
-		return () => document.removeEventListener('mousedown', handleDocClick);
-	});
-
-	const SelectedIcon = $derived(selected?.icon);
 </script>
 
-<div bind:this={containerRef} class={cn('relative', className)}>
-	<button
-		type="button"
+<Popover.Root bind:open>
+	<Popover.Trigger
 		{id}
 		{disabled}
-		onclick={() => (open = !open)}
+		role="combobox"
+		aria-expanded={open}
 		class={cn(
-			'h-10 gap-2 px-3 text-sm flex w-full items-center rounded-md border bg-background text-left transition-colors disabled:cursor-not-allowed disabled:opacity-50',
-			open ? 'border-ring ring-2 ring-ring/30' : 'border-input hover:bg-muted/40'
+			buttonVariants({ variant: 'outline' }),
+			'font-normal w-full justify-start',
+			className
 		)}
 	>
 		{#if SelectedIcon}
-			<SelectedIcon
-				class={cn('h-3.5 w-3.5 shrink-0', selected?.iconClass ?? 'text-muted-foreground')}
-				style={selected?.iconStyle}
-			/>
-		{:else if TriggerIcon}
-			<TriggerIcon class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+			<SelectedIcon class={cn('size-3.5', selected?.iconClass ?? 'text-muted-foreground')} />
 		{/if}
-		<span class={cn('min-w-0 flex-1 truncate', selected ? '' : 'text-muted-foreground')}>
+		<span class={cn('min-w-0 flex-1 truncate text-left', !selected && 'text-muted-foreground')}>
 			{selected ? selected.label : placeholder}
 		</span>
-		<ChevronDown
-			class={cn(
-				'h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform',
-				open ? 'rotate-180' : ''
-			)}
-		/>
-	</button>
-
-	{#if open}
-		<div
-			class="right-0 left-0 mt-1 shadow-md absolute top-full z-50 overflow-hidden rounded-md border border-border bg-popover"
-		>
-			{#if showSearch}
-				<div class="relative border-b border-border">
-					<Search
-						class="left-3 h-3.5 w-3.5 pointer-events-none absolute top-1/2 -translate-y-1/2 text-muted-foreground"
-					/>
-					<input
-						bind:this={inputRef}
-						bind:value={query}
-						onkeydown={handleKey}
-						placeholder={searchPlaceholder}
-						class="h-8 pr-3 pl-9 text-sm w-full bg-transparent outline-none placeholder:text-muted-foreground"
-					/>
-				</div>
+		<ChevronDown class="size-3.5 text-muted-foreground" />
+	</Popover.Trigger>
+	<Popover.Content align="start" class="p-0 w-(--bits-popover-anchor-width)">
+		<Command.Root>
+			{#if items.length > searchThreshold}
+				<Command.Input placeholder={searchPlaceholder} />
 			{/if}
-
-			<div class="max-h-60 overflow-y-auto">
-				{#if matches.length === 0}
-					<p class="px-3 py-3 text-xs text-center text-muted-foreground">
-						No matches for "{query}"
-					</p>
-				{:else}
-					{#each matches as item, i (item.id)}
-						{@const ItemIcon = item.icon}
-						<button
-							type="button"
-							onclick={() => pick(item)}
-							onmouseenter={() => (highlighted = i)}
-							class={cn(
-								'gap-2 px-3 py-1.5 text-sm flex w-full items-center text-left transition-colors',
-								highlighted === i ? 'bg-accent text-accent-foreground' : 'hover:bg-muted/60'
-							)}
-						>
-							{#if ItemIcon}
-								<ItemIcon
-									class={cn('h-3.5 w-3.5 shrink-0', item.iconClass ?? 'text-muted-foreground')}
-									style={item.iconStyle}
-								/>
-							{/if}
-							<span class="flex-1 truncate">{item.label}</span>
-							{#if item.id === value}
-								<Check class="h-3.5 w-3.5 shrink-0 text-primary" />
-							{/if}
-						</button>
-					{/each}
-				{/if}
-			</div>
-		</div>
-	{/if}
-</div>
+			<Command.List>
+				<Command.Empty>No matches.</Command.Empty>
+				{#each items as item (item.id)}
+					{@const ItemIcon = item.icon}
+					<!-- Filter on the label; the id is only the key. -->
+					<Command.Item
+						value={item.id}
+						keywords={[item.label]}
+						data-checked={item.id === value}
+						onSelect={() => pick(item)}
+					>
+						{#if ItemIcon}
+							<ItemIcon class={cn('size-3.5', item.iconClass ?? 'text-muted-foreground')} />
+						{/if}
+						<span class="truncate">{item.label}</span>
+					</Command.Item>
+				{/each}
+			</Command.List>
+		</Command.Root>
+	</Popover.Content>
+</Popover.Root>

package/src/lib/components/primitives/IssueList.svelte

@@ -0,0 +1,56 @@
+<script lang="ts" module>
+	import type { Severity } from './severity';
+
+	export interface Issue {
+		severity: Severity;
+		message: string;
+		/** A second, quieter line: expected vs actual, a path, a hint. */
+		detail?: string;
+		/** What raised it, such as the component's nickname. */
+		source?: string;
+		/** How many times the same message came in; shown as ×n above 1. */
+		count?: number;
+	}
+</script>
+
+<script lang="ts">
+	import { cn } from '$lib/utils.js';
+	import SeverityIcon from './SeverityIcon.svelte';
+
+	interface Props {
+		issues: readonly Issue[];
+		/** `boxed` draws a bordered, divided list; `plain` is for surfaces that already have a frame. */
+		variant?: 'boxed' | 'plain';
+		class?: string;
+	}
+
+	let { issues, variant = 'boxed', class: className }: Props = $props();
+</script>
+
+<ul
+	class={cn(
+		'text-sm',
+		variant === 'boxed' ? 'divide-y rounded-lg border' : 'gap-2 flex flex-col',
+		className
+	)}
+>
+	{#each issues as issue, i (i)}
+		<li class={cn('gap-2 flex items-start', variant === 'boxed' && 'px-3 py-2')}>
+			<SeverityIcon severity={issue.severity} class="mt-0.5" />
+			<div class="min-w-0 flex-1">
+				<p class="wrap-anywhere">
+					{issue.message}
+					{#if issue.count && issue.count > 1}
+						<span class="ml-1 text-xs text-muted-foreground tabular-nums">×{issue.count}</span>
+					{/if}
+				</p>
+				{#if issue.source}
+					<p class="text-xs text-muted-foreground">{issue.source}</p>
+				{/if}
+				{#if issue.detail}
+					<p class="mt-0.5 text-xs wrap-anywhere text-muted-foreground">{issue.detail}</p>
+				{/if}
+			</div>
+		</li>
+	{/each}
+</ul>

package/src/lib/components/primitives/SeverityIcon.svelte

@@ -0,0 +1,15 @@
+<script lang="ts">
+	import { cn } from '$lib/utils.js';
+	import { SEVERITY_ICON, SEVERITY_TEXT, type Severity } from './severity';
+
+	interface Props {
+		severity: Severity;
+		class?: string;
+	}
+
+	let { severity, class: className }: Props = $props();
+
+	const Icon = $derived(SEVERITY_ICON[severity]);
+</script>
+
+<Icon class={cn('size-4 shrink-0', SEVERITY_TEXT[severity], className)} aria-hidden="true" />

package/src/lib/components/primitives/SolvingIndicator.svelte

@@ -3,57 +3,58 @@
 
 	interface Props {
 		show: boolean;
+		/**
+		 * `floating` overlays the bottom-left corner. `inline` is a compact chip the size of an
+		 * icon button, for a narrow host whose corner holds its content and whose action row
+		 * already reserves the chip's place. Both say Esc aborts, as every host does.
+		 */
+		placement?: 'floating' | 'inline';
 	}
 
-	let { show }: Props = $props();
+	let { show, placement = 'floating' }: Props = $props();
 
 	const locale = getLocaleContext();
 	const t = $derived(locale.messages);
 </script>
 
-{#if show}
-	<div
-		class="bottom-6 left-6 gap-3 px-5 py-3 shadow-xl fixed z-50 flex animate-[selva-slideInLeft_0.2s_ease-out] items-center rounded-lg border border-primary/20 bg-primary text-primary-foreground"
-	>
-		<div class="h-5 w-5 relative flex shrink-0 items-center justify-center">
-			<div
-				class="animate-ping absolute h-full w-full rounded-full bg-primary-foreground opacity-30"
-			></div>
+<!-- The live region stays mounted: a screen reader only announces text that changes inside a
+     region it already knows about, so one created together with its text says nothing. -->
+<div
+	role="status"
+	aria-live="polite"
+	aria-atomic="true"
+	class={placement === 'inline' ? 'h-10 gap-3 min-w-0 flex items-center' : undefined}
+>
+	{#if show && placement === 'inline'}
+		<div
+			class="gap-2 px-3 h-10 text-sm font-semibold flex shrink-0 items-center rounded-md bg-primary text-primary-foreground"
+		>
 			<div
 				class="h-3 w-3 animate-spin rounded-full border-2 border-primary-foreground border-t-transparent"
+				aria-hidden="true"
 			></div>
+			{t.solvingEllipsis}
 		</div>
-		<div class="leading-tight flex flex-col">
-			<span class="text-sm font-semibold">{t.solving}</span>
-			<span class="text-xs opacity-70">{t.solvingSubtitle}</span>
+		<span class="text-xs min-w-0 truncate text-muted-foreground" data-testid="solve-esc-hint">
+			{t.solveMessagesEscHint}
+		</span>
+	{:else if show}
+		<div
+			class="bottom-6 left-6 gap-3 px-5 py-3 shadow-xl animate-in fade-in slide-in-from-left fixed z-50 flex items-center rounded-lg border border-primary/20 bg-primary text-primary-foreground duration-200"
+		>
+			<div class="h-5 w-5 relative flex shrink-0 items-center justify-center" aria-hidden="true">
+				<div
+					class="animate-ping absolute h-full w-full rounded-full bg-primary-foreground opacity-30"
+				></div>
+				<div
+					class="h-3 w-3 animate-spin rounded-full border-2 border-primary-foreground border-t-transparent"
+				></div>
+			</div>
+			<div class="leading-tight flex flex-col">
+				<span class="text-sm font-semibold">{t.solving}</span>
+				<span class="text-xs opacity-70" data-testid="solve-esc-hint">{t.solveMessagesEscHint}</span
+				>
+			</div>
 		</div>
-	</div>
-{/if}
-
-<style>
-	@keyframes selva-slideInLeft {
-		from {
-			transform: translateX(-110%);
-			opacity: 0;
-		}
-		to {
-			transform: translateX(0);
-			opacity: 1;
-		}
-	}
-
-	@keyframes selva-sweep {
-		0% {
-			width: 0%;
-			margin-left: 0%;
-		}
-		50% {
-			width: 60%;
-			margin-left: 20%;
-		}
-		100% {
-			width: 0%;
-			margin-left: 100%;
-		}
-	}
-</style>
+	{/if}
+</div>

package/src/lib/components/primitives/StateDisplay.svelte

@@ -1,6 +1,9 @@
 <script lang="ts">
-	import { Loader, AlertCircle, AlertTriangle, Inbox } from '@lucide/svelte';
-	import * as Card from '$lib/components/primitives/card';
+	import { Inbox } from '@lucide/svelte';
+	import { cn } from '$lib/utils.js';
+	import * as Empty from './empty';
+	import { Spinner } from './spinner';
+	import SeverityIcon from './SeverityIcon.svelte';
 
 	interface StateDisplayProps {
 		type: 'loading' | 'error' | 'warning' | 'empty';
@@ -18,89 +21,26 @@
 		class: className = ''
 	}: StateDisplayProps = $props();
 
-	const sizeClasses = {
-		small: {
-			container: 'p-6 gap-3',
-			icon: 'w-8 h-8',
-			title: 'text-sm font-semibold',
-			message: 'text-xs'
-		},
-		medium: {
-			container: 'p-12 gap-4',
-			icon: 'w-12 h-12',
-			title: 'text-lg font-semibold',
-			message: 'text-sm'
-		},
-		large: {
-			container: 'p-16 gap-6',
-			icon: 'w-16 h-16',
-			title: 'text-2xl font-bold',
-			message: 'text-base'
-		}
-	};
-
-	/* Fully semantic, contrast-safe mappings */
-	const typeClasses = {
-		loading: {
-			icon: 'text-primary',
-			title: 'text-primary-foreground',
-			message: 'text-primary-foreground/80',
-			border: 'border-primary',
-			background: 'bg-primary/15'
-		},
-		error: {
-			icon: 'text-destructive',
-			title: 'text-destructive-foreground',
-			message: 'text-destructive-foreground/80',
-			border: 'border-destructive',
-			background: 'bg-destructive/15'
-		},
-		warning: {
-			icon: 'text-accent',
-			title: 'text-accent-foreground',
-			message: 'text-accent-foreground/80',
-			border: 'border-accent',
-			background: 'bg-accent/15'
-		},
-		empty: {
-			icon: 'text-neutral',
-			title: 'text-neutral-foreground',
-			message: 'text-neutral-foreground/80',
-			border: 'border-neutral',
-			background: 'bg-neutral/15'
-		}
-	};
-
-	const sizeConfig = $derived(sizeClasses[size]);
-	const typeConfig = $derived(typeClasses[type]);
+	// Size only changes the breathing room; the look comes from Empty and the severity tokens.
+	const PADDING = { small: 'p-4', medium: 'p-8', large: 'p-12' } as const;
 </script>
 
-<Card.Root class="rounded-lg border-2 {typeConfig.border} {typeConfig.background} {className}">
-	<Card.Content
-		class="flex flex-col items-center justify-center text-center {sizeConfig.container}"
-	>
-		<div class="{sizeConfig.icon} {typeConfig.icon}">
+<Empty.Root class={cn(PADDING[size], className)}>
+	<Empty.Header>
+		<Empty.Media variant="icon">
 			{#if type === 'loading'}
-				<Loader class="animate-spin h-full w-full" />
-			{:else if type === 'error'}
-				<AlertCircle class="h-full w-full" />
-			{:else if type === 'warning'}
-				<AlertTriangle class="h-full w-full" />
+				<Spinner />
 			{:else if type === 'empty'}
-				<Inbox class="h-full w-full" />
+				<Inbox />
+			{:else}
+				<SeverityIcon severity={type} />
 			{/if}
-		</div>
-
+		</Empty.Media>
 		{#if title}
-			<h3 class="{sizeConfig.title} {typeConfig.title} mt-1">
-				{title}
-			</h3>
+			<Empty.Title>{title}</Empty.Title>
 		{/if}
-
 		{#if message}
-			<p class="{sizeConfig.message} {typeConfig.message} max-w-md leading-relaxed">
-				{message}
-			</p>
+			<Empty.Description>{message}</Empty.Description>
 		{/if}
-	</Card.Content>
-</Card.Root>
+	</Empty.Header>
+</Empty.Root>

package/src/lib/components/primitives/ViewToggle.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { Grid2x2, List } from '@lucide/svelte';
+	import * as ToggleGroup from './toggle-group';
 
 	type ViewMode = 'grid' | 'list';
 
@@ -10,38 +11,22 @@
 	}
 
 	let { mode, onChange, size = 'md' }: Props = $props();
-
-	const btnClass = $derived(
-		size === 'sm'
-			? 'flex h-7 w-7 items-center justify-center rounded-md transition-colors'
-			: 'flex h-8 w-8 items-center justify-center rounded-md transition-colors'
-	);
-	const iconClass = $derived(size === 'sm' ? 'h-3.5 w-3.5' : 'h-4 w-4');
 </script>
 
-<div class="gap-0.5 p-0.5 inline-flex rounded-md border border-border bg-card">
-	<button
-		type="button"
-		title="Grid view"
-		aria-label="Grid view"
-		aria-pressed={mode === 'grid'}
-		onclick={() => onChange('grid')}
-		class="{btnClass} {mode === 'grid'
-			? 'bg-muted text-foreground'
-			: 'text-muted-foreground hover:text-foreground'}"
-	>
-		<Grid2x2 class={iconClass} />
-	</button>
-	<button
-		type="button"
-		title="List view"
-		aria-label="List view"
-		aria-pressed={mode === 'list'}
-		onclick={() => onChange('list')}
-		class="{btnClass} {mode === 'list'
-			? 'bg-muted text-foreground'
-			: 'text-muted-foreground hover:text-foreground'}"
-	>
-		<List class={iconClass} />
-	</button>
-</div>
+<ToggleGroup.Root
+	type="single"
+	variant="outline"
+	size={size === 'sm' ? 'sm' : 'default'}
+	value={mode}
+	onValueChange={(next) => {
+		// A single-select group emits '' when the active item is clicked again; keep the mode.
+		if (next === 'grid' || next === 'list') onChange(next);
+	}}
+>
+	<ToggleGroup.Item value="grid" aria-label="Grid view" title="Grid view">
+		<Grid2x2 />
+	</ToggleGroup.Item>
+	<ToggleGroup.Item value="list" aria-label="List view" title="List view">
+		<List />
+	</ToggleGroup.Item>
+</ToggleGroup.Root>

package/src/lib/components/primitives/alert-dialog/alert-dialog-action.svelte

@@ -1,18 +1,24 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from 'bits-ui';
-	import { buttonVariants } from '$lib/components/primitives/button/index.js';
+	import {
+		buttonVariants,
+		type ButtonSize,
+		type ButtonVariant
+	} from '$lib/components/primitives/button/index.js';
 	import { cn } from '$lib/utils.js';
 
 	let {
 		ref = $bindable(null),
 		class: className,
+		variant = 'default',
+		size = 'default',
 		...restProps
-	}: AlertDialogPrimitive.ActionProps = $props();
+	}: AlertDialogPrimitive.ActionProps & { variant?: ButtonVariant; size?: ButtonSize } = $props();
 </script>
 
 <AlertDialogPrimitive.Action
 	bind:ref
 	data-slot="alert-dialog-action"
-	class={cn(buttonVariants(), className)}
+	class={cn(buttonVariants({ variant, size }), className)}
 	{...restProps}
 />

package/src/lib/components/primitives/alert-dialog/alert-dialog-content.svelte

@@ -19,7 +19,7 @@
 		bind:ref
 		data-slot="alert-dialog-content"
 		class={cn(
-			'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 gap-4 p-6 shadow-lg sm:max-w-lg fixed start-[50%] top-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] rounded-lg border bg-background duration-200',
+			'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 gap-4 p-6 shadow-lg sm:max-w-lg fixed start-1/2 top-1/2 z-50 grid max-h-dialog w-screen-inset -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-lg border bg-background duration-200',
 			className
 		)}
 		{...restProps}

package/src/lib/components/primitives/alert-dialog/alert-dialog-overlay.svelte

@@ -13,7 +13,7 @@
 	bind:ref
 	data-slot="alert-dialog-overlay"
 	class={cn(
-		'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 inset-0 bg-black/50 fixed z-50',
+		'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 inset-0 fixed z-50 bg-overlay',
 		className
 	)}
 	{...restProps}

package/src/lib/components/primitives/badge/badge.svelte

@@ -2,14 +2,14 @@
 	import { type VariantProps, tv } from 'tailwind-variants';
 
 	export const badgeVariants = tv({
-		base: 'focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border px-2 py-0.5 text-xs font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3',
+		base: 'focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border px-2 py-0.5 text-xs font-medium whitespace-nowrap transition focus-visible:ring-3 [&>svg]:pointer-events-none [&>svg]:size-3',
 		variants: {
 			variant: {
 				default: 'bg-primary text-primary-foreground [a&]:hover:bg-primary/90 border-transparent',
 				secondary:
 					'bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90 border-transparent',
 				destructive:
-					'bg-destructive [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white',
+					'bg-destructive [a&]:hover:bg-destructive/90 dark:bg-destructive/70 border-transparent text-destructive-foreground',
 				outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground'
 			}
 		},

package/src/lib/components/primitives/button/button.svelte

@@ -4,14 +4,17 @@
 	import { type VariantProps, tv } from 'tailwind-variants';
 
 	export const buttonVariants = tv({
-		base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		base: "focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-3 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		variants: {
 			variant: {
 				default: 'bg-primary text-primary-foreground shadow-xs hover:bg-primary/90',
 				destructive:
-					'bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white',
+					'bg-destructive shadow-xs hover:bg-destructive/90 dark:bg-destructive/60 text-destructive-foreground',
 				outline:
 					'bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border',
+				// Outline with an opaque dark fill: the translucent one washes out over the light 3D canvas.
+				overlay:
+					'bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:border-input border',
 				secondary: 'bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80',
 				ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
 				dashed:
@@ -20,6 +23,7 @@
 			},
 			size: {
 				default: 'h-9 px-4 py-2 has-[>svg]:px-3',
+				xs: 'h-7 gap-1 rounded-md px-3 text-xs has-[>svg]:px-2',
 				sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
 				lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
 				icon: 'size-9',