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

package/src/lib/components/preview/ChartOutput.svelte

@@ -1,8 +1,11 @@
 <script lang="ts">
 	import type { OutputChartLayoutItem } from '@selvajs/schemas';
-	import { onMount } from 'svelte';
+	import { onMount, tick } from 'svelte';
+	import { mode } from 'mode-watcher';
 	import { Loader, Maximize, Minimize } from '@lucide/svelte';
 	import { loadScript } from '$lib/utils/loadScript';
+	import { getLocaleContext } from '$lib/i18n/localeContext.svelte';
+	import { formatMessage } from '$lib/i18n/messages';
 
 	interface Props {
 		item: OutputChartLayoutItem;
@@ -11,6 +14,9 @@
 
 	let { item: _item, value }: Props = $props();
 
+	const locale = getLocaleContext();
+	const t = $derived(locale.messages);
+
 	const MAP_TYPE_SET = new Set(['scattermap', 'scattermapbox', 'choropleth', 'scattergeo']);
 
 	type PlotlyTrace = Record<string, unknown>;
@@ -40,20 +46,40 @@
 		// @ts-expect-error — Plotly is loaded dynamically onto window
 		if (window.Plotly) return window.Plotly;
 
-		await loadScript('https://cdn.plot.ly/plotly-3.4.0.min.js', { crossOrigin: 'anonymous' });
+		// Pinned by hash: the plugin's web UI runs this on the origin that holds its bridge secret.
+		await loadScript('https://cdn.plot.ly/plotly-3.4.0.min.js', {
+			crossOrigin: 'anonymous',
+			integrity: 'sha384-pFOQ7loGBChmUyS4Tszy+he8OWeYkwTFjc2xii4aJUWWiGwf2u2OEc04T5iDRpMp'
+		});
 		// @ts-expect-error — Plotly is loaded dynamically onto window
 		return window.Plotly;
 	}
 
+	// Some embedded WebViews (WKWebView in the Rhino panel) ship without the Fullscreen API at all.
+	const fullscreenSupported = typeof document !== 'undefined' && !!document.fullscreenEnabled;
+
+	// `Plots.resize()`/`relayout({autosize: true})` ask Plotly to re-measure the container itself,
+	// which it silently fails to do across a Fullscreen transition — _fullLayout keeps the
+	// pre-toggle width/height even though clientWidth/clientHeight are already correct. Passing
+	// the measured size explicitly is the only call that actually takes.
+	function resizeChart() {
+		// @ts-expect-error — Plotly is loaded dynamically onto window
+		if (!containerEl || !window.Plotly) return;
+		const { width, height } = containerEl.getBoundingClientRect();
+		if (width === 0 || height === 0) return;
+		// @ts-expect-error — Plotly is loaded dynamically onto window
+		window.Plotly.relayout(containerEl, { width, height });
+	}
+
 	function toggleFullscreen() {
 		if (!wrapperEl) return;
 		if (!document.fullscreenElement) {
 			wrapperEl.requestFullscreen().catch((err) => {
-				error = `Fullscreen unavailable: ${err.message}`;
+				error = formatMessage(t.fullscreenUnavailable, { error: err.message });
 			});
 		} else {
 			document.exitFullscreen().catch((err) => {
-				error = `Exit fullscreen failed: ${err.message}`;
+				error = formatMessage(t.exitFullscreenFailed, { error: err.message });
 			});
 		}
 	}
@@ -61,26 +87,41 @@
 	$effect(() => {
 		function onFullscreenChange() {
 			isFullscreen = !!document.fullscreenElement;
-			Promise.resolve().then(() => {
-				// @ts-expect-error — Plotly is loaded dynamically onto window
-				if (containerEl && window.Plotly) {
-					// @ts-expect-error — Plotly is loaded dynamically onto window
-					window.Plotly.Plots.resize(containerEl);
-				}
-			});
+			// `tick()` waits for the h-dvh/h-95 class swap this state drives to actually reach the
+			// DOM before resizeChart measures it.
+			tick().then(resizeChart);
 		}
 		document.addEventListener('fullscreenchange', onFullscreenChange);
 		return () => document.removeEventListener('fullscreenchange', onFullscreenChange);
 	});
 
+	// Chromium's getComputedStyle returns color values in whatever function the CSS used to
+	// declare them — oklch() here, since base.css's theme tokens are oklch(). Plotly's own color
+	// parser doesn't recognize oklch() and silently falls back to its #444 default instead of
+	// erroring, so every chart read dark axis text even in dark mode. `fillStyle` alone just
+	// echoes the oklch() string back unconverted; actually rasterizing a pixel and reading its
+	// bytes is what forces a real rgb() value Plotly can parse.
+	function toRgb(cssColor: string): string {
+		const canvas = document.createElement('canvas');
+		canvas.width = 1;
+		canvas.height = 1;
+		const ctx = canvas.getContext('2d');
+		if (!ctx) return cssColor;
+		ctx.fillStyle = cssColor;
+		ctx.fillRect(0, 0, 1, 1);
+		const [r, g, b, a] = ctx.getImageData(0, 0, 1, 1).data;
+		return a === 255 ? `rgb(${r}, ${g}, ${b})` : `rgba(${r}, ${g}, ${b}, ${(a / 255).toFixed(3)})`;
+	}
+
 	function getThemeColors(): { textColor: string; gridColor: string } {
 		if (!containerEl) return { textColor: '#333', gridColor: '#eee' };
 		const style = getComputedStyle(containerEl);
-		const textColor = style.getPropertyValue('color').trim() || '#333';
-		const gridColor =
+		const textColor = toRgb(style.getPropertyValue('color').trim() || '#333');
+		const gridColor = toRgb(
 			style.getPropertyValue('--border')?.trim() ||
-			style.getPropertyValue('--color-border')?.trim() ||
-			'rgba(128,128,128,0.2)';
+				style.getPropertyValue('--color-border')?.trim() ||
+				'rgba(128,128,128,0.2)'
+		);
 		return { textColor, gridColor };
 	}
 
@@ -113,11 +154,15 @@
 				font: { color: textColor },
 				paper_bgcolor: layoutRest.paper_bgcolor ?? 'transparent',
 				plot_bgcolor: layoutRest.plot_bgcolor ?? 'transparent',
-				...(!isMapFigure && layoutRest.xaxis
-					? { xaxis: { ...(layoutRest.xaxis as object), gridcolor: gridColor, color: textColor } }
-					: {}),
-				...(!isMapFigure && layoutRest.yaxis
-					? { yaxis: { ...(layoutRest.yaxis as object), gridcolor: gridColor, color: textColor } }
+				// Plotly's axis tick/label color doesn't inherit the top-level `font.color`, so this
+				// has to be set even when the figure's own JSON never declared an xaxis/yaxis —
+				// which the mock's figures don't. Gating on `layoutRest.xaxis` existing left every
+				// axis on Plotly's built-in #444 default, light or dark mode.
+				...(!isMapFigure
+					? {
+							xaxis: { ...(layoutRest.xaxis as object), gridcolor: gridColor, color: textColor },
+							yaxis: { ...(layoutRest.yaxis as object), gridcolor: gridColor, color: textColor }
+						}
 					: {})
 			};
 
@@ -129,7 +174,7 @@
 				...figData.config
 			});
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Failed to render chart';
+			error = e instanceof Error ? e.message : t.chartRenderFailed;
 		} finally {
 			loading = false;
 		}
@@ -142,11 +187,7 @@
 		const ro = new ResizeObserver(() => {
 			if (resizeTimer) clearTimeout(resizeTimer);
 			resizeTimer = setTimeout(() => {
-				// @ts-expect-error — Plotly is loaded dynamically onto window
-				if (containerEl && window.Plotly) {
-					// @ts-expect-error — Plotly is loaded dynamically onto window
-					window.Plotly.Plots.resize(containerEl);
-				}
+				resizeChart();
 				resizeTimer = null;
 			}, 150);
 		});
@@ -163,6 +204,10 @@
 	let renderTimeout: ReturnType<typeof setTimeout> | null = null;
 
 	$effect(() => {
+		// Re-reads mode.current so a theme toggle re-renders with the new axis/font colors —
+		// getThemeColors() only reads the DOM once, at render time, and nothing else repaints an
+		// already-drawn chart when the page's color scheme changes under it.
+		void mode.current;
 		if (!value || !mounted || !containerEl) return;
 		if (renderTimeout) clearTimeout(renderTimeout);
 		renderTimeout = setTimeout(() => {
@@ -177,25 +222,20 @@
 
 <div
 	bind:this={wrapperEl}
-	class="group rounded relative overflow-hidden border border-border {isFullscreen
+	class="group relative overflow-hidden rounded-lg border border-border {isFullscreen
 		? 'bg-background'
 		: ''}"
 >
 	{#if error}
 		<div class="px-4 py-3 text-sm text-destructive">{error}</div>
-	{:else if !figData && value}
-		<div class="px-4 py-8 text-sm text-center text-muted-foreground">Receiving chart data...</div>
 	{:else if !figData}
-		<div class="px-4 py-8 text-sm text-center text-muted-foreground">Waiting for chart data...</div>
+		<!-- The layout hides this output while it has no data, so this is data that doesn't parse yet. -->
+		<div class="px-4 py-8 text-sm text-center text-muted-foreground">{t.chartReceiving}</div>
 	{:else}
-		<div
-			bind:this={containerEl}
-			class="w-full"
-			style="height: {isFullscreen ? '100vh' : '380px'};"
-		></div>
+		<div bind:this={containerEl} class="w-full {isFullscreen ? 'h-dvh' : 'h-95'}"></div>
 
 		<div
-			class="gap-1 left-2 top-2 absolute z-10 flex items-center opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100 {isFullscreen
+			class="gap-1 left-2 top-2 absolute z-10 flex items-center opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100 pointer-coarse:opacity-100 {isFullscreen
 				? 'opacity-100'
 				: ''}"
 		>
@@ -207,18 +247,21 @@
 				</div>
 			{/if}
 
-			<button
-				onclick={toggleFullscreen}
-				disabled={loading}
-				title={isFullscreen ? 'Exit fullscreen' : 'Fullscreen'}
-				class="rounded p-1.5 backdrop-blur-sm flex items-center border border-border bg-background/80 text-foreground transition-colors hover:bg-background disabled:cursor-not-allowed disabled:opacity-50"
-			>
-				{#if isFullscreen}
-					<Minimize size={14} />
-				{:else}
-					<Maximize size={14} />
-				{/if}
-			</button>
+			{#if fullscreenSupported}
+				<button
+					onclick={toggleFullscreen}
+					disabled={loading}
+					title={isFullscreen ? t.exitFullscreen : t.fullscreen}
+					aria-label={isFullscreen ? t.exitFullscreen : t.fullscreen}
+					class="rounded p-1.5 backdrop-blur-sm flex items-center border border-border bg-background/80 text-foreground transition-colors hover:bg-background disabled:cursor-not-allowed disabled:opacity-50"
+				>
+					{#if isFullscreen}
+						<Minimize size={14} />
+					{:else}
+						<Maximize size={14} />
+					{/if}
+				</button>
+			{/if}
 		</div>
 	{/if}
 </div>

package/src/lib/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 '$lib/components/primitives/card';
 	import { ChevronDown } from '@lucide/svelte';
 	import { buildVisibilityMap, itemKey } from '$lib/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/src/lib/components/preview/HelpButton.svelte

@@ -0,0 +1,36 @@
+<script lang="ts">
+	import { HelpCircle } from '@lucide/svelte';
+	import * as Dialog from '$lib/components/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>