@selvajs/ui 6.6.0-beta.9 → 7.0.1-beta.0

package/src/lib/compute/solving.svelte.ts

@@ -2,91 +2,92 @@ import { untrack } from 'svelte';
 import { APP_DEFAULTS } from '../constants';
 
 /**
- * Adaptive solving indicator: measures solve durations and adjusts its
- * visibility delay from the running average.
- *
- * - Average under FAST_THRESHOLD_MS: never shown, so quick solves don't flicker
- * - Average over SLOW_THRESHOLD_MS: shown immediately
- * - Between the two: shown after a proportional slice of ANIMATION_DELAY
- * - First solve: shown immediately, there is no history yet
+ * When to show that a solve is running. A solve that ends within `SHOW_AFTER_MS` shows nothing:
+ * the result updating is feedback enough, and a spinner that flashes for a frame reads as jank.
+ * Once shown, the indicator stays `MIN_VISIBLE_MS` for the same reason. `slow` turns on past
+ * `SLOW_AFTER_MS`, the case of a Rhino.Compute round trip or a heavy definition.
  *
  * `freezesDuringSolve` is for a host that can't paint while it solves (an embedded WebView on
- * the solver's thread). There the indicator has to be on screen before the solve starts, when its
- * length is still unknown, so it follows `isSolving` exactly: no history, no delay.
+ * the solver's thread). A delay can't run there, so the indicator shows on every solve, before
+ * the solve takes the thread: it is the only place that host can say Esc aborts.
  */
 export function createSolvingIndicator(
 	isSolving: () => boolean,
 	options: { freezesDuringSolve?: boolean } = {}
-): { readonly show: boolean } {
+): { readonly show: boolean; readonly slow: boolean } {
+	const { SHOW_AFTER_MS, MIN_VISIBLE_MS, SLOW_AFTER_MS } = APP_DEFAULTS.SOLVING_INDICATOR;
+
 	if (options.freezesDuringSolve) {
 		return {
+			// Read straight from `isSolving`, not through an effect: an effect would run a tick
+			// later, after the solve has already frozen the page.
 			get show() {
 				return isSolving();
-			}
+			},
+			slow: false
 		};
 	}
 
-	const { FAST_THRESHOLD_MS, SLOW_THRESHOLD_MS, HISTORY_SIZE, ANIMATION_DELAY } =
-		APP_DEFAULTS.SOLVING_INDICATOR;
-
 	let show = $state(false);
-	let timeout: ReturnType<typeof setTimeout> | null = null;
-	let solveStartTime: number | null = null;
-	const solveHistory: number[] = [];
+	let slow = $state(false);
+	let shownAt = 0;
+	let showTimer: ReturnType<typeof setTimeout> | null = null;
+	let slowTimer: ReturnType<typeof setTimeout> | null = null;
+	let hideTimer: ReturnType<typeof setTimeout> | null = null;
+
+	function clear(timer: ReturnType<typeof setTimeout> | null) {
+		if (timer) clearTimeout(timer);
+		return null;
+	}
+
+	function hide() {
+		hideTimer = null;
+		show = false;
+		slow = false;
+	}
 
 	$effect(() => {
 		const solving = isSolving();
-
 		untrack(() => {
 			if (solving) {
-				solveStartTime = performance.now();
-
-				const avg =
-					solveHistory.length === 0
-						? Infinity
-						: solveHistory.reduce((a, b) => a + b, 0) / solveHistory.length;
-
-				if (solveHistory.length > 0 && avg < FAST_THRESHOLD_MS) return;
-
-				const delay =
-					avg === Infinity || avg >= SLOW_THRESHOLD_MS
-						? 0
-						: ((avg - FAST_THRESHOLD_MS) / (SLOW_THRESHOLD_MS - FAST_THRESHOLD_MS)) *
-							ANIMATION_DELAY;
-
-				if (!timeout) {
-					if (delay === 0) {
+				// A solve that starts while the last one's indicator is held keeps it up.
+				hideTimer = clear(hideTimer);
+				if (!show) {
+					showTimer ??= setTimeout(() => {
+						showTimer = null;
 						show = true;
-					} else {
-						timeout = setTimeout(() => {
-							show = true;
-							timeout = null;
-						}, delay);
-					}
+						shownAt = performance.now();
+					}, SHOW_AFTER_MS);
 				}
+				slowTimer ??= setTimeout(() => {
+					slowTimer = null;
+					slow = true;
+				}, SLOW_AFTER_MS);
 			} else {
-				if (solveStartTime !== null) {
-					solveHistory.push(performance.now() - solveStartTime);
-					if (solveHistory.length > HISTORY_SIZE) solveHistory.shift();
-					solveStartTime = null;
-				}
-
-				if (timeout) {
-					clearTimeout(timeout);
-					timeout = null;
-				}
-				show = false;
+				showTimer = clear(showTimer);
+				slowTimer = clear(slowTimer);
+				if (!show) return;
+				const remaining = MIN_VISIBLE_MS - (performance.now() - shownAt);
+				if (remaining > 0) hideTimer ??= setTimeout(hide, remaining);
+				else hide();
 			}
 		});
+	});
 
-		return () => {
-			if (timeout) clearTimeout(timeout);
-		};
+	// Separate from the effect above: a cleanup there would run on every `isSolving` flip and
+	// cancel the timers it just set.
+	$effect(() => () => {
+		clear(showTimer);
+		clear(slowTimer);
+		clear(hideTimer);
 	});
 
 	return {
 		get show() {
 			return show;
+		},
+		get slow() {
+			return slow;
 		}
 	};
 }

package/src/lib/constants.ts

@@ -1,8 +1,7 @@
 export const APP_DEFAULTS = {
 	// File upload limits
 	// TEMP (dev): raised 150 MB → 300 MB so large dev file-widget inputs aren't
-	// blocked client-side. The server request cap (COMPUTE_REQUEST_MAX_BYTES)
-	// still defaults to 256 MB, and base64 inflates a raw file by ~4/3, so
+	// blocked client-side. The server request cap is 256 MB, and base64 inflates a raw file by ~4/3, so
 	// anything over ~192 MB is rejected with a 413 after the client accepts it.
 	// Revert to 150 before release.
 	FILE_UPLOAD: {
@@ -18,16 +17,14 @@ export const APP_DEFAULTS = {
 		DRAWER_ANIMATION_MS: 350
 	},
 
-	// Solving indicator adaptive thresholds
+	// See createSolvingIndicator.
 	SOLVING_INDICATOR: {
-		/** If solve is faster than this, don't show indicator (ms) */
-		FAST_THRESHOLD_MS: 200,
-		/** If solve is slower than this, show indicator immediately (ms) */
-		SLOW_THRESHOLD_MS: 600,
-		/** Animation delay for solve indicator (ms) */
-		ANIMATION_DELAY: 300,
-		/** Number of solve durations to keep in history for averaging */
-		HISTORY_SIZE: 3
+		/** A solve that ends sooner shows no indicator (ms) */
+		SHOW_AFTER_MS: 400,
+		/** Once shown, the indicator stays at least this long (ms) */
+		MIN_VISIBLE_MS: 500,
+		/** Past this a solve counts as slow and the viewer dims its stale result (ms) */
+		SLOW_AFTER_MS: 2000
 	},
 
 	// File size formatting

package/src/lib/contexts/hostContext.svelte.ts

@@ -1,6 +1,6 @@
 import { getContext, setContext } from 'svelte';
 import type { GeometryKind } from '@selvajs/schemas';
-import type { UIHost } from '$lib/schema/host-support';
+import type { UIHost } from '#lib/schema/host-support.js';
 
 // Tells InputControl which host it renders in and how to reach the host's own actions, without
 // threading a prop through every layout layer. Without a provider the host is Selva.

package/src/lib/features/chart/plotly-compat.ts

@@ -0,0 +1,141 @@
+import { hsvToRgb } from '#lib/utils/color-space.js';
+
+// ============================================================================
+// Plotly 3 → 4 figure compatibility
+// ============================================================================
+//
+// Chart outputs come from whatever plugin version solved them, often one written against
+// Plotly 3. This rewrites the parts Plotly 4 draws differently or rejects, so those figures
+// keep their look. Figures that are already compatible pass through unchanged.
+
+type Json = Record<string, unknown>;
+
+export interface PlotlyFigure {
+	data: Json[];
+	layout?: Json;
+	config?: Json;
+	frames?: Json[];
+}
+
+const REMOVED_MAP_TRACES: Record<string, string> = {
+	scattermapbox: 'scattermap',
+	choroplethmapbox: 'choroplethmap',
+	densitymapbox: 'densitymap'
+};
+
+const MAPBOX_SUBPLOT = /^mapbox(\d*)$/;
+const BARE_HEX = /^(?:[0-9a-f]{3,4}|[0-9a-f]{6}|[0-9a-f]{8})$/i;
+const HSV_FUNCTION =
+	/^hsva?[\s(]+([-+\d.]+)%?[\s,]+([\d.]+)(%?)[\s,]+([\d.]+)(%?)(?:[\s,/]+([\d.]+)(%?))?[\s)]*$/i;
+
+const isObject = (v: unknown): v is Json =>
+	typeof v === 'object' && v !== null && !Array.isArray(v);
+
+/** Returns a rewritten copy; the input is not modified. */
+export function upgradePlotlyFigure(figure: PlotlyFigure): PlotlyFigure {
+	const out = structuredClone(figure);
+	const layout = out.layout ?? {};
+	normalizeColors(layout);
+
+	let migratedMaps = false;
+	for (const trace of out.data ?? []) {
+		if (!isObject(trace)) continue;
+		normalizeColors(trace);
+
+		const replacement = REMOVED_MAP_TRACES[trace.type as string];
+		if (replacement) {
+			trace.type = replacement;
+			if (typeof trace.subplot === 'string')
+				trace.subplot = trace.subplot.replace(MAPBOX_SUBPLOT, 'map$1');
+			migratedMaps = true;
+		} else if (trace.type === 'splom') {
+			keepSplomAxesUnlinked(trace);
+		}
+	}
+
+	if (migratedMaps) migrateMapLayout(layout);
+	// Frame data replaces trace data during playback, so it needs the same colour fixes.
+	for (const frame of out.frames ?? []) if (isObject(frame)) normalizeColors(frame);
+	return { ...out, layout };
+}
+
+// Plotly 4 links each dimension's x and y axes by default.
+function keepSplomAxesUnlinked(trace: Json) {
+	if (!Array.isArray(trace.dimensions)) return;
+	for (const dim of trace.dimensions) {
+		if (!isObject(dim)) continue;
+		const axis = isObject(dim.axis) ? dim.axis : (dim.axis = {});
+		if (!('matches' in axis)) axis.matches = false;
+	}
+}
+
+function migrateMapLayout(layout: Json) {
+	for (const key of Object.keys(layout)) {
+		const match = MAPBOX_SUBPLOT.exec(key);
+		if (!match) continue;
+
+		const map = layout[key];
+		delete layout[key];
+		const newKey = `map${match[1]}`;
+		if (newKey in layout || !isObject(map)) continue;
+
+		delete map.accesstoken;
+		// Stamen and mapbox:// styles have no map equivalent.
+		if (typeof map.style === 'string' && /^(stamen|mapbox:\/\/)/.test(map.style))
+			map.style = 'open-street-map';
+		layout[newKey] = map;
+	}
+}
+
+// Plotly attributes that hold colours: *color, colorway, colorscale and pie's marker.colors.
+const isColorKey = (key: string) =>
+	key.toLowerCase().endsWith('color') ||
+	key === 'colors' ||
+	key === 'colorway' ||
+	key === 'colorscale';
+
+function normalizeColors(props: Json) {
+	for (const [key, value] of Object.entries(props)) {
+		if (isColorKey(key)) props[key] = normalizeColorValue(value, false);
+		else if (isObject(value)) normalizeColors(value);
+		else if (Array.isArray(value))
+			for (const item of value) if (isObject(item)) normalizeColors(item);
+	}
+}
+
+// Covers a single colour, a per-point list and colorscale stops ([[0, "ff0000"], ...]).
+function normalizeColorValue(value: unknown, inList: boolean): unknown {
+	if (Array.isArray(value)) return value.map((v) => normalizeColorValue(v, true));
+	if (typeof value !== 'string') return value;
+	// Plotly reads numeric strings in a per-point list as numbers for the colorscale.
+	if (inList && /^\s*\d+\s*$/.test(value)) return value;
+	return normalizePlotlyColor(value);
+}
+
+/**
+ * Rewrites colour spellings Plotly 3 accepted but Plotly 4 rejects (hex without `#`, `hsv()`)
+ * into valid CSS. Anything else is returned unchanged.
+ */
+export function normalizePlotlyColor(color: string): string {
+	const value = color.trim();
+	if (BARE_HEX.test(value)) return `#${value}`;
+
+	const hsv = HSV_FUNCTION.exec(value);
+	if (!hsv) return color;
+
+	const { r, g, b } = hsvToRgb({
+		h: Number(hsv[1]),
+		s: unit(hsv[2], hsv[3] === '%'),
+		v: unit(hsv[4], hsv[5] === '%')
+	});
+	const rgb = `${Math.round(r)},${Math.round(g)},${Math.round(b)}`;
+	if (hsv[6] === undefined) return `rgb(${rgb})`;
+	return `rgba(${rgb},${+unit(hsv[6], hsv[7] === '%').toFixed(3)})`;
+}
+
+// Plotly 3 (TinyColor) read 0..1 as a fraction and anything above 1 as a percentage.
+function unit(s: string, percent: boolean): number {
+	let x = Number(s);
+	if (percent || x > 1) x /= 100;
+	return Math.min(1, Math.max(0, x));
+}

package/src/lib/i18n/messages.ts

@@ -40,6 +40,8 @@ export interface ViewerMessages {
 	lookTechnical: string;
 	lookStudio: string;
 	lookShowcase: string;
+	lookNight: string;
+	nightMode: string;
 	lookArctic: string;
 	lookXray: string;
 	lookLineart: string;
@@ -77,6 +79,10 @@ export interface ViewerMessages {
 	solveMessagesEscHint: string;
 	solveMessagesDismiss: string;
 	solveSolving: string;
+	/** A visible solve has landed; followed by how long it took. */
+	solveDone: string;
+	/** A visible solve was aborted; the previous result stays. */
+	solveStopped: string;
 	parametersTab: string;
 	moreTab: string;
 	scrollTabsBack: string;
@@ -131,6 +137,16 @@ export interface ViewerMessages {
 	/** `{max}` is replaced with the field's character limit. */
 	maxLength: string;
 	invalidFormat: string;
+	/** Trigger label; `{color}` is the current hex value. */
+	colorPick: string;
+	colorArea: string;
+	/** `{s}` and `{v}` are percentages. */
+	colorAreaValue: string;
+	colorHue: string;
+	colorHex: string;
+	colorHexInvalid: string;
+	colorPresets: string;
+	colorEyedropper: string;
 	invalidPattern: string;
 
 	// Geometry input (Rhino only)
@@ -219,6 +235,7 @@ export interface ViewerMessages {
 	copied: string;
 	chartReceiving: string;
 	chartRenderFailed: string;
+	downloadChartImage: string;
 	/** `{error}` is replaced with the browser's reason. */
 	fullscreenUnavailable: string;
 	/** `{error}` is replaced with the browser's reason. */
@@ -268,6 +285,8 @@ const en: ViewerMessages = {
 	lookTechnical: 'Technical',
 	lookStudio: 'Studio',
 	lookShowcase: 'Showcase',
+	lookNight: 'Night',
+	nightMode: 'Night mode',
 	lookArctic: 'Arctic',
 	lookXray: 'X-Ray',
 	lookLineart: 'Line Art',
@@ -300,6 +319,8 @@ const en: ViewerMessages = {
 	solveMessagesEscHint: 'Esc aborts the solve',
 	solveMessagesDismiss: 'Dismiss',
 	solveSolving: 'Solving…',
+	solveDone: 'Done',
+	solveStopped: 'Stopped',
 	parametersTab: 'Parameters',
 	moreTab: 'More',
 	scrollTabsBack: 'Previous tabs',
@@ -340,6 +361,14 @@ const en: ViewerMessages = {
 	fineDragHint: 'Hold Shift to drag finely',
 	maxLength: 'Maximum {max} characters allowed',
 	invalidFormat: 'Invalid format',
+	colorPick: 'Choose color, currently {color}',
+	colorArea: 'Saturation and brightness',
+	colorAreaValue: 'Saturation {s}%, brightness {v}%',
+	colorHue: 'Hue',
+	colorHex: 'Hex color',
+	colorHexInvalid: 'Enter a hex color such as #2f6fd6',
+	colorPresets: 'Presets',
+	colorEyedropper: 'Pick a color from the screen',
 	invalidPattern: 'Invalid validation pattern configured',
 
 	geometryPickAnyOne: 'Pick an object',
@@ -417,6 +446,7 @@ const en: ViewerMessages = {
 	copied: 'Copied!',
 	chartReceiving: 'Receiving chart data...',
 	chartRenderFailed: 'Failed to render chart',
+	downloadChartImage: 'Download plot as image',
 	fullscreenUnavailable: 'Fullscreen unavailable: {error}',
 	exitFullscreenFailed: 'Exit fullscreen failed: {error}',
 
@@ -461,6 +491,8 @@ const de: ViewerMessages = {
 	lookTechnical: 'Technisch',
 	lookStudio: 'Studio',
 	lookShowcase: 'Präsentation',
+	lookNight: 'Nacht',
+	nightMode: 'Nachtmodus',
 	lookArctic: 'Arktis',
 	lookXray: 'Röntgen',
 	lookLineart: 'Strichzeichnung',
@@ -494,6 +526,8 @@ const de: ViewerMessages = {
 	solveMessagesEscHint: 'Esc bricht die Berechnung ab',
 	solveMessagesDismiss: 'Schliessen',
 	solveSolving: 'Berechnung läuft…',
+	solveDone: 'Fertig',
+	solveStopped: 'Abgebrochen',
 	parametersTab: 'Parameter',
 	moreTab: 'Mehr',
 	scrollTabsBack: 'Vorherige Tabs',
@@ -534,6 +568,14 @@ const de: ViewerMessages = {
 	fineDragHint: 'Umschalttaste halten für feine Schritte',
 	maxLength: 'Höchstens {max} Zeichen erlaubt',
 	invalidFormat: 'Ungültiges Format',
+	colorPick: 'Farbe wählen, aktuell {color}',
+	colorArea: 'Sättigung und Helligkeit',
+	colorAreaValue: 'Sättigung {s} %, Helligkeit {v} %',
+	colorHue: 'Farbton',
+	colorHex: 'Hex-Farbe',
+	colorHexInvalid: 'Hex-Farbe eingeben, z. B. #2f6fd6',
+	colorPresets: 'Vorgaben',
+	colorEyedropper: 'Farbe vom Bildschirm aufnehmen',
 	invalidPattern: 'Ungültiges Prüfmuster hinterlegt',
 
 	geometryPickAnyOne: 'Objekt wählen',
@@ -612,6 +654,7 @@ const de: ViewerMessages = {
 	copied: 'Kopiert!',
 	chartReceiving: 'Diagrammdaten werden empfangen…',
 	chartRenderFailed: 'Diagramm konnte nicht dargestellt werden',
+	downloadChartImage: 'Diagramm als Bild herunterladen',
 	fullscreenUnavailable: 'Vollbild nicht verfügbar: {error}',
 	exitFullscreenFailed: 'Vollbild konnte nicht beendet werden: {error}',
 

package/src/lib/index.ts

@@ -13,12 +13,14 @@ export { default as ErrorScreen } from './components/ErrorScreen.svelte';
 // Design-system primitives (shadcn-svelte + custom)
 export * from './components/primitives';
 export { default as StateDisplay } from './components/primitives/StateDisplay.svelte';
+export { default as ColorInput } from './components/preview/inputs/ColorInput.svelte';
 
 export { default as Viewer } from './components/viewer/Viewer.svelte';
 
 export * from './schema/defaults';
 export * from './schema/dynamic-value-list';
 export * from './schema/traversal';
+export { visibleInputItems } from './schema/visibility-rules';
 export {
 	type UIHost,
 	type ElementKind,

package/src/lib/public.ts

@@ -80,6 +80,7 @@ export {
 export * from './schema/defaults';
 export * from './schema/traversal';
 export * from './schema/dynamic-value-list';
+export { visibleInputItems } from './schema/visibility-rules';
 
 // UI-facing runtime types (not from schema)
 export type { ActionButton } from './types/actionButton';

package/src/lib/schema/visibility-rules.ts

@@ -1,10 +1,12 @@
 import type {
+	InputLayoutItem,
 	LayoutItem,
 	OutputLayoutItem,
 	VisibilityRule,
 	VisibilityCondition,
 	GroupVisibilityCondition,
-	TabConfig
+	TabConfig,
+	UISchema
 } from '@selvajs/schemas';
 import { isFileData } from '../utils/file-download';
 
@@ -148,6 +150,30 @@ export function isTabVisible(tab: TabConfig, values: Record<string, unknown>): b
 	);
 }
 
+/**
+ * The input items the form shows for these values: each passes its own condition, inside a
+ * shown group and, when tabbed, a shown tab. For a host that repeats the form back, such as a
+ * summary before a commit, without re-deriving the renderer's rules.
+ */
+export function visibleInputItems(
+	schema: UISchema,
+	values: Record<string, unknown>
+): InputLayoutItem[] {
+	const layout = schema?.layout;
+	const groups =
+		layout?.type === 'tabbed'
+			? (layout.tabs ?? []).filter((t) => isTabVisible(t, values)).flatMap((t) => t.groups ?? [])
+			: layout?.type === 'flat'
+				? (layout.groups ?? [])
+				: [];
+	return groups
+		.filter((g) => evaluateGroupVisibility(g, values))
+		.flatMap((g) => g.items ?? [])
+		.filter(
+			(i): i is InputLayoutItem => i.type === 'input' && evaluateVisibility(i, values).visible
+		);
+}
+
 /**
  * A linebreak is always "visible" but renders as a divider only, so a group left with
  * nothing but separators counts as empty.