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

package/dist/components/preview/Group.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import type { LayoutItem, InputLayoutItem, OutputLayoutItem } from '@selvajs/schemas';
 	import type { Snippet } from 'svelte';
-	import * as Card from '../primitives/card';
 	import { ChevronDown } from '@lucide/svelte';
 	import { buildVisibilityMap, itemKey } from '../../schema/visibility-rules';
 
@@ -20,7 +19,7 @@
 			]
 		>;
 		outputSnippet: Snippet<[layoutItem: OutputLayoutItem]>;
-		/** When true, renders items flat without the Card wrapper, header, or collapse toggle. */
+		/** When true, renders items without the header or collapse toggle. */
 		flat?: boolean;
 	}
 
@@ -37,110 +36,99 @@
 		flat = false
 	}: Props = $props();
 
-	function handleKeydown(e: KeyboardEvent) {
-		if (e.key === 'Enter' || e.key === ' ') {
-			e.preventDefault();
-			onToggle();
-		}
-	}
-
-	// One visibility evaluation per item per render; columnStarts and gridItem both read it.
 	const visibilityMap = $derived(buildVisibilityMap(items, values));
 
-	// Hidden items must not consume a slot here, because gridItem skips them entirely —
-	// counting them would offset every following item's column.
-	const columnStarts = $derived.by(() => {
-		const positions: number[] = [];
-		let col = 0;
-		for (const item of items) {
-			if (item.type === 'linebreak') {
-				positions.push(0);
-				col = 0;
-				continue;
-			}
-			const visibility = visibilityMap[itemKey(item)];
-			if (!visibility.visible) {
-				positions.push(0);
-				continue;
-			}
-			const span = Math.min(Math.max(1, item.span ?? 1), columns);
-			if (col + span > columns) col = 0;
-			positions.push(col);
-			col = (col + span) % columns;
-		}
-		return positions;
-	});
+	const uid = $props.id();
+	const descriptionId = `${uid}-description`;
+
+	// Below this a label and its control stop fitting side by side, so a wide group
+	// sheds columns as its panel narrows instead of squeezing every input.
+	const MIN_COLUMN_WIDTH = 160;
+	const COLUMN_GAP = 16;
+
+	let gridWidth = $state(0);
+	const effectiveColumns = $derived(
+		gridWidth === 0
+			? columns
+			: Math.max(
+					1,
+					Math.min(columns, Math.floor((gridWidth + COLUMN_GAP) / (MIN_COLUMN_WIDTH + COLUMN_GAP)))
+				)
+	);
 </script>
 
-{#if flat}
-	<div class="p-6">
-		<div class="schema-grid gap-6 grid" style="--schema-cols: {columns};">
-			{#each items as layoutItem, i (layoutItem.type === 'linebreak' ? layoutItem.id : layoutItem.paramId)}
-				{@render gridItem(layoutItem, columns, columnStarts[i] === 0)}
-			{/each}
-		</div>
+{#snippet grid()}
+	<div
+		class="schema-grid"
+		style="--schema-cols: {effectiveColumns}; --column-gap: {COLUMN_GAP}px;"
+		bind:clientWidth={gridWidth}
+	>
+		{#each items as layoutItem (layoutItem.type === 'linebreak' ? layoutItem.id : layoutItem.paramId)}
+			{@render gridItem(layoutItem)}
+		{/each}
 	</div>
-{:else}
-	<Card.Root class="gap-0 py-0 pt-0 overflow-hidden">
-		<Card.Header
-			class="pt-4 pb-4! cursor-pointer border-b border-border bg-muted transition-colors select-none hover:bg-muted/50 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none"
-			role="button"
-			tabindex={0}
-			aria-expanded={!collapsed}
-			onclick={onToggle}
-			onkeydown={handleKeydown}
-		>
-			<Card.Title>{label}</Card.Title>
-			{#if description}
-				<Card.Description>{description}</Card.Description>
-			{/if}
-			<Card.Action>
+{/snippet}
+
+<section class="shadow-xs rounded-xl border bg-card">
+	{#if flat}
+		<div class="p-4">
+			{@render grid()}
+		</div>
+	{:else}
+		<!-- The host's page owns the h1 and the panel holds the h2. The description sits outside the
+		     heading's button, so the heading and the button are named by the label alone. -->
+		<h3>
+			<button
+				type="button"
+				class="gap-3 px-4 pt-3.5 flex w-full items-start text-left outline-none select-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset {description
+					? 'pb-0'
+					: 'pb-3.5'}"
+				aria-expanded={!collapsed}
+				aria-describedby={description ? descriptionId : undefined}
+				onclick={onToggle}
+			>
+				<span class="min-w-0 text-base font-semibold leading-snug flex-1 text-foreground"
+					>{label}</span
+				>
 				<ChevronDown
-					class="h-4 w-4 text-muted-foreground transition-transform duration-200 {collapsed
-						? ''
-						: 'rotate-180'}"
+					class="mt-1 h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200 {collapsed
+						? '-rotate-90'
+						: ''}"
 				/>
-			</Card.Action>
-		</Card.Header>
-		<div class="content-wrapper" class:collapsed>
+			</button>
+		</h3>
+		{#if description}
+			<p
+				id={descriptionId}
+				class="pl-4 pr-11 pt-0.5 pb-3.5 text-xs leading-snug text-muted-foreground"
+			>
+				{description}
+			</p>
+		{/if}
+		<div class="content-wrapper" class:collapsed inert={collapsed}>
 			<div class="content-inner">
-				<Card.Content class="p-6">
-					<div class="schema-grid gap-6 grid" style="--schema-cols: {columns};">
-						{#each items as layoutItem, i (layoutItem.type === 'linebreak' ? layoutItem.id : layoutItem.paramId)}
-							{@render gridItem(layoutItem, columns, columnStarts[i] === 0)}
-						{/each}
-					</div>
-				</Card.Content>
+				<div class="px-4 pt-1 pb-5">
+					{@render grid()}
+				</div>
 			</div>
 		</div>
-	</Card.Root>
-{/if}
+	{/if}
+</section>
 
-{#snippet gridItem(layoutItem: LayoutItem, cols: number, isFirstInRow: boolean)}
+{#snippet gridItem(layoutItem: LayoutItem)}
 	{#if layoutItem.type === 'linebreak'}
-		<div style="grid-column: 1 / -1" class="h-px bg-border" aria-hidden="true"></div>
+		<div class="grid-break" aria-hidden="true"></div>
 	{:else}
 		{@const visibility = visibilityMap[itemKey(layoutItem)]}
-		{@const span = Math.min(Math.max(1, layoutItem.span ?? 1), cols)}
+		{@const span = Math.min(Math.max(1, layoutItem.span ?? 1), effectiveColumns)}
 		{#if visibility.visible}
-			{#if layoutItem.type === 'input'}
-				<div
-					class="grid-cell min-w-0 flex items-center"
-					class:opacity-50={visibility.disabled}
-					class:col-divider={!isFirstInRow && cols > 1}
-					style="grid-column: span {span} / span {span}"
-				>
+			<div class="grid-cell min-w-0" class:opacity-50={visibility.disabled} style="--span: {span}">
+				{#if layoutItem.type === 'input'}
 					{@render inputSnippet(layoutItem, visibility)}
-				</div>
-			{:else if layoutItem.type === 'output'}
-				<div
-					class="grid-cell"
-					class:col-divider={!isFirstInRow && cols > 1}
-					style="grid-column: span {span} / span {span}"
-				>
+				{:else if layoutItem.type === 'output'}
 					{@render outputSnippet(layoutItem)}
-				</div>
-			{/if}
+				{/if}
+			</div>
 		{/if}
 	{/if}
 {/snippet}
@@ -158,27 +146,28 @@
 
 	.content-inner {
 		min-height: 0;
+		overflow: hidden;
 	}
 
 	.schema-grid {
+		display: grid;
 		grid-template-columns: repeat(var(--schema-cols), minmax(0, 1fr));
+		gap: 1rem var(--column-gap);
+		align-items: start;
+	}
+
+	.grid-cell {
+		grid-column: span var(--span) / span var(--span);
 	}
 
-	/* Vertical divider painted in the column gap. `gap-6` is 24px, so a 12px
-	   negative margin + 12px padding centres the 1px line in the gutter. */
-	.col-divider {
-		border-left: 1px solid var(--border);
-		padding-left: 12px;
-		margin-left: -12px;
+	/* A control with no label above it lines up with the controls beside it, not their labels. */
+	.grid-cell:has(:global([data-control-line])) {
+		align-self: end;
 	}
 
-	/* When the container collapses the grid to 1 visual column, the items are
-	   stacked and the divider would float on the left of every row. Hide it. */
-	@container (max-width: 320px) {
-		.col-divider {
-			border-left: 0;
-			padding-left: 0;
-			margin-left: 0;
-		}
+	/* An empty full-width row: the two row gaps around it already read as a break. */
+	.grid-break {
+		grid-column: 1 / -1;
+		margin-block: -0.25rem;
 	}
 </style>

package/dist/components/preview/Group.svelte.d.ts

@@ -17,7 +17,7 @@ interface Props {
         }
     ]>;
     outputSnippet: Snippet<[layoutItem: OutputLayoutItem]>;
-    /** When true, renders items flat without the Card wrapper, header, or collapse toggle. */
+    /** When true, renders items without the header or collapse toggle. */
     flat?: boolean;
 }
 declare const Group: import("svelte").Component<Props, {}, "">;

package/dist/components/preview/HelpButton.svelte

@@ -0,0 +1,36 @@
+<script lang="ts">
+	import { HelpCircle } from '@lucide/svelte';
+	import * as Dialog from '../primitives/dialog';
+
+	interface Props {
+		/** The field's label: the dialog title and the button's accessible name. */
+		label: string;
+		description: string;
+	}
+
+	let { label, description }: Props = $props();
+</script>
+
+<!-- Every field has one, so a column of them is noise. Where a fine pointer can hover, it shows
+     only while the pointer or focus is inside the enclosing `group/field`; touch keeps it visible.
+     The box is 24px, touch gets a 44px hit area, and the negative margin keeps the label row from
+     growing. -->
+<Dialog.Root>
+	<Dialog.Trigger>
+		{#snippet child({ props })}
+			<button
+				{...props}
+				class="-m-1 size-6 pointer-coarse:after:-inset-2.5 relative flex shrink-0 cursor-help items-center justify-center rounded-sm text-muted-foreground transition hover:text-foreground pointer-coarse:after:absolute pointer-fine:opacity-0 pointer-fine:group-focus-within/field:opacity-100 pointer-fine:group-hover/field:opacity-100 pointer-fine:focus-visible:opacity-100"
+				aria-label={label}
+			>
+				<HelpCircle class="size-3.5" />
+			</button>
+		{/snippet}
+	</Dialog.Trigger>
+	<Dialog.Content class="sm:max-w-md">
+		<Dialog.Header>
+			<Dialog.Title>{label}</Dialog.Title>
+			<Dialog.Description>{description}</Dialog.Description>
+		</Dialog.Header>
+	</Dialog.Content>
+</Dialog.Root>

package/dist/components/preview/HelpButton.svelte.d.ts

@@ -0,0 +1,8 @@
+interface Props {
+    /** The field's label: the dialog title and the button's accessible name. */
+    label: string;
+    description: string;
+}
+declare const HelpButton: import("svelte").Component<Props, {}, "">;
+type HelpButton = ReturnType<typeof HelpButton>;
+export default HelpButton;