@protobase/ui 0.12.11 → 0.12.12

package/dist/filter-panel/combobox-options.js

@@ -0,0 +1,12 @@
+import { matchesSearch } from "./filter-state.js";
+//#region src/filter-panel/combobox-options.ts
+/** The options a combobox lists for its search text: as given when the group searches itself, else those whose name matches. */
+const comboboxOptions = (group, query) => group.onSearch ? group.options : group.options.filter((option) => matchesSearch(option.label, query));
+/** The option the arrow keys move to, wrapping around at either end; -1 when there are none. */
+const moveActive = (active, count, key) => {
+	if (count === 0) return -1;
+	if (key === "ArrowDown") return active < 0 ? 0 : (active + 1) % count;
+	return active < 0 ? count - 1 : (active - 1 + count) % count;
+};
+//#endregion
+export { comboboxOptions, moveActive };

package/dist/filter-panel/facet-combobox.js

@@ -0,0 +1,131 @@
+import { cn } from "../lib/cn.js";
+import { formatInt } from "../format/number.js";
+import { facetLabel } from "./filter-state.js";
+import { comboboxOptions, moveActive } from "./combobox-options.js";
+import { useEffect, useId, useRef, useState } from "react";
+import { Check, Search, X } from "lucide-react";
+import { jsx, jsxs } from "react/jsx-runtime";
+//#region src/filter-panel/facet-combobox.tsx
+/** Chooses several values of a facet: the choices sit in the box as removable tokens, typing searches the options. */
+const FacetCombobox = ({ config, selected, onToggle, inline = false }) => {
+	const id = useId();
+	const input = useRef(null);
+	const [query, setQuery] = useState("");
+	const [focused, setFocused] = useState(false);
+	const [active, setActive] = useState(-1);
+	const open = inline || focused;
+	const options = comboboxOptions(config, query);
+	const onSearch = useRef(config.onSearch);
+	onSearch.current = config.onSearch;
+	useEffect(() => () => onSearch.current?.(""), []);
+	const search = (text) => {
+		setQuery(text);
+		setActive(-1);
+		config.onSearch?.(text);
+	};
+	const onKeyDown = (event) => {
+		if (event.key === "ArrowDown" || event.key === "ArrowUp") {
+			event.preventDefault();
+			setActive(moveActive(active, options.length, event.key));
+			return;
+		}
+		if (event.key === "Enter" && options[active]) {
+			event.preventDefault();
+			onToggle(options[active].value);
+			return;
+		}
+		if (event.key === "Backspace" && query === "" && selected.length > 0) {
+			onToggle(selected[selected.length - 1]);
+			return;
+		}
+		if (event.key === "Escape" && query !== "") {
+			event.stopPropagation();
+			search("");
+		}
+	};
+	return /* @__PURE__ */ jsxs("div", {
+		className: "flex flex-col gap-1",
+		children: [/* @__PURE__ */ jsxs("div", {
+			className: "flex min-h-8 cursor-text flex-wrap items-center gap-1 rounded-md border border-border-strong bg-background px-2 py-1 shadow-sm focus-within:border-primary focus-within:ring-2 focus-within:ring-primary/20",
+			onClick: () => input.current?.focus(),
+			children: [
+				/* @__PURE__ */ jsx(Search, { className: "size-3.5 shrink-0 text-muted-foreground" }),
+				selected.map((value) => /* @__PURE__ */ jsxs("span", {
+					className: "inline-flex h-5 max-w-full items-center gap-0.5 rounded bg-primary-soft pl-1.5 pr-0.5 text-xs font-medium text-primary-text",
+					children: [/* @__PURE__ */ jsx("span", {
+						className: "truncate",
+						children: facetLabel(config, value)
+					}), /* @__PURE__ */ jsx("button", {
+						type: "button",
+						"aria-label": `Remove ${facetLabel(config, value)}`,
+						className: "rounded p-0.5 hover:bg-primary-border/60",
+						onMouseDown: (event) => event.preventDefault(),
+						onClick: () => onToggle(value),
+						children: /* @__PURE__ */ jsx(X, { className: "size-3" })
+					})]
+				}, value)),
+				/* @__PURE__ */ jsx("input", {
+					ref: input,
+					autoFocus: inline,
+					role: "combobox",
+					"aria-label": config.label,
+					"aria-expanded": open,
+					"aria-controls": `${id}-options`,
+					"aria-autocomplete": "list",
+					"aria-activedescendant": options[active] ? `${id}-${active}` : void 0,
+					placeholder: selected.length > 0 ? "" : `Search ${config.label.toLowerCase()}`,
+					className: "h-6 min-w-16 flex-1 bg-transparent text-[13px] text-foreground outline-none placeholder:text-faint-foreground",
+					value: query,
+					onChange: (event) => search(event.target.value),
+					onKeyDown,
+					onFocus: () => setFocused(true),
+					onBlur: () => {
+						setFocused(false);
+						setActive(-1);
+						if (!inline && query !== "") search("");
+					}
+				})
+			]
+		}), open && /* @__PURE__ */ jsxs("ul", {
+			id: `${id}-options`,
+			role: "listbox",
+			"aria-label": config.label,
+			"aria-multiselectable": true,
+			className: cn("flex max-h-60 flex-col gap-px overflow-y-auto", !inline && "rounded-md border bg-background p-1 shadow-sm"),
+			children: [options.map((option, index) => {
+				const chosen = selected.includes(option.value);
+				return /* @__PURE__ */ jsxs("li", {
+					id: `${id}-${index}`,
+					role: "option",
+					"aria-selected": chosen,
+					tabIndex: -1,
+					className: cn("flex cursor-pointer items-center gap-2 rounded px-1.5 py-1 hover:bg-muted", index === active && "bg-muted"),
+					onMouseDown: (event) => event.preventDefault(),
+					onClick: () => onToggle(option.value),
+					children: [
+						/* @__PURE__ */ jsx("span", {
+							className: cn("inline-flex size-4 shrink-0 items-center justify-center rounded border", chosen ? "border-primary bg-primary text-primary-foreground" : "border-border-strong bg-background"),
+							children: chosen && /* @__PURE__ */ jsx(Check, {
+								className: "size-3",
+								strokeWidth: 3
+							})
+						}),
+						/* @__PURE__ */ jsx("span", {
+							className: "flex-1 truncate",
+							children: option.label
+						}),
+						option.count !== void 0 && /* @__PURE__ */ jsx("span", {
+							className: "text-xs tabular-nums text-faint-foreground",
+							children: formatInt(option.count)
+						})
+					]
+				}, option.value);
+			}), options.length === 0 && /* @__PURE__ */ jsx("li", {
+				className: "px-1.5 py-1 text-xs text-faint-foreground",
+				children: "No matches"
+			})]
+		})]
+	});
+};
+//#endregion
+export { FacetCombobox };

package/dist/filter-panel/facet-group.js

@@ -31,7 +31,7 @@ const FacetGroup = ({ config, selected, onToggle }) => {
 						className: "flex-1 truncate",
 						children: option.label
 					}),
-					/* @__PURE__ */ jsx("span", {
+					option.count !== void 0 && /* @__PURE__ */ jsx("span", {
 						className: "text-xs tabular-nums text-faint-foreground",
 						children: formatInt(option.count)
 					})

package/dist/filter-panel/filter-menu.js

@@ -1,11 +1,16 @@
 import { cn } from "../lib/cn.js";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { ChevronDown } from "lucide-react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/filter-panel/filter-menu.tsx
 const FilterMenu = ({ label, activeCount, width = 240, defaultOpen = false, children }) => {
 	const [open, setOpen] = useState(defaultOpen);
+	const [alignEnd, setAlignEnd] = useState(false);
 	const root = useRef(null);
+	useLayoutEffect(() => {
+		if (!open || !root.current) return;
+		setAlignEnd(root.current.getBoundingClientRect().left + width > document.documentElement.clientWidth);
+	}, [open, width]);
 	useEffect(() => {
 		if (!open) return;
 		const close = (event) => {
@@ -31,7 +36,7 @@ const FilterMenu = ({ label, activeCount, width = 240, defaultOpen = false, chil
 				/* @__PURE__ */ jsx(ChevronDown, { className: "size-3.5 text-muted-foreground" })
 			]
 		}), open && /* @__PURE__ */ jsx("div", {
-			className: "absolute left-0 top-full z-30 mt-1.5 rounded-lg border bg-background p-3 shadow-pop",
+			className: cn("absolute top-full z-30 mt-1.5 rounded-lg border bg-background p-3 shadow-pop", alignEnd ? "right-0" : "left-0"),
 			style: { width },
 			children
 		})]

package/dist/filter-panel/filter-panel.js

@@ -1,6 +1,7 @@
 import { ActiveFilterChips } from "./active-filter-chips.js";
 import { DatePresets } from "./date-presets.js";
-import { activeChips, emptyFilterState, removeChip, toggleFacetValue, toggleFlag } from "./filter-state.js";
+import { activeChips, emptyFilterState, removeChip, setRange, toggleFacetValue, toggleFlag } from "./filter-state.js";
+import { FacetCombobox } from "./facet-combobox.js";
 import { FacetGroup } from "./facet-group.js";
 import { FilterMenu } from "./filter-menu.js";
 import { FilterSection } from "./filter-section.js";
@@ -20,18 +21,25 @@ const FilterPanel = ({ config, layout, value, defaultValue, onChange, lockedLabe
 		onRemove: (key) => setState(removeChip(state, key)),
 		onClear: () => setState(emptyFilterState)
 	});
-	const facetView = (group) => /* @__PURE__ */ jsx(FacetGroup, {
-		config: group,
-		selected: state.facets[group.id] ?? [],
-		onToggle: (option) => setState(toggleFacetValue(state, group.id, option))
-	});
-	const rangeView = config.range && /* @__PURE__ */ jsx(RangeFilter, {
-		config: config.range,
-		value: state.range,
-		onChange: (range) => setState({
-			...state,
-			range
-		})
+	const facetView = (group, inline = false) => {
+		const selected = state.facets[group.id] ?? [];
+		const onToggle = (option) => setState(toggleFacetValue(state, group.id, option));
+		return group.combobox ? /* @__PURE__ */ jsx(FacetCombobox, {
+			config: group,
+			selected,
+			onToggle,
+			inline
+		}) : /* @__PURE__ */ jsx(FacetGroup, {
+			config: group,
+			selected,
+			onToggle
+		});
+	};
+	const ranges = config.ranges ?? [];
+	const rangeView = (range) => /* @__PURE__ */ jsx(RangeFilter, {
+		config: range,
+		value: state.ranges?.[range.id],
+		onChange: (span) => setState(setRange(state, range.id, span))
 	});
 	const dateView = config.datePresets && /* @__PURE__ */ jsx(DatePresets, {
 		value: state.date,
@@ -64,10 +72,10 @@ const FilterPanel = ({ config, layout, value, defaultValue, onChange, lockedLabe
 				title: group.label,
 				children: facetView(group)
 			}, group.id)),
-			config.range && /* @__PURE__ */ jsx(FilterSection, {
-				title: config.range.label,
-				children: rangeView
-			}),
+			ranges.map((range) => /* @__PURE__ */ jsx(FilterSection, {
+				title: range.label,
+				children: rangeView(range)
+			}, range.id)),
 			dateView && /* @__PURE__ */ jsx(FilterSection, {
 				title: "Date",
 				children: dateView
@@ -82,16 +90,17 @@ const FilterPanel = ({ config, layout, value, defaultValue, onChange, lockedLabe
 		...config.facets.map((group) => /* @__PURE__ */ jsx(FilterMenu, {
 			label: group.label,
 			activeCount: (state.facets[group.id] ?? []).length,
+			width: group.combobox ? 280 : void 0,
 			defaultOpen: defaultOpenMenu === group.id,
-			children: facetView(group)
+			children: facetView(group, true)
 		}, group.id)),
-		...config.range ? [/* @__PURE__ */ jsx(FilterMenu, {
-			label: config.range.label,
-			activeCount: state.range ? 1 : 0,
+		...ranges.map((range) => /* @__PURE__ */ jsx(FilterMenu, {
+			label: range.label,
+			activeCount: state.ranges?.[range.id] ? 1 : 0,
 			width: 280,
-			defaultOpen: defaultOpenMenu === config.range.id,
-			children: rangeView
-		}, "range")] : [],
+			defaultOpen: defaultOpenMenu === range.id,
+			children: rangeView(range)
+		}, `range:${range.id}`)),
 		...dateView ? [/* @__PURE__ */ jsx(Fragment, { children: dateView }, "date")] : []
 	];
 	const toggles = (config.toggles ?? []).map((toggle) => /* @__PURE__ */ jsx("div", {

package/dist/filter-panel/filter-state.js

@@ -19,16 +19,31 @@ const toggleFlag = (state, id) => ({
 	...state,
 	toggles: state.toggles.includes(id) ? state.toggles.filter((entry) => entry !== id) : [...state.toggles, id]
 });
+/** Sets or, with `undefined`, clears the span of one range. */
+const setRange = (state, id, value) => {
+	const { [id]: _, ...others } = state.ranges ?? {};
+	return {
+		...state,
+		ranges: value ? {
+			...others,
+			[id]: value
+		} : others
+	};
+};
+/** A facet value's name: its option's label, else a name the group knows for it, else the value itself. */
+const facetLabel = (group, value) => group.options.find((option) => option.value === value)?.label ?? group.labels?.[value] ?? value;
 const activeChips = (config, state) => {
 	const facetChips = config.facets.flatMap((group) => (state.facets[group.id] ?? []).map((value) => ({
 		key: `facet:${group.id}:${value}`,
-		label: `${group.label}: ${group.options.find((option) => option.value === value)?.label ?? value}`
+		label: `${group.label}: ${facetLabel(group, value)}`
 	})));
-	const range = config.range;
-	const rangeChips = range && state.range ? [{
-		key: "range",
-		label: `${range.label}: ${range.format(state.range[0])} – ${range.format(state.range[1])}`
-	}] : [];
+	const rangeChips = (config.ranges ?? []).flatMap((range) => {
+		const span = state.ranges?.[range.id];
+		return span ? [{
+			key: `range:${range.id}`,
+			label: `${range.label}: ${range.format(span[0])} – ${range.format(span[1])}`
+		}] : [];
+	});
 	const dateChips = state.date ? [{
 		key: "date",
 		label: datePresetLabels[state.date] ?? state.date
@@ -45,19 +60,16 @@ const activeChips = (config, state) => {
 	];
 };
 const removeChip = (state, key) => {
-	if (key === "range") return {
-		...state,
-		range: void 0
-	};
 	if (key === "date") return {
 		...state,
 		date: void 0
 	};
 	const [kind, group, value] = key.split(":");
+	if (kind === "range") return setRange(state, group, void 0);
 	if (kind === "toggle") return toggleFlag(state, group);
 	if (kind === "facet") return toggleFacetValue(state, group, value);
 	throw new Error(`Unknown filter chip key: ${key}`);
 };
 const matchesSearch = (label, query) => label.toLowerCase().includes(query.trim().toLowerCase());
 //#endregion
-export { activeChips, emptyFilterState, matchesSearch, removeChip, toggleFacetValue, toggleFlag };
+export { activeChips, emptyFilterState, facetLabel, matchesSearch, removeChip, setRange, toggleFacetValue, toggleFlag };

package/dist/filter-panel/range-filter.js

@@ -13,14 +13,14 @@ const RangeFilter = ({ config, value, onChange }) => {
 		children: [
 			/* @__PURE__ */ jsxs("div", {
 				className: "px-[7px]",
-				children: [/* @__PURE__ */ jsx("div", {
-					className: "flex h-12 items-end gap-0.5",
+				children: [histogram.length > 0 && /* @__PURE__ */ jsx("div", {
+					className: "mb-1 flex h-12 items-end gap-0.5",
 					children: histogram.map((count, index) => /* @__PURE__ */ jsx("span", {
 						className: cn("flex-1 rounded-t-sm", barInRange(index, histogram.length, min, max, selected) ? "bg-primary/70" : "bg-border"),
 						style: { height: `${Math.max(6, count / peak * 100)}%` }
 					}, index))
 				}), /* @__PURE__ */ jsxs("div", {
-					className: "relative mt-1 h-4",
+					className: "relative h-4",
 					children: [/* @__PURE__ */ jsx("span", { className: "absolute inset-x-0 top-1/2 h-1 -translate-y-1/2 rounded-full bg-border" }), /* @__PURE__ */ jsx("span", {
 						className: "absolute top-1/2 h-1 -translate-y-1/2 rounded-full bg-primary",
 						style: {

package/dist/index.js

@@ -19,8 +19,8 @@ import { useAssistant } from "./assistant-dock/use-assistant.js";
 import { useAssistantClient } from "./assistant-dock/use-assistant-client.js";
 import { useMeta } from "./data/use-meta.js";
 import { AppLink, useAppAddress } from "./app/use-app-address.js";
-import { useFacets, useHistogram, useSeries } from "./data/use-aggregates.js";
 import { useListDisplay } from "./app/displays/display-context.js";
+import { useFacets, useHistogram, useSeries } from "./data/use-aggregates.js";
 import { useLayoutRecord } from "./app/pages/record-scope.js";
 import { uiFromModule } from "./app/pages/ui-from-module.js";
 import { mergeUi } from "./app/pages/merge-ui.js";

package/dist/live/filter-string.js

@@ -62,12 +62,15 @@ const stateToClauses = (config, state, now = /* @__PURE__ */ new Date()) => {
 		if (values.length === 0) return [];
 		return [values.length === 1 ? w.eq(group.id, values[0]) : w.in(group.id, values)];
 	});
-	const range = config.range && state.range ? [w.gte(config.range.id, state.range[0]), w.lte(config.range.id, state.range[1])] : [];
+	const ranges = (config.ranges ?? []).flatMap((range) => {
+		const span = state.ranges?.[range.id];
+		return span ? [w.gte(range.id, span[0]), w.lte(range.id, span[1])] : [];
+	});
 	const date = config.dateField && state.date ? dateClauses(config.dateField, state.date, now, config.dateKind) : [];
 	const toggles = (config.toggles ?? []).filter((toggle) => state.toggles.includes(toggle.id)).map((toggle) => w.eq(toggle.id, true));
 	return [
 		...facets,
-		...range,
+		...ranges,
 		...date,
 		...toggles
 	];
@@ -103,7 +106,8 @@ const textToState = (config, text, now = /* @__PURE__ */ new Date()) => {
 	const extras = [];
 	const facetIds = new Set(config.facets.map((group) => group.id));
 	const toggleIds = new Set((config.toggles ?? []).map((toggle) => toggle.id));
-	const bounds = { clauses: [] };
+	const rangeIds = new Set((config.ranges ?? []).map((range) => range.id));
+	const bounds = /* @__PURE__ */ new Map();
 	let dateClause;
 	let todayEnd;
 	for (const clause of parsed.ast ? flatten(parsed.ast) : []) if (clause.kind === "compare" && facetIds.has(fieldName(clause)) && clause.op === "=" && literalText(clause.value) !== void 0) state.facets[fieldName(clause)] = [...state.facets[fieldName(clause)] ?? [], literalText(clause.value)];
@@ -113,18 +117,23 @@ const textToState = (config, text, now = /* @__PURE__ */ new Date()) => {
 		dateClause = clause;
 	} else if (clause.kind === "compare" && config.dateField === fieldName(clause) && clause.op === "<" && (clause.value.kind === "timestamp" || clause.value.kind === "string") && periodStart("today", now).startsWith(clause.value.value.slice(0, 10))) todayEnd = clause;
 	else if (clause.kind === "compare" && toggleIds.has(fieldName(clause)) && clause.op === "=" && clause.value.kind === "boolean" && clause.value.value) state.toggles.push(fieldName(clause));
-	else if (clause.kind === "compare" && config.range?.id === fieldName(clause) && (clause.op === ">=" || clause.op === "<=") && clause.value.kind === "number") {
-		if (clause.op === ">=") bounds.low = clause.value.value;
-		else bounds.high = clause.value.value;
-		bounds.clauses.push(clause);
+	else if (clause.kind === "compare" && rangeIds.has(fieldName(clause)) && (clause.op === ">=" || clause.op === "<=") && clause.value.kind === "number") {
+		const range = bounds.get(fieldName(clause)) ?? { clauses: [] };
+		if (clause.op === ">=") range.low = clause.value.value;
+		else range.high = clause.value.value;
+		range.clauses.push(clause);
+		bounds.set(fieldName(clause), range);
 	} else extras.push(clause);
 	if (state.date === "yesterday" && !todayEnd) {
 		extras.push(dateClause);
 		state.date = void 0;
 	}
 	if (todayEnd && state.date !== "yesterday") extras.push(todayEnd);
-	if (bounds.low !== void 0 && bounds.high !== void 0) state.range = [bounds.low, bounds.high];
-	else extras.push(...bounds.clauses);
+	for (const [id, range] of bounds) if (range.low !== void 0 && range.high !== void 0) state.ranges = {
+		...state.ranges,
+		[id]: [range.low, range.high]
+	};
+	else extras.push(...range.clauses);
 	return {
 		ok: true,
 		state,

package/dist/live/reference-options.js

@@ -0,0 +1,14 @@
+//#region src/live/reference-options.ts
+/** Records found by a search as options, with the count of each that the facet counts know. */
+const matchOptions = (matches, counted) => {
+	const counts = new Map(counted.map((option) => [option.value, option.count]));
+	return matches.map(([value, label]) => ({
+		value,
+		label,
+		...counts.get(value) !== void 0 && { count: counts.get(value) }
+	}));
+};
+/** The keys a facet needs names for: the values it counted and those chosen, which may lie outside the counted ones. */
+const labelKeys = (counted, chosen) => [.../* @__PURE__ */ new Set([...counted, ...chosen])];
+//#endregion
+export { labelKeys, matchOptions };

package/dist/live/use-filter-config.js

@@ -3,21 +3,28 @@ import { keys } from "../data/query-keys.js";
 import { useClient } from "../data/api-provider.js";
 import { humanize } from "./naming.js";
 import { fetchLabels } from "./relation-labels.js";
+import { setRange } from "../filter-panel/filter-state.js";
 import { stateToText } from "./filter-string.js";
-import { useHistogram } from "../data/use-aggregates.js";
-import { widgetFields } from "./view-fields.js";
+import { labelKeys, matchOptions } from "./reference-options.js";
+import { useReferenceSearch } from "./use-reference-search.js";
+import { rangeHistogram, widgetFields } from "./view-fields.js";
 import { useQueries, useQueryClient } from "@tanstack/react-query";
 import { enumLabel } from "@protobase/schema";
 //#region src/live/use-filter-config.ts
+const histogramBuckets = 24;
 /**
-* The panel's config for a view: facet counts come from `:facets`, each computed with every
-* other active filter applied but not its own, so choosing one value does not hide the rest.
+* The panel's config for a view: facet counts come from `:facets` and each range's bounds from `:histogram`, each
+* computed with every other active filter applied but not its own, so choosing one value does not hide the rest.
 */
 const useFilterConfig = ({ model, resources, views, view, state, extras }) => {
 	const client = useClient();
 	const queryClient = useQueryClient();
 	const skeleton = widgetFields(view, model);
 	const label = (name) => view?.fields[name]?.label ?? humanize(name);
+	const targetOf = (name) => {
+		const field = model.fields[name];
+		return field?.type === "relation" && field.relation ? resources[field.relation.resource] : void 0;
+	};
 	const facetQueries = useQueries({ queries: skeleton.facets.map((group) => {
 		const filter = stateToText(skeleton, {
 			...state,
@@ -35,46 +42,66 @@ const useFilterConfig = ({ model, resources, views, view, state, extras }) => {
 		};
 	}) });
 	const labelQueries = useQueries({ queries: skeleton.facets.map((group, index) => {
-		const field = model.fields[group.id];
-		const target = field?.type === "relation" && field.relation ? resources[field.relation.resource] : void 0;
-		const ids = (facetQueries[index]?.data ?? []).map((facet) => String(facet.value));
+		const target = targetOf(group.id);
+		const ids = labelKeys((facetQueries[index]?.data ?? []).flatMap((facet) => facet.value === null ? [] : [String(facet.value)]), state.facets[group.id] ?? []);
 		return {
 			queryKey: keys.labels(`facet:${model.name}.${group.id}`, ids.join(",")),
 			enabled: Boolean(target) && ids.length > 0,
 			queryFn: async () => [...await fetchLabels(queryClient, client, target, ids, views[target.name])]
 		};
 	}) });
-	const rangeFilter = stateToText({
-		...skeleton,
-		range: void 0
-	}, state, extras);
-	const histogram = useHistogram(model.name, skeleton.range?.id ?? "", rangeFilter, 24, Boolean(skeleton.range));
-	const rangeHints = skeleton.range ? view?.fields[skeleton.range.id] : void 0;
-	const prefix = rangeHints?.prefix;
-	const suffix = rangeHints?.suffix ?? "";
-	return {
-		facets: skeleton.facets.map((group, index) => {
-			const field = model.fields[group.id];
-			const names = new Map(labelQueries[index]?.data ?? []);
-			return {
-				...group,
-				label: label(group.id),
-				options: (facetQueries[index]?.data ?? []).flatMap((facet) => facet.value === null ? [] : [{
-					value: String(facet.value),
-					label: field?.type === "enum" ? enumLabel(String(facet.value), view?.fields[group.id]?.valueLabels) : names.get(String(facet.value)) ?? String(facet.value),
-					count: facet.count
-				}])
-			};
-		}),
-		...skeleton.range && histogram.data && histogram.data.min !== null && histogram.data.max !== null && { range: {
-			...skeleton.range,
-			label: label(skeleton.range.id),
-			min: Math.floor(histogram.data.min),
-			max: Math.ceil(histogram.data.max),
-			step: Math.max(1, Math.round((histogram.data.max - histogram.data.min) / 100)),
-			histogram: histogram.data.buckets.map((bucket) => bucket.count),
+	const searches = useReferenceSearch(skeleton.facets.map((group) => ({
+		id: group.id,
+		target: group.combobox ? targetOf(group.id) : void 0
+	})), views);
+	const ranges = skeleton.ranges ?? [];
+	const histogramQueries = useQueries({ queries: ranges.map((range) => {
+		const filter = stateToText(skeleton, setRange(state, range.id, void 0), extras);
+		const buckets = rangeHistogram(view, range.id) ? histogramBuckets : 1;
+		return {
+			queryKey: keys.histogram(model.name, range.id, buckets, filter),
+			queryFn: () => client.histogram(model.name, range.id, {
+				filter,
+				buckets
+			})
+		};
+	}) });
+	const facetGroup = (group, index) => {
+		const field = model.fields[group.id];
+		const names = new Map(labelQueries[index]?.data ?? []);
+		const counted = (facetQueries[index]?.data ?? []).flatMap((facet) => facet.value === null ? [] : [{
+			value: String(facet.value),
+			label: field?.type === "enum" ? enumLabel(String(facet.value), view?.fields[group.id]?.valueLabels) : names.get(String(facet.value)) ?? String(facet.value),
+			count: facet.count
+		}]);
+		const search = searches[index];
+		return {
+			...group,
+			label: label(group.id),
+			options: search.matches ? matchOptions(search.matches, counted) : counted,
+			...names.size > 0 && { labels: Object.fromEntries(names) },
+			...search.onSearch && { onSearch: search.onSearch }
+		};
+	};
+	const rangeConfig = (range, index) => {
+		const data = histogramQueries[index]?.data;
+		if (!data || data.min === null || data.max === null) return [];
+		const hints = view?.fields[range.id];
+		const prefix = hints?.prefix;
+		const suffix = hints?.suffix ?? "";
+		return [{
+			...range,
+			label: label(range.id),
+			min: Math.floor(data.min),
+			max: Math.ceil(data.max),
+			step: Math.max(1, Math.round((data.max - data.min) / 100)),
+			histogram: rangeHistogram(view, range.id) ? data.buckets.map((bucket) => bucket.count) : [],
 			format: (value) => `${prefix === "€" ? formatMoney(value * 100).replace(".00", "") : String(value)}${suffix}`
-		} },
+		}];
+	};
+	return {
+		facets: skeleton.facets.map(facetGroup),
+		ranges: ranges.flatMap(rangeConfig),
 		...skeleton.dateField && {
 			datePresets: skeleton.datePresets ?? true,
 			dateField: skeleton.dateField,

package/dist/live/use-reference-search.js

@@ -0,0 +1,53 @@
+import { useClient } from "../data/api-provider.js";
+import { labelFieldOf } from "./model-helpers.js";
+import { useState } from "react";
+import { keepPreviousData, useQueries } from "@tanstack/react-query";
+import { createWhere, printFilter } from "@protobase/schema";
+//#region src/live/use-reference-search.ts
+const where = createWhere();
+/**
+* The search text typed into each facet's combobox and the records of its target resource that match it. A facet
+* without a target, or whose target has no search fields or a composite key, gets nothing: its options are filtered
+* by name instead.
+*/
+const useReferenceSearch = (targets, views) => {
+	const client = useClient();
+	const [texts, setTexts] = useState({});
+	const searchable = (target) => Boolean(target?.search?.length) && target.primaryKey.length === 1;
+	const results = useQueries({ queries: targets.map(({ id, target }) => {
+		const text = (texts[id] ?? "").trim();
+		return {
+			queryKey: [
+				"reference-search",
+				id,
+				target?.name ?? "",
+				text
+			],
+			enabled: searchable(target) && text !== "",
+			placeholderData: keepPreviousData,
+			queryFn: async () => {
+				const keyField = target.primaryKey[0];
+				const labelField = labelFieldOf(target, views[target.name]);
+				return (await client.list(target.name, {
+					filter: printFilter(where.search(text)),
+					fields: [keyField, labelField],
+					pageSize: 20
+				})).items.map((item) => [String(item[keyField]), String(item[labelField])]);
+			}
+		};
+	}) });
+	return targets.map(({ id, target }, index) => {
+		if (!searchable(target)) return {};
+		const onSearch = (text) => setTexts((current) => ({
+			...current,
+			[id]: text
+		}));
+		if ((texts[id] ?? "").trim() === "") return { onSearch };
+		return {
+			onSearch,
+			matches: results[index]?.data ?? []
+		};
+	});
+};
+//#endregion
+export { useReferenceSearch };