@rebasepro/admin 0.13.1-canary.gef9608c → 0.14.0

package/dist/{util-DHNXodBo.js → util-C-D5yD2n.js}

@@ -1,18 +1,17 @@
 import * as React$1 from "react";
 import React, { Suspense, createContext, createElement, forwardRef, lazy, memo, useCallback, useContext, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { deepEqual } from "fast-equals";
-import { Alert, AlertCircleIcon, AlertTriangleIcon, AlignLeftIcon, ArrowDownIcon, ArrowLeftIcon, ArrowRightToLineIcon, ArrowUpDownIcon, ArrowUpIcon, Badge, BooleanSwitchWithLabel, Button, CHIP_COLORS, CHIP_SEED_KEYS, CalendarIcon, Card, CardView, CenteredView, CheckCircleIcon, CheckIcon, Checkbox, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, Chip, CircleIcon, CircularProgress, CircularProgressCenter, CodeIcon, Collapse, ColumnsIcon, CopyIcon, DateTimeField, Dialog, DialogActions, DialogContent, DialogTitle, ErrorBoundary, ExpandablePanel, ExternalLinkIcon, EyeIcon, EyeOffIcon, FileTextIcon, FileUpload, FilterChip, FilterIcon, FilterXIcon, FlagIcon, FolderUpIcon, FunctionSquareIcon, GlobeIcon, HandleIcon, HashIcon, HistoryIcon, IconButton, ImageOffIcon, KanbanIcon, KanbanView, KeyRoundIcon, Label, LayoutGridIcon, Link2Icon, LinkIcon, ListIcon, ListOrderedIcon, ListView, LoadingButton, MailIcon, Markdown, Maximize2Icon, Menu, MenuItem, MinusIcon, MoreVerticalIcon, MultiSelect, MultiSelectItem, PencilIcon, PlusIcon, Popover, PopoverPrimitive, Portal, QuoteIcon, RadioGroup, RadioGroupItem, RefreshCwIcon, RepeatIcon, ResizablePanels, Rows3Icon, SearchBar, SearchIcon, Select, SelectItem, Separator, SettingsIcon, Sheet, Skeleton, Tab, Table, TableBody, TableCell, TableHeader, TableIcon, TableRow, Tabs, TextField, TextIcon, TextareaAutosize, ToggleButtonGroup, Tooltip, Trash2Icon, Typography, Unlink2Icon, UploadIcon, UserIcon, VirtualTable, VirtualTableDateField, VirtualTableInput, VirtualTableInput as VirtualTableInput$1, VirtualTableNumberInput, VirtualTableSwitch, VoteIcon, XCircleIcon, XIcon, cls, coolIconKeys, createVirtualTableSelectionStore, debounce, defaultBorderMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, focusedDisabled, getColorSchemeForSeed, iconSize, lucideIcons, paperMixin, useDebouncedCallback, useInjectStyles, useOutsideAlerter } from "@rebasepro/ui";
-import { CollectionRegistry, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE, canReadCollection, enumToObjectEntries, getArrayResolvedProperties, getDefaultValueFor, getDefaultValueFortype, getDefaultValuesFor, getEntityChildViews, getLabelOrConfigFrom, getReferenceFrom, getRelationFrom, getSubcollections, getTableName, isPropertyBuilder, normalizeToEntityRelation, resolveArrayProperties, resolveEnumValues, resolveProperty, resolveRelationProperty, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource } from "@rebasepro/common";
-import { CONTAINER_FULL_WIDTH, CollectionScopeProvider, DEFAULT_PAGE_SIZE, EntityDisplayCache, ErrorTooltip, ErrorView, IconForView, PluginProviderStack, SIDE_PANEL_DEFAULT_WIDTH, StorageSourceContext, UnsavedChangesDialog, UserDisplay, addInitialSlash, apiBaseOf, buildEnumLabel, createFormexStub, deleteEntityWithCallbacks, entityDisplayKey, flattenKeys, getAdminEntityChildViews, getCollectionBySlugWithin, getCollectionPathsCombinations, getColorScheme, getColumnKeysForProperty, getDisplayPropertyKey, getDisplayResolver, getEntityFromCache, getEntityFromMemoryCache, getEntityImagePreviewPropertyKey, getEntityPreviewKeys, getFormFieldKeys, getIcon, getLastSegment as getLastSegment$1, getLeadingRelationTitleKey, getLocalChangesBackup, getNavigationEntriesFromPath, getParentReferencesFromPath, getPropertyInPath, getRelationIncludeParams, getRowHeight, getTitlePropertyCandidates, getTitlePropertyKey, getTitlePropertyKeyForValues, iconsSearch, isFilterableRelation, isHidden, isReadOnly, looksLikeIdentifierValue, removeEntityFromCache, removeEntityFromMemoryCache, removeInitialAndTrailingSlashes, removeInitialAndTrailingSlashes as removeInitialAndTrailingSlashes$1, removeInitialSlash, removeTrailingSlash, removeTrailingSlash as removeTrailingSlash$1, resolveCollectionPathIds, resolveCollectionPathIds as resolveCollectionPathIds$1, resolveComponentRef, resolveDefaultSelectedView, resolveFilterOperators, resolveFormLayout, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAnalyticsController, useApiBase, useApiConfig, useAuthController, useCollectionScope, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataTableController, useFetch, useLargeLayout, useModeController, useNavigationBlocker, usePermissions, useRebaseClient, useRebaseContext, useRelationSelector, useResolvedComponent, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence } from "@rebasepro/app";
+import { Alert, AlertCircleIcon, AlertTriangleIcon, AlignLeftIcon, ArrowDownIcon, ArrowLeftIcon, ArrowRightToLineIcon, ArrowUpDownIcon, ArrowUpIcon, Badge, BooleanSwitchWithLabel, Button, CHIP_COLORS, CHIP_SEED_KEYS, CalendarIcon, Card, CardView, CenteredView, CheckCircleIcon, CheckIcon, Checkbox, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon, ChevronsUpDownIcon, Chip, CircleIcon, CircularProgress, CircularProgressCenter, CodeIcon, Collapse, ColumnsIcon, CopyIcon, DateTimeField, Dialog, DialogActions, DialogContent, DialogTitle, ErrorBoundary, ExpandablePanel, ExternalLinkIcon, EyeIcon, EyeOffIcon, FileTextIcon, FileUpload, FilterChip, FilterIcon, FilterXIcon, FlagIcon, FolderUpIcon, FunctionSquareIcon, GlobeIcon, HandleIcon, HashIcon, HistoryIcon, IconButton, ImageOffIcon, KanbanIcon, KanbanView, KeyRoundIcon, Label, LayoutGridIcon, Link2Icon, LinkIcon, ListIcon, ListOrderedIcon, ListView, LoadingButton, LucideIconByName, MailIcon, Markdown, Maximize2Icon, Menu, MenuItem, MinusIcon, MoreVerticalIcon, MultiSelect, MultiSelectItem, PanelLeftCloseIcon, PanelLeftOpenIcon, PencilIcon, PlusIcon, Popover, PopoverPrimitive, Portal, QuoteIcon, RadioGroup, RadioGroupItem, RefreshCwIcon, RepeatIcon, ResizablePanels, Rows3Icon, SearchBar, SearchIcon, Select, SelectItem, Separator, SettingsIcon, Sheet, Skeleton, Tab, Table, TableBody, TableCell, TableHeader, TableIcon, TableRow, Tabs, TextField, TextIcon, TextareaAutosize, ToggleButtonGroup, Tooltip, Trash2Icon, Typography, Unlink2Icon, UploadIcon, UserIcon, VirtualTable, VirtualTableDateField, VirtualTableInput, VirtualTableInput as VirtualTableInput$1, VirtualTableNumberInput, VirtualTableSwitch, VoteIcon, XCircleIcon, XIcon, cls, coolIconKeys, createVirtualTableSelectionStore, debounce, defaultBorderMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, focusedDisabled, getColorSchemeForSeed, iconSize, paperMixin, useDebouncedCallback, useOutsideAlerter, usePortalContainer } from "@rebasepro/ui";
+import { CollectionRegistry, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE, canReadCollection, enumToObjectEntries, getArrayResolvedProperties, getDefaultValueFor, getDefaultValueFortype, getDefaultValuesFor, getEntityChildViews, getLabelOrConfigFrom, getReferenceFrom, getRelationFrom, getRelationTargetPath, getSubcollections, getTableName, isPropertyBuilder, normalizeToEntityRelation, resolveArrayProperties, resolveEnumValues, resolveProperty, resolveRelationProperty, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource } from "@rebasepro/common";
+import { CONTAINER_FULL_WIDTH, CollectionScopeProvider, DEFAULT_PAGE_SIZE, EntityDisplayCache, ErrorTooltip, ErrorView, IconForView, PluginProviderStack, SIDE_PANEL_DEFAULT_WIDTH, StorageSourceContext, UnsavedChangesDialog, UserDisplay, addInitialSlash, apiBaseOf, buildEnumLabel, createFormexStub, deleteEntityWithCallbacks, entityDisplayKey, flattenKeys, getAdminEntityChildViews, getCollectionBySlugWithin, getCollectionPathsCombinations, getColorScheme, getColumnKeysForProperty, getDisplayPropertyKey, getDisplayResolver, getEntityFromCache, getEntityFromMemoryCache, getEntityImagePreviewPropertyKey, getEntityPreviewKeys, getFormFieldKeys, getIcon, getLastSegment as getLastSegment$1, getLeadingRelationTitleKey, getLocalChangesBackup, getNavigationEntriesFromPath, getParentReferencesFromPath, getPropertyInPath, getRedundantChildViewColumnIds, getRelationIncludeParams, getRowHeight, getTitlePropertyCandidates, getTitlePropertyKey, getTitlePropertyKeyForValues, hasDeclaredDisplay, iconsSearch, isDisabled, isFilterableRelation, isHidden, isReadOnly, looksLikeIdentifierValue, removeEntityFromCache, removeEntityFromMemoryCache, removeInitialAndTrailingSlashes, removeInitialAndTrailingSlashes as removeInitialAndTrailingSlashes$1, removeInitialSlash, removeTrailingSlash, removeTrailingSlash as removeTrailingSlash$1, resolveCollectionPathIds, resolveCollectionPathIds as resolveCollectionPathIds$1, resolveComponentRef, resolveDefaultSelectedView, resolveFilterOperators, resolveFormLayout, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAnalyticsController, useApiBase, useApiConfig, useAuthController, useCollectionScope, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataTableController, useFetch, useLargeLayout, useModeController, useNavigationBlocker, usePermissions, useRebaseClient, useRebaseContext, useRelationSelector, useResolvedComponent, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence } from "@rebasepro/app";
 import { Field, Formex, getIn, setIn, useCreateFormex, useFormex } from "@rebasepro/forms";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { defaultDateFormat, getHashValue, getValueInPath, hydrateRegExp, isObject, mergeDeep, randomString, toArray } from "@rebasepro/utils";
+import { defaultDateFormat, formatRelativeTime, getHashValue, getValueInPath, hydrateRegExp, isArrayValue, isObject, isPrototypePollutingKey, mergeDeep, pathTraversesPrototype, randomString, readStoredJson, toArray, writeStoredJson } from "@rebasepro/utils";
 import { resolveAdminCollection } from "@rebasepro/admin-types";
 import { format } from "date-fns";
-import * as locales from "date-fns/locale";
 import { Command } from "cmdk";
 import { useDropzone } from "react-dropzone";
-import { EntityReference, EntityRelation, GeoPoint, Vector, getCollectionDataPath, getDataSourceCapabilities, isRelationalCollectionConfig } from "@rebasepro/types";
+import { EntityReference, EntityRelation, GeoPoint, MAX_LIST_LIMIT, Vector, getCollectionDataPath, getDataSourceCapabilities, isRelationalCollectionConfig } from "@rebasepro/types";
 import { z } from "zod";
 import useMeasure from "react-use-measure";
 import { Link, useLocation, useNavigate, useSearchParams } from "react-router";
@@ -20,7 +19,6 @@ import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, us
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
 import { SortableContext, horizontalListSortingStrategy, sortableKeyboardCoordinates, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import ExcelJS from "exceljs";
 import { inferTypeFromValue } from "@rebasepro/inference";
 import { Highlight, themes } from "prism-react-renderer";
 import { generateKeyBetween, generateNKeysBetween } from "fractional-indexing";
@@ -111,7 +109,7 @@ function getResolvedPropertyInPath(properties, path) {
 		if (path.includes(".")) {
 			const pathSegments = path.split(".");
 			const childProperty = properties[pathSegments[0]];
-			if (childProperty.type === "map" && childProperty.properties) return getResolvedPropertyInPath(childProperty.properties, pathSegments.slice(1).join("."));
+			if (childProperty?.type === "map" && childProperty.properties) return getResolvedPropertyInPath(childProperty.properties, pathSegments.slice(1).join("."));
 		}
 	}
 }
@@ -1524,7 +1522,8 @@ function resolveCollectionSlotKeys(collection, authController, propertyConfigs)
 		subtitleKey: getDisplayPropertyKey(collection, "subtitle") ?? (sortedPreviewKeys.length > 0 ? sortedPreviewKeys[0] : void 0),
 		relationKeys,
 		statusKey,
-		dateKey
+		dateKey,
+		tagsKey: getDisplayPropertyKey(collection, "tags")
 	};
 }
 /**
@@ -1541,6 +1540,7 @@ function resolveImageSlot(collection, imageKey, entity) {
 	const resolvedValue = ofProp ? (rawValue ?? []).length > 0 ? rawValue[0] : void 0 : rawValue;
 	if (resolvedValue === void 0 || resolvedValue === null) return void 0;
 	return {
+		role: "image",
 		property: resolvedProperty,
 		propertyKey: imageKey,
 		value: resolvedValue
@@ -1569,14 +1569,8 @@ function formatDateValue$1(value) {
 	const date = value instanceof Date ? value : new Date(value);
 	if (isNaN(date.getTime())) return String(value);
 	const now = /* @__PURE__ */ new Date();
-	const diffMs = now.getTime() - date.getTime();
-	const diffMins = Math.floor(diffMs / 6e4);
-	const diffHours = Math.floor(diffMs / 36e5);
-	const diffDays = Math.floor(diffMs / 864e5);
-	if (diffMins < 1) return "Just now";
-	if (diffMins < 60) return `${diffMins}m ago`;
-	if (diffHours < 24) return `${diffHours}h ago`;
-	if (diffDays < 7) return `${diffDays}d ago`;
+	const relative = formatRelativeTime(date, { now });
+	if (relative) return relative;
 	return date.toLocaleDateString(void 0, {
 		month: "short",
 		day: "numeric",
@@ -1603,7 +1597,7 @@ function useCollectionSlotKeys(collection, authController, propertyConfigs) {
 * `React.memo` render functions or loops without violating hook rules.
 */
 function resolveEntitySlots(entity, collection, slotKeys) {
-	const { titleKey, titleKeyCandidates, imageKey, subtitleKey, relationKeys, statusKey, dateKey } = slotKeys;
+	const { titleKey, titleKeyCandidates, imageKey, subtitleKey, relationKeys, statusKey, dateKey, tagsKey } = slotKeys;
 	const image = imageKey ? resolveImageSlot(collection, imageKey, entity) : void 0;
 	const resolvedTitleKey = resolveEntityTitleKey(entity, titleKeyCandidates ?? (titleKey ? [titleKey] : []));
 	let title;
@@ -1611,6 +1605,7 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 		const prop = collection.properties[resolvedTitleKey];
 		const val = getValueInPath(entity.values, resolvedTitleKey);
 		if (prop) title = {
+			role: "title",
 			property: prop,
 			propertyKey: resolvedTitleKey,
 			value: val
@@ -1621,6 +1616,7 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 		const prop = collection.properties[subtitleKey];
 		const val = getValueInPath(entity.values, subtitleKey);
 		if (prop && val !== void 0 && val !== null && val !== "") subtitle = {
+			role: "subtitle",
 			property: prop,
 			propertyKey: subtitleKey,
 			value: val
@@ -1678,6 +1674,7 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 		const prop = collection.properties[statusKey];
 		const val = getValueInPath(entity.values, statusKey);
 		if (prop && val !== void 0 && val !== null) status = {
+			role: "status",
 			property: prop,
 			propertyKey: statusKey,
 			value: val
@@ -1688,12 +1685,25 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 		const prop = collection.properties[dateKey];
 		const val = getValueInPath(entity.values, dateKey);
 		if (prop && val !== void 0 && val !== null) date = {
+			role: "date",
 			property: prop,
 			propertyKey: dateKey,
 			value: val,
 			formatted: formatDateValue$1(val)
 		};
 	}
+	let tags;
+	if (tagsKey) {
+		const prop = collection.properties[tagsKey];
+		const val = getValueInPath(entity.values, tagsKey);
+		const empty = val === void 0 || val === null || val === "" || Array.isArray(val) && val.length === 0;
+		if (prop && !empty) tags = {
+			role: "tags",
+			property: prop,
+			propertyKey: tagsKey,
+			value: val
+		};
+	}
 	return {
 		image,
 		title,
@@ -1701,6 +1711,7 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 		relations,
 		status,
 		date,
+		tags,
 		entityId: entity.id
 	};
 }
@@ -1775,19 +1786,24 @@ function useEntitySlots(entity, collection, slotKeys) {
 	const image = useEntityDisplay("image", params);
 	const status = useEntityDisplay("status", params);
 	const date = useEntityDisplay("date", params);
+	const tags = useEntityDisplay("tags", params);
 	return useMemo(() => {
-		const computed = (resolved) => resolved.value !== void 0 && resolved.source === void 0 ? { value: resolved.value } : void 0;
-		const computedDate = computed(date);
+		const computed = (role, resolved) => resolved.value !== void 0 && resolved.source === void 0 ? {
+			role,
+			value: resolved.value
+		} : void 0;
+		const computedDate = computed("date", date);
 		return {
 			...derived,
-			title: computed(title) ?? derived.title,
-			subtitle: computed(subtitle) ?? derived.subtitle,
-			image: computed(image) ?? derived.image,
-			status: computed(status) ?? derived.status,
+			title: computed("title", title) ?? derived.title,
+			subtitle: computed("subtitle", subtitle) ?? derived.subtitle,
+			image: computed("image", image) ?? derived.image,
+			status: computed("status", status) ?? derived.status,
 			date: computedDate ? {
 				...computedDate,
 				formatted: formatDateValue$1(computedDate.value)
-			} : derived.date
+			} : derived.date,
+			tags: computed("tags", tags) ?? derived.tags
 		};
 	}, [
 		derived,
@@ -1795,7 +1811,8 @@ function useEntitySlots(entity, collection, slotKeys) {
 		subtitle,
 		image,
 		status,
-		date
+		date,
+		tags
 	]);
 }
 //#endregion
@@ -2225,8 +2242,7 @@ function ReferencePreviewExisting({ reference, collection, previewProperties, si
 		collection,
 		useCache: true
 	});
-	if (entity) referencesCache.set(reference.pathWithId, entity);
-	const usedEntity = entity ?? referencesCache.get(reference.pathWithId);
+	const usedEntity = entity;
 	let body;
 	if (!reference) body = /* @__PURE__ */ jsx(ErrorView, { error: "Reference not set" });
 	else if (usedEntity && !usedEntity.values) body = /* @__PURE__ */ jsx(ErrorView, {
@@ -2285,7 +2301,6 @@ function ReferencePreviewExisting({ reference, collection, previewProperties, si
 		hover
 	});
 }
-var referencesCache = /* @__PURE__ */ new Map();
 //#endregion
 //#region src/preview/components/InlineEntityListPreview.tsx
 /**
@@ -2468,8 +2483,7 @@ function RelationPreviewExisting({ relation, collection, previewProperties, size
 		collection,
 		useCache: true
 	});
-	if (entity) relationsCache.set(relation.pathWithId, entity);
-	const usedEntity = passedEntity ?? entity ?? relationsCache.get(relation.pathWithId);
+	const usedEntity = passedEntity ?? entity;
 	let body;
 	if (!relation) body = /* @__PURE__ */ jsx(ErrorView, { error: "Relation not set" });
 	else if (usedEntity && !usedEntity.values) body = /* @__PURE__ */ jsx(ErrorView, {
@@ -2528,7 +2542,6 @@ function RelationPreviewExisting({ relation, collection, previewProperties, size
 		hover
 	});
 }
-var relationsCache = /* @__PURE__ */ new Map();
 //#endregion
 //#region src/preview/property_previews/ArrayOfRelationsPreview.tsx
 /**
@@ -2539,8 +2552,9 @@ function ArrayOfRelationsPreview({ propertyKey, value, property, size, textOnly
 	if (Array.isArray(property?.of)) throw Error("Using array properties instead of single one in `of` in ArrayProperty");
 	if (property?.type !== "array" || !property.of || property.of.type !== "relation") throw Error("Picked wrong preview component ArrayOfRelationsPreview");
 	const ofProperty = property.of;
+	const relationTargetPath = getRelationTargetPath(ofProperty);
 	if (nested || textOnly) return /* @__PURE__ */ jsx(InlineEntityListPreview, {
-		items: (value ?? []).map((relation) => normalizeToEntityRelation(relation)).filter((relation) => Boolean(relation)),
+		items: (value ?? []).map((relation) => normalizeToEntityRelation(relation, "relation", relationTargetPath)).filter((relation) => Boolean(relation)),
 		renderItem: (relation, index) => /* @__PURE__ */ jsx(RelationPreview, {
 			disabled: !ofProperty.relation,
 			previewProperties: ofProperty.admin?.previewProperties,
@@ -2554,7 +2568,7 @@ function ArrayOfRelationsPreview({ propertyKey, value, property, size, textOnly
 	return /* @__PURE__ */ jsx("div", {
 		className: "flex flex-col w-full gap-0.5",
 		children: value ? value.map((relation, index) => {
-			const entityRelation = normalizeToEntityRelation(relation);
+			const entityRelation = normalizeToEntityRelation(relation, "relation", relationTargetPath);
 			if (!entityRelation) return null;
 			return /* @__PURE__ */ jsx("div", {
 				className: "w-full",
@@ -2831,13 +2845,144 @@ function KeyValuePreview({ value }) {
 	});
 }
 //#endregion
+//#region src/preview/components/date_fns_locales.ts
+/**
+* One date-fns locale, fetched when the admin is actually configured to use it.
+*
+* `DatePreview` used to open with:
+*
+*     import * as locales from "date-fns/locale";
+*
+* and then index that namespace with the configured locale. A namespace import
+* of a barrel is a reference to every member of it, so all ~77 locales were
+* bundled — 640 kB, in the entry chunk's static graph, to format dates in the
+* one locale a given deployment has configured (and `undefined`, meaning
+* en-US, for nearly all of them).
+*
+* A map of thunks is written out rather than derived from the locale key,
+* because `import(`date-fns/locale/${name}`)` is not statically analysable:
+* the bundler cannot see which modules it must emit, and the import fails at
+* runtime in a build. Each entry below is its own async chunk, and exactly one
+* of them is ever fetched.
+*
+* `fil` is in the `Locale` union and has no date-fns locale to import; it
+* resolved to `undefined` through the namespace too, so it still does.
+*/
+var dateFnsLocaleLoaders = {
+	af: () => import("date-fns/locale/af").then((m) => m.af),
+	ar: () => import("date-fns/locale/ar").then((m) => m.ar),
+	arDZ: () => import("date-fns/locale/ar-DZ").then((m) => m.arDZ),
+	arMA: () => import("date-fns/locale/ar-MA").then((m) => m.arMA),
+	arSA: () => import("date-fns/locale/ar-SA").then((m) => m.arSA),
+	az: () => import("date-fns/locale/az").then((m) => m.az),
+	be: () => import("date-fns/locale/be").then((m) => m.be),
+	bg: () => import("date-fns/locale/bg").then((m) => m.bg),
+	bn: () => import("date-fns/locale/bn").then((m) => m.bn),
+	ca: () => import("date-fns/locale/ca").then((m) => m.ca),
+	cs: () => import("date-fns/locale/cs").then((m) => m.cs),
+	cy: () => import("date-fns/locale/cy").then((m) => m.cy),
+	da: () => import("date-fns/locale/da").then((m) => m.da),
+	de: () => import("date-fns/locale/de").then((m) => m.de),
+	el: () => import("date-fns/locale/el").then((m) => m.el),
+	enAU: () => import("date-fns/locale/en-AU").then((m) => m.enAU),
+	enCA: () => import("date-fns/locale/en-CA").then((m) => m.enCA),
+	enGB: () => import("date-fns/locale/en-GB").then((m) => m.enGB),
+	enIN: () => import("date-fns/locale/en-IN").then((m) => m.enIN),
+	enNZ: () => import("date-fns/locale/en-NZ").then((m) => m.enNZ),
+	enUS: () => import("date-fns/locale/en-US").then((m) => m.enUS),
+	eo: () => import("date-fns/locale/eo").then((m) => m.eo),
+	es: () => import("date-fns/locale/es").then((m) => m.es),
+	et: () => import("date-fns/locale/et").then((m) => m.et),
+	eu: () => import("date-fns/locale/eu").then((m) => m.eu),
+	faIR: () => import("date-fns/locale/fa-IR").then((m) => m.faIR),
+	fi: () => import("date-fns/locale/fi").then((m) => m.fi),
+	fr: () => import("date-fns/locale/fr").then((m) => m.fr),
+	frCA: () => import("date-fns/locale/fr-CA").then((m) => m.frCA),
+	frCH: () => import("date-fns/locale/fr-CH").then((m) => m.frCH),
+	gd: () => import("date-fns/locale/gd").then((m) => m.gd),
+	gl: () => import("date-fns/locale/gl").then((m) => m.gl),
+	gu: () => import("date-fns/locale/gu").then((m) => m.gu),
+	he: () => import("date-fns/locale/he").then((m) => m.he),
+	hi: () => import("date-fns/locale/hi").then((m) => m.hi),
+	hr: () => import("date-fns/locale/hr").then((m) => m.hr),
+	hu: () => import("date-fns/locale/hu").then((m) => m.hu),
+	hy: () => import("date-fns/locale/hy").then((m) => m.hy),
+	id: () => import("date-fns/locale/id").then((m) => m.id),
+	is: () => import("date-fns/locale/is").then((m) => m.is),
+	it: () => import("date-fns/locale/it").then((m) => m.it),
+	ja: () => import("date-fns/locale/ja").then((m) => m.ja),
+	ka: () => import("date-fns/locale/ka").then((m) => m.ka),
+	kk: () => import("date-fns/locale/kk").then((m) => m.kk),
+	kn: () => import("date-fns/locale/kn").then((m) => m.kn),
+	ko: () => import("date-fns/locale/ko").then((m) => m.ko),
+	lb: () => import("date-fns/locale/lb").then((m) => m.lb),
+	lt: () => import("date-fns/locale/lt").then((m) => m.lt),
+	lv: () => import("date-fns/locale/lv").then((m) => m.lv),
+	mk: () => import("date-fns/locale/mk").then((m) => m.mk),
+	ms: () => import("date-fns/locale/ms").then((m) => m.ms),
+	mt: () => import("date-fns/locale/mt").then((m) => m.mt),
+	nb: () => import("date-fns/locale/nb").then((m) => m.nb),
+	nl: () => import("date-fns/locale/nl").then((m) => m.nl),
+	nlBE: () => import("date-fns/locale/nl-BE").then((m) => m.nlBE),
+	nn: () => import("date-fns/locale/nn").then((m) => m.nn),
+	pl: () => import("date-fns/locale/pl").then((m) => m.pl),
+	pt: () => import("date-fns/locale/pt").then((m) => m.pt),
+	ptBR: () => import("date-fns/locale/pt-BR").then((m) => m.ptBR),
+	ro: () => import("date-fns/locale/ro").then((m) => m.ro),
+	ru: () => import("date-fns/locale/ru").then((m) => m.ru),
+	sk: () => import("date-fns/locale/sk").then((m) => m.sk),
+	sl: () => import("date-fns/locale/sl").then((m) => m.sl),
+	sr: () => import("date-fns/locale/sr").then((m) => m.sr),
+	srLatn: () => import("date-fns/locale/sr-Latn").then((m) => m.srLatn),
+	sv: () => import("date-fns/locale/sv").then((m) => m.sv),
+	ta: () => import("date-fns/locale/ta").then((m) => m.ta),
+	te: () => import("date-fns/locale/te").then((m) => m.te),
+	th: () => import("date-fns/locale/th").then((m) => m.th),
+	tr: () => import("date-fns/locale/tr").then((m) => m.tr),
+	ug: () => import("date-fns/locale/ug").then((m) => m.ug),
+	uk: () => import("date-fns/locale/uk").then((m) => m.uk),
+	uz: () => import("date-fns/locale/uz").then((m) => m.uz),
+	vi: () => import("date-fns/locale/vi").then((m) => m.vi),
+	zhCN: () => import("date-fns/locale/zh-CN").then((m) => m.zhCN),
+	zhTW: () => import("date-fns/locale/zh-TW").then((m) => m.zhTW)
+};
+var cache = /* @__PURE__ */ new Map();
+/** The locale if it has already been fetched, otherwise `undefined`. Never fetches. */
+function getLoadedDateFnsLocale(locale) {
+	return locale ? cache.get(locale) : void 0;
+}
+/**
+* Fetch a date-fns locale. Resolves to `undefined` for a locale date-fns does
+* not ship, which is what indexing the namespace used to yield.
+*/
+async function loadDateFnsLocale(locale) {
+	if (!locale) return void 0;
+	const cached = cache.get(locale);
+	if (cached) return cached;
+	const loader = dateFnsLocaleLoaders[locale];
+	if (!loader) return void 0;
+	const loaded = await loader();
+	cache.set(locale, loaded);
+	return loaded;
+}
+//#endregion
 //#region src/preview/components/DatePreview.tsx
 /**
 * @group Preview components
 */
 function DatePreview({ date, mode = "date_time", timezone }) {
 	const customizationController = useCustomizationController();
-	const dateUtilsLocale = customizationController?.locale ? locales[customizationController.locale] : void 0;
+	const configuredLocale = customizationController?.locale;
+	const [dateUtilsLocale, setDateUtilsLocale] = React.useState(() => getLoadedDateFnsLocale(configuredLocale));
+	React.useEffect(() => {
+		let cancelled = false;
+		loadDateFnsLocale(configuredLocale).then((loaded) => {
+			if (!cancelled) setDateUtilsLocale(loaded);
+		}).catch((error) => console.error(`[rebase] could not load the "${configuredLocale}" date locale`, error));
+		return () => {
+			cancelled = true;
+		};
+	}, [configuredLocale]);
 	if (!date || !(date instanceof Date) || isNaN(date.getTime())) return /* @__PURE__ */ jsx(Fragment, {});
 	if (timezone) {
 		const options = {
@@ -3125,42 +3270,44 @@ var PropertyPreview = React.memo(function PropertyPreview(props) {
 	});
 	else content = buildWrongValueType(propertyKey, property.type, value);
 	else content = /* @__PURE__ */ jsx(EmptyValue, {});
-	else if (property.type === "relation") if (!value) content = /* @__PURE__ */ jsx(EmptyValue, {});
-	else if (Array.isArray(value)) {
-		const relations = value.map((item) => normalizeToEntityRelation(item, "relation")).filter(Boolean);
-		const renderRelation = (entityRelation, index) => /* @__PURE__ */ jsx(RelationPreview, {
-			disabled: !property.relation,
-			previewProperties: property.admin?.previewProperties,
-			includeId: property.admin?.includeId,
-			includeEntityLink: property.admin?.includeEntityLink,
-			size: "small",
-			relation: entityRelation,
-			textOnly: props.textOnly
-		}, `preview_rel_${propertyKey}_${index}`);
-		content = nested || props.textOnly ? /* @__PURE__ */ jsx(InlineEntityListPreview, {
-			items: relations,
-			renderItem: renderRelation
-		}) : /* @__PURE__ */ jsx("div", {
-			className: "flex flex-col w-full gap-0.5",
-			children: relations.map((entityRelation, index) => /* @__PURE__ */ jsx("div", {
-				className: "w-full",
-				children: renderRelation(entityRelation, index)
-			}, `preview_rel_wrapper_${propertyKey}_${index}`))
-		});
-	} else {
-		const relationValue = normalizeToEntityRelation(value, "relation");
-		if (relationValue) content = /* @__PURE__ */ jsx(RelationPreview, {
-			disabled: !property.relation,
-			previewProperties: property.admin?.previewProperties,
-			includeId: property.admin?.includeId,
-			includeEntityLink: property.admin?.includeEntityLink,
-			size: props.size,
-			relation: relationValue,
-			textOnly: props.textOnly
-		});
-		else content = buildWrongValueType(propertyKey, property.type, value);
-	}
-	else if (property.type === "boolean") if (typeof value === "boolean") content = /* @__PURE__ */ jsx(BooleanPreview, {
+	else if (property.type === "relation") {
+		const relationTargetPath = getRelationTargetPath(property);
+		if (!value) content = /* @__PURE__ */ jsx(EmptyValue, {});
+		else if (Array.isArray(value)) {
+			const relations = value.map((item) => normalizeToEntityRelation(item, "relation", relationTargetPath)).filter(Boolean);
+			const renderRelation = (entityRelation, index) => /* @__PURE__ */ jsx(RelationPreview, {
+				disabled: !property.relation,
+				previewProperties: property.admin?.previewProperties,
+				includeId: property.admin?.includeId,
+				includeEntityLink: property.admin?.includeEntityLink,
+				size: "small",
+				relation: entityRelation,
+				textOnly: props.textOnly
+			}, `preview_rel_${propertyKey}_${index}`);
+			content = nested || props.textOnly ? /* @__PURE__ */ jsx(InlineEntityListPreview, {
+				items: relations,
+				renderItem: renderRelation
+			}) : /* @__PURE__ */ jsx("div", {
+				className: "flex flex-col w-full gap-0.5",
+				children: relations.map((entityRelation, index) => /* @__PURE__ */ jsx("div", {
+					className: "w-full",
+					children: renderRelation(entityRelation, index)
+				}, `preview_rel_wrapper_${propertyKey}_${index}`))
+			});
+		} else {
+			const relationValue = normalizeToEntityRelation(value, "relation", relationTargetPath);
+			if (relationValue) content = /* @__PURE__ */ jsx(RelationPreview, {
+				disabled: !property.relation,
+				previewProperties: property.admin?.previewProperties,
+				includeId: property.admin?.includeId,
+				includeEntityLink: property.admin?.includeEntityLink,
+				size: props.size,
+				relation: relationValue,
+				textOnly: props.textOnly
+			});
+			else content = buildWrongValueType(propertyKey, property.type, value);
+		}
+	} else if (property.type === "boolean") if (typeof value === "boolean") content = /* @__PURE__ */ jsx(BooleanPreview, {
 		value,
 		size,
 		property,
@@ -3329,14 +3476,15 @@ function ReadOnlyFieldBinding({ propertyKey, value, error, showError, minimalist
 			icon: getIconForProperty(property, "small"),
 			required: property.validation?.required,
 			title: property.name ?? propertyKey,
-			className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"
+			className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3"
 		}),
 		/* @__PURE__ */ jsx("div", {
-			className: cls("w-full overflow-x-scroll no-scrollbar flex items-center", skipCardWrapper ? "" : "rounded-lg border border-surface-200 dark:border-surface-700 px-4 md:px-6 min-h-12 opacity-80"),
+			className: cls("w-full overflow-x-scroll no-scrollbar flex items-center", skipCardWrapper ? "" : "rounded-lg border border-surface-200 dark:border-surface-700 px-3 min-h-12 opacity-80"),
 			children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyPreview, {
 				propertyKey,
 				value,
 				property,
+				hideLabel: hideLabel || !minimalistView,
 				size: "medium"
 			}) })
 		}),
@@ -3412,7 +3560,7 @@ function ArrayCustomShapedFieldBinding({ propertyKey, value, error, showError, i
 		]
 	})] });
 	const body = (resolvedProperties ?? []).map((childProperty, index) => {
-		const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.admin?.disabled);
+		const thisDisabled = isReadOnly(childProperty) || isDisabled(childProperty);
 		return /* @__PURE__ */ jsx("div", {
 			className: "pb-4",
 			children: /* @__PURE__ */ jsx(PropertyFieldBinding, {
@@ -3562,9 +3710,13 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE$2 } = {}) {
 	const [currentSearch, setCurrentSearch] = useState("");
 	const offsetRef = useRef(0);
 	const userCacheRef = useRef(/* @__PURE__ */ new Map());
+	const requestIdRef = useRef(0);
+	const searchTimeoutRef = useRef(null);
 	const fetchUsers = useCallback(async (searchStr, offset, append) => {
 		const apiBase = apiBaseOf(client);
 		if (!apiBase) return;
+		const requestId = ++requestIdRef.current;
+		const superseded = () => requestId !== requestIdRef.current;
 		setIsLoading(true);
 		try {
 			const token = await getAuthToken?.();
@@ -3576,6 +3728,7 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE$2 } = {}) {
 			const response = await fetch(`${apiBase}/admin/users?${params}`, { headers: token ? { Authorization: `Bearer ${token}` } : {} });
 			if (!response.ok) throw new Error("Failed to fetch users");
 			const data = await response.json();
+			if (superseded()) return;
 			const newItems = (data.data ?? data.users ?? []).map((r) => {
 				const user = {
 					uid: r.uid ?? r.id ?? "",
@@ -3597,9 +3750,10 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE$2 } = {}) {
 			setHasMore(newItems.length >= pageSize);
 			offsetRef.current = offset + newItems.length;
 		} catch {
+			if (superseded()) return;
 			setHasMore(false);
 		} finally {
-			setIsLoading(false);
+			if (!superseded()) setIsLoading(false);
 		}
 	}, [
 		client?.baseUrl,
@@ -3611,15 +3765,24 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE$2 } = {}) {
 		offsetRef.current = 0;
 		fetchUsers("", 0, false);
 	}, [fetchUsers]);
+	const search = useCallback((searchStr) => {
+		if (searchTimeoutRef.current) clearTimeout(searchTimeoutRef.current);
+		searchTimeoutRef.current = setTimeout(() => {
+			setCurrentSearch(searchStr);
+			offsetRef.current = 0;
+			fetchUsers(searchStr, 0, false);
+		}, searchStr.trim() ? 300 : 0);
+	}, [fetchUsers]);
+	useEffect(() => {
+		return () => {
+			if (searchTimeoutRef.current) clearTimeout(searchTimeoutRef.current);
+		};
+	}, []);
 	return {
 		items,
 		isLoading,
 		hasMore,
-		search: useCallback((searchStr) => {
-			setCurrentSearch(searchStr);
-			offsetRef.current = 0;
-			fetchUsers(searchStr, 0, false);
-		}, [fetchUsers]),
+		search,
 		loadMore: useCallback(() => {
 			fetchUsers(currentSearch, offsetRef.current, true);
 		}, [fetchUsers, currentSearch]),
@@ -3632,6 +3795,7 @@ var UserSelector = React$1.forwardRef(({ value, size = "medium", onValueChange,
 	const { items: availableItems, isLoading, hasMore, search, loadMore, getUser } = useUserSelector({ pageSize });
 	const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 	const [searchString, setSearchString] = useState("");
+	const contextPortalContainer = usePortalContainer();
 	const scrollContainerRef = useRef(null);
 	const sentinelRef = useRef(null);
 	const observerRef = useRef(null);
@@ -3643,7 +3807,9 @@ var UserSelector = React$1.forwardRef(({ value, size = "medium", onValueChange,
 	}, [ref]);
 	const contentRef = useRef(null);
 	const searchInputRef = useRef(null);
-	const resolvedUser = (value ? getUser(value) ?? null : null) ?? (value ? availableItems.find((i) => i.uid === value)?.user ?? null : null);
+	const listedUser = (value ? getUser(value) ?? null : null) ?? (value ? availableItems.find((i) => i.uid === value)?.user ?? null : null);
+	const fetchedUser = useResolvedUser(value && !listedUser ? value : void 0);
+	const resolvedUser = listedUser ?? fetchedUser;
 	const sentinelCallbackRef = useCallback((node) => {
 		if (observerRef.current) {
 			observerRef.current.disconnect();
@@ -3723,9 +3889,8 @@ var UserSelector = React$1.forwardRef(({ value, size = "medium", onValueChange,
 			document.removeEventListener("keydown", handleKey, true);
 		};
 	}, [isPopoverOpen]);
-	useInjectStyles("UserSelector", " [cmdk-group] { max-height: 40vh; overflow-y: auto; } ");
 	const resolvedPlaceholder = placeholder || /* @__PURE__ */ jsx(EmptyValue, { className: "ml-2" });
-	const portalContainer = typeof document !== "undefined" ? document.body : void 0;
+	const portalContainer = contextPortalContainer ?? (typeof document !== "undefined" ? document.body : void 0) ?? void 0;
 	return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(PopoverPrimitive.Root, {
 		open: isPopoverOpen,
 		onOpenChange: handleRootOpenChange,
@@ -3753,6 +3918,9 @@ var UserSelector = React$1.forwardRef(({ value, size = "medium", onValueChange,
 					children: [resolvedUser ? /* @__PURE__ */ jsx("div", {
 						className: "flex flex-row items-center gap-1 truncate flex-1 min-w-0 mr-2",
 						children: /* @__PURE__ */ jsx(UserDisplay, { user: resolvedUser })
+					}) : value ? /* @__PURE__ */ jsx("span", {
+						className: "text-sm truncate text-text-primary dark:text-text-primary-dark",
+						children: value
 					}) : /* @__PURE__ */ jsx("span", {
 						className: "text-sm text-text-secondary dark:text-text-secondary-dark",
 						children: resolvedPlaceholder
@@ -4430,13 +4598,15 @@ function relationCardinality$2(relation) {
 	if (relation.kind === "belongsTo" || relation.kind === "hasOne") return "one";
 	return relation.cardinality;
 }
-var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChange, invisible, disabled, placeholder, useChips = true, className, relation, multiple: multipleOverride, fixedFilter, pageSize, emptyPlaceholder, searchPlaceholder = "Search...", noResultsText = "No relations found.", loadingText = "Loading..." }, ref) => {
+var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChange, invisible, disabled, placeholder, useChips = true, className, relation, multiple: multipleOverride, fixedFilter, pageSize, emptyPlaceholder, searchPlaceholder = "Search...", noResultsText = "No matches.", emptyText = "Select…", emptyCollectionText, loadingText = "Loading..." }, ref) => {
 	const collection = relation.target();
 	const dataClient = useData();
 	const sidePanelController = useSidePanel();
+	const contextPortalContainer = usePortalContainer();
 	const multiple = multipleOverride ?? relationCardinality$2(relation) === "many";
 	const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 	const isPopoverOpenRef = useRef(false);
+	const [listRequested, setListRequested] = useState(false);
 	const [selectedItems, setSelectedItems] = useState([]);
 	const [isLoadingSelectedItems, setIsLoadingSelectedItems] = useState(false);
 	const [searchString, setSearchString] = useState("");
@@ -4446,7 +4616,8 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 		path: getCollectionDataPath(collection),
 		collection,
 		fixedFilter,
-		pageSize
+		pageSize,
+		enabled: listRequested
 	});
 	const scrollContainerRef = useRef(null);
 	const sentinelRef = useRef(null);
@@ -4639,6 +4810,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 		if (disabled) return;
 		if (next) {
 			pinnedIdsRef.current = new Set(selectedItems.map((i) => String(i.id)));
+			setListRequested(true);
 			setIsPopoverOpen(true);
 			isPopoverOpenRef.current = true;
 		}
@@ -4669,14 +4841,13 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 			document.removeEventListener("keydown", handleKey, true);
 		};
 	}, [isPopoverOpen]);
-	useInjectStyles("RelationSelector", " [cmdk-group] { max-height: 40vh; overflow-y: auto; } ");
 	const closePopover = useCallback(() => {
 		setIsPopoverOpen(false);
 		isPopoverOpenRef.current = false;
 		pinnedIdsRef.current = null;
 	}, []);
-	const resolvedPlaceholder = placeholder || emptyPlaceholder || /* @__PURE__ */ jsx(EmptyValue, { className: "ml-2" });
-	const portalContainer = typeof document !== "undefined" ? document.body : void 0;
+	const resolvedPlaceholder = placeholder || emptyPlaceholder || emptyText;
+	const portalContainer = contextPortalContainer ?? (typeof document !== "undefined" ? document.body : void 0) ?? void 0;
 	return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(PopoverPrimitive.Root, {
 		open: isPopoverOpen,
 		onOpenChange: handleRootOpenChange,
@@ -4692,6 +4863,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 				disabled,
 				onClick: () => {
 					if (disabled) return;
+					setListRequested(true);
 					setIsPopoverOpen((o) => {
 						const next = !o;
 						isPopoverOpenRef.current = next;
@@ -4848,7 +5020,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 								}),
 								!isLoading && availableItems.length === 0 && /* @__PURE__ */ jsx(Command.Empty, {
 									className: "px-4 py-6 text-center text-text-secondary dark:text-text-secondary-dark",
-									children: noResultsText
+									children: searchString ? noResultsText : emptyCollectionText ?? `No ${collection.name ?? "entries"} yet.`
 								}),
 								/* @__PURE__ */ jsxs(Command.Group, { children: [
 									(() => {
@@ -5079,14 +5251,16 @@ function getTableBindingForProperty(property, selected) {
 			allowScroll: false
 		};
 	} else if (property.type === "relation") {
-		if (property.relation) if (property.admin?.widget === "dialog") return {
-			Component: RelationDialogBindingComponent,
-			allowScroll: false
-		};
-		else return {
-			Component: RelationSelectorBindingComponent,
-			allowScroll: false
-		};
+		if (property.relation) {
+			if (property.admin?.widget === "dialog") return {
+				Component: RelationDialogBindingComponent,
+				allowScroll: false
+			};
+			else if (selected) return {
+				Component: RelationSelectorBindingComponent,
+				allowScroll: false
+			};
+		}
 	} else if (property.type === "array") {
 		const arrayProperty = property;
 		if (!arrayProperty.of && !arrayProperty.oneOf) throw Error("You need to specify an 'of' or 'oneOf' prop (or specify a custom field) in your array property");
@@ -5565,7 +5739,7 @@ var PropertyTableCell = React.memo(function PropertyTableCell({ propertyKey, cus
 	const customPreview = Boolean(property.admin?.Preview);
 	const readOnlyProperty = isReadOnly(property);
 	const disabledTooltip = typeof property.admin?.disabled === "object" ? property.admin?.disabled.disabledMessage : void 0;
-	const disabled = readonly || disabledProp || Boolean(property.admin?.disabled);
+	const disabled = readonly || disabledProp || isDisabled(property);
 	const validation = useMemo(() => mapPropertyToZod({
 		property,
 		entityId: entity.id,
@@ -6049,11 +6223,14 @@ function getSubcollectionColumnId(collection) {
 //#region src/components/CollectionTableBinding/column_utils.tsx
 function propertiesToColumns({ properties, sortable, fixedFilter, engine, AdditionalHeaderWidget }) {
 	const disabledFilter = Boolean(fixedFilter);
-	return Object.entries(properties).flatMap(([key, property]) => getColumnKeysForProperty(property, key)).map(({ key, disabled }) => {
+	return Object.entries(properties).flatMap(([key, property]) => getColumnKeysForProperty(property, key)).flatMap(({ key, disabled }) => {
 		const property = getResolvedPropertyInPath(properties, key);
-		if (!property) throw Error("Internal error: no property found in path " + key);
+		if (!property) {
+			console.warn(`No property found in path "${key}" — skipping that column.`);
+			return [];
+		}
 		const filterable = filterableProperty(property, false, engine);
-		return {
+		return [{
 			key,
 			align: getTableCellAlignment(property),
 			icon: getIconForProperty(property, "small"),
@@ -6071,7 +6248,7 @@ function propertiesToColumns({ properties, sortable, fixedFilter, engine, Additi
 				propertyKey: key,
 				onHover
 			}) : void 0
-		};
+		}];
 	});
 }
 /**
@@ -6242,6 +6419,7 @@ function StringNumberFilterField({ name, value, setValue, type, isArray, enumVal
 			children: [
 				!enumValues && /* @__PURE__ */ jsx(TextField, {
 					size: "medium",
+					"aria-label": `${title ?? name} filter value`,
 					type: type === "number" ? "number" : void 0,
 					value: internalValue !== void 0 && internalValue != null ? String(internalValue) : "",
 					disabled: isNullOperation,
@@ -7076,7 +7254,7 @@ var CollectionTableBinding = function CollectionTableBinding({ className, style,
 			propertyKey,
 			entity
 		}) ?? columnCustom?.resolvedProperty;
-		if (!property?.admin?.disabled) disabled = false;
+		if (!property || !isDisabled(property)) disabled = false;
 		if (!property) return null;
 		return /* @__PURE__ */ jsx(ErrorBoundary, { children: entity ? /* @__PURE__ */ jsx(PropertyTableCell, {
 			readonly: !inlineEditing,
@@ -7398,6 +7576,35 @@ function withViewMode(url, search) {
 	return `${base}${base.includes("?") ? "&" : "?"}${VIEW_MODE_PARAM}=${viewMode}${hash}`;
 }
 /**
+* Carry the whole of the collection list's URL state onto a navigation target.
+*
+* `withViewMode` exists because losing the view mode mid-session is jarring.
+* Everything else the list writes to the URL — the search string, the filters,
+* the sort — is state the user built up deliberately, and losing *that* is
+* worse: opening a record from a search and pressing back returned an
+* unfiltered list with an empty search box, so the search had to be retyped
+* for every record they wanted to look at.
+*
+* Copies every param the list currently has rather than an allowlist, because
+* filters are encoded under the field's own name — there is no fixed set to
+* list. Params already on the target win: the caller is more specific.
+*
+* @param url the URL to decorate. May carry a query string and/or a hash.
+* @param search query string to read from. Defaults to the browser location.
+*/
+function withListState(url, search) {
+	const source = search ?? (typeof window !== "undefined" ? window.location.search : "");
+	const carried = new URLSearchParams(source);
+	if ([...carried].length === 0) return url;
+	const hashIndex = url.indexOf("#");
+	const hash = hashIndex >= 0 ? url.substring(hashIndex) : "";
+	const [pathname, existing] = (hashIndex >= 0 ? url.substring(0, hashIndex) : url).split("?");
+	const target = new URLSearchParams(existing ?? "");
+	for (const [key, value] of carried) if (!target.has(key)) target.set(key, value);
+	const query = target.toString();
+	return query ? `${pathname}?${query}${hash}` : `${pathname}${hash}`;
+}
+/**
 * Resolve the view mode for a collection, honouring the documented priority:
 * URL param > saved user config > collection default.
 */
@@ -7445,7 +7652,7 @@ function navigateToEntity({ openEntityMode, collection, entityId, copy, path, se
 	else {
 		let to = navigation.buildUrlCollectionPath(entityId ? `${path ?? path}/${entityId}` : path ?? path);
 		if (entityId && selectedTab) to += `/${selectedTab}`;
-		to = withViewMode(to);
+		to = withListState(to);
 		if (!entityId) to += "#new";
 		if (copy) to += "#copy";
 		const navigateOptions = {};
@@ -7575,15 +7782,6 @@ function FieldCaption({ error, children }) {
 //#endregion
 //#region src/components/SearchIconsView.tsx
 var UPDATE_SEARCH_INDEX_WAIT_MS = 220;
-function toPascalCase(str) {
-	return str.split(/[-_]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
-}
-function resolveIcon(iconKey) {
-	const allIcons = lucideIcons;
-	let icon = allIcons[iconKey];
-	if (!icon) icon = allIcons[toPascalCase(iconKey)];
-	return icon ?? null;
-}
 function SearchIconsView({ selectedIcon = "", onIconSelected }) {
 	const { t } = useTranslation();
 	const [keys, setKeys] = React.useState(null);
@@ -7609,21 +7807,20 @@ function SearchIconsView({ selectedIcon = "", onIconSelected }) {
 		placeholder: t("search_for_more_icons")
 	}), /* @__PURE__ */ jsx("div", {
 		className: "flex max-w-full flex-wrap mt-4",
-		children: icons.map((icon) => {
-			const LucideIcon = resolveIcon(icon);
-			if (!LucideIcon) return null;
-			return /* @__PURE__ */ jsx(Tooltip, {
-				title: icon,
-				asChild: true,
-				children: /* @__PURE__ */ jsx(IconButton, {
-					shape: "square",
-					toggled: selectedIcon === icon,
-					onClick: onIconSelected ? () => onIconSelected(icon) : void 0,
-					className: "box-content m-1",
-					children: /* @__PURE__ */ jsx(LucideIcon, { size: iconSize.medium })
+		children: icons.map((icon) => /* @__PURE__ */ jsx(Tooltip, {
+			title: icon,
+			asChild: true,
+			children: /* @__PURE__ */ jsx(IconButton, {
+				shape: "square",
+				toggled: selectedIcon === icon,
+				onClick: onIconSelected ? () => onIconSelected(icon) : void 0,
+				className: "box-content m-1",
+				children: /* @__PURE__ */ jsx(LucideIconByName, {
+					name: icon,
+					size: iconSize.medium
 				})
-			}, icon);
-		})
+			})
+		}, icon))
 	})] });
 }
 //#endregion
@@ -7967,10 +8164,23 @@ function getWorksheetHeaders(worksheet) {
 /**
 * Take an object with keys of type `address.street`, `address.city` and
 * convert it to an object with nested objects like `{ address: { street: ..., city: ... } }`
+*
+* Keys here are the **header row of an uploaded file**, so they are attacker
+* data. `res["__proto__"] = …` is the prototype setter rather than an own
+* property, so a column named `__proto__.polluted` walked out of the accumulator
+* and wrote onto `Object.prototype` for the life of the tab — and
+* `constructor.prototype.x` threw a `TypeError` that surfaced as an unreadable
+* file. Such a column is refused, not sanitised, the way `setIn` settled it
+* (`docs/bug-classes.md` class 22).
+*
 * @param flatObj
 */
 function unflattenObject(flatObj) {
 	return Object.keys(flatObj).reduce((nestedObj, key) => {
+		if (pathTraversesPrototype(key)) {
+			console.warn(`Skipping column "${key}": a header may not reach the prototype chain`);
+			return nestedObj;
+		}
 		let currentObj = nestedObj;
 		const keyParts = key.split(".");
 		keyParts.forEach((keyPart, i) => {
@@ -7992,6 +8202,10 @@ function unflattenObject(flatObj) {
 }
 function mapJsonParse(obj) {
 	return Object.keys(obj).reduce((acc, key) => {
+		if (isPrototypePollutingKey(key)) {
+			console.warn(`Skipping column "${key}": a header may not reach the prototype chain`);
+			return acc;
+		}
 		try {
 			acc[key] = JSON.parse(obj[key]);
 		} catch (e) {
@@ -8001,10 +8215,183 @@ function mapJsonParse(obj) {
 	}, {});
 }
 //#endregion
+//#region src/data_import/utils/csv.ts
+/**
+* Delimiters sniffed from the header row, most common first.
+*
+* A spreadsheet saved as "CSV" in a locale that uses the comma as a decimal
+* separator is semicolon-delimited, and a tab-separated file saved as `.csv`
+* happens often enough to be worth reading.
+*/
+var CANDIDATE_DELIMITERS = [
+	",",
+	";",
+	"	"
+];
+/**
+* Split CSV text into rows of raw cells, RFC 4180 style.
+*
+* Quoted fields may contain the delimiter, newlines and doubled quotes; this is
+* the exact inverse of what the export's `entryToCSVRow` writes, so a file this
+* admin produced reads back into the cells it was built from.
+*/
+function parseCsvRows(text, delimiter = ",") {
+	const rows = [];
+	let row = [];
+	let field = "";
+	let quoted = false;
+	let inQuotes = false;
+	let i = 0;
+	const endField = () => {
+		row.push(field);
+		field = "";
+		quoted = false;
+	};
+	while (i < text.length) {
+		const char = text[i];
+		if (inQuotes) {
+			if (char === "\"") {
+				if (text[i + 1] === "\"") {
+					field += "\"";
+					i += 2;
+					continue;
+				}
+				inQuotes = false;
+				i++;
+				continue;
+			}
+			field += char;
+			i++;
+			continue;
+		}
+		if (char === "\"" && field === "") {
+			inQuotes = true;
+			quoted = true;
+			i++;
+			continue;
+		}
+		if (char === delimiter) {
+			endField();
+			i++;
+			continue;
+		}
+		if (char === "\r") {
+			i++;
+			continue;
+		}
+		if (char === "\n") {
+			endField();
+			rows.push(row);
+			row = [];
+			i++;
+			continue;
+		}
+		field += char;
+		i++;
+	}
+	if (field !== "" || quoted || row.length > 0) {
+		endField();
+		rows.push(row);
+	}
+	return rows;
+}
+/**
+* Pick the delimiter that splits the header row into the most cells. A
+* single-column file matches nothing and stays on the comma.
+*/
+function detectCsvDelimiter(text) {
+	const sample = text.slice(0, 64 * 1024);
+	let best = CANDIDATE_DELIMITERS[0];
+	let bestCount = 1;
+	for (const candidate of CANDIDATE_DELIMITERS) {
+		const count = parseCsvRows(sample, candidate)[0]?.length ?? 0;
+		if (count > bestCount) {
+			best = candidate;
+			bestCount = count;
+		}
+	}
+	return best;
+}
+/**
+* Parse CSV text into one object per row, keyed by the header row.
+*
+* The picker accepts `.csv` and the dialog promises "Upload a CSV, Excel or JSON
+* file", but every non-JSON file used to be handed to ExcelJS'
+* `workbook.xlsx.load`, which is a zip reader — so every CSV failed with
+* "Can't find end of central directory : is this a zip file ?". The export
+* writes CSV by default, so the round trip could not close.
+*
+* A blank header keeps its column rather than collapsing it, so the cells to its
+* right stay under their own names.
+*/
+function parseCsvToObjects(text) {
+	const cleaned = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+	const rows = parseCsvRows(cleaned, detectCsvDelimiter(cleaned)).filter((row) => row.some((cell) => cell.trim() !== ""));
+	if (rows.length === 0) return {
+		headers: [],
+		data: []
+	};
+	const headers = rows[0].map((header, index) => header.trim() || `Column${index + 1}`);
+	return {
+		headers,
+		data: rows.slice(1).map((cells) => {
+			const obj = {};
+			headers.forEach((header, index) => {
+				if (isPrototypePollutingKey(header)) return;
+				const cell = cells[index];
+				if (cell === void 0) return;
+				obj[header] = cell;
+			});
+			return obj;
+		})
+	};
+}
+//#endregion
 //#region src/data_import/utils/file_to_json.ts
+var excelJsModule;
+function loadExcelJs() {
+	excelJsModule ??= import("exceljs").then((mod) => mod.default ?? mod);
+	return excelJsModule;
+}
+/**
+* Whether this file is delimited text rather than a workbook.
+*
+* Browsers report `text/csv`, `application/csv` or nothing at all for the same
+* `.csv`, so the extension is the reliable half of the test.
+*/
+function isCsvFile(file) {
+	const name = (file.name ?? "").toLowerCase();
+	if (name.endsWith(".csv") || name.endsWith(".tsv")) return true;
+	return file.type === "text/csv" || file.type === "application/csv";
+}
+/** Turn the parsed cells of one sheet/file into the entity-shaped rows the import maps. */
+function toImportRows(rows) {
+	return rows.map(mapJsonParse).map(unflattenObject);
+}
 function convertFileToJson(file) {
 	return new Promise((resolve, reject) => {
-		if (file.type === "application/json") {
+		if (isCsvFile(file)) {
+			console.debug("Converting CSV file to JSON", file.name);
+			const reader = new FileReader();
+			reader.onload = function(e) {
+				try {
+					const { headers, data } = parseCsvToObjects(e.target?.result);
+					if (headers.length === 0) {
+						reject(/* @__PURE__ */ new Error("The CSV file is empty"));
+						return;
+					}
+					resolve({
+						data: toImportRows(data),
+						propertiesOrder: headers
+					});
+				} catch (err) {
+					console.error("Error parsing CSV file", err);
+					reject(err);
+				}
+			};
+			reader.onerror = () => reject(reader.error ?? /* @__PURE__ */ new Error("Could not read the file"));
+			reader.readAsText(file, "utf-8");
+		} else if (file.type === "application/json") {
 			console.debug("Converting JSON file to JSON", file.name);
 			const reader = new FileReader();
 			reader.onload = function(e) {
@@ -8028,7 +8415,7 @@ function convertFileToJson(file) {
 			reader.onload = async function(e) {
 				try {
 					const buffer = e.target?.result;
-					const workbook = new ExcelJS.Workbook();
+					const workbook = new (await (loadExcelJs())).Workbook();
 					await workbook.xlsx.load(buffer);
 					const worksheet = workbook.worksheets[0];
 					if (!worksheet) {
@@ -8042,12 +8429,12 @@ function convertFileToJson(file) {
 						const obj = {};
 						row.eachCell({ includeEmpty: false }, (cell, colNumber) => {
 							const header = headers[colNumber - 1];
-							if (header) obj[header] = cell.value;
+							if (header && !isPrototypePollutingKey(header)) obj[header] = cell.value;
 						});
 						parsedData.push(obj);
 					});
 					resolve({
-						data: parsedData.map(mapJsonParse).map(unflattenObject),
+						data: toImportRows(parsedData),
 						propertiesOrder: headers
 					});
 				} catch (err) {
@@ -8096,44 +8483,153 @@ function ImportFileUpload({ onDataAdded }) {
 	});
 }
 //#endregion
+//#region src/data_import/utils/save_entities.ts
+/** Rows written per request, and per transaction where the data source has one. */
+var IMPORT_BATCH_SIZE = 25;
+/** The row a bulk write takes: the values, with the chosen id as a column. */
+function toBulkRow(entity) {
+	const values = { ...entity.values ?? {} };
+	if (entity.id !== void 0 && entity.id !== null && entity.id !== "") values.id = entity.id;
+	return values;
+}
+function isBulkUnsupported(error) {
+	if (error?.code === "BULK_UNSUPPORTED") return true;
+	const message = error?.message ?? "";
+	return /bulk writes are not supported|does not support bulk/i.test(message);
+}
+function isConflict(error) {
+	if ((error?.status ?? error?.statusCode) === 409) return true;
+	const code = error?.code;
+	return code === "CONFLICT" || code === "23505";
+}
+/**
+* Write one batch, all-or-nothing wherever the data source can.
+*
+* `POST /<collection>/bulk` validates every row before the transaction opens,
+* names a failure by row index, and takes the `upsert` flag the preview screen
+* promises — none of which one `create` per row inside a `Promise.all` could
+* offer, since `Promise.all` does not cancel its siblings and every request was
+* its own transaction.
+*/
+async function writeBatch(accessor, batch, bulkUnsupported, written) {
+	if (accessor.createMany && !bulkUnsupported.current) try {
+		await accessor.createMany(batch.map(toBulkRow), { upsert: true });
+		written.count = batch.length;
+		return;
+	} catch (e) {
+		if (!isBulkUnsupported(e)) throw e;
+		bulkUnsupported.current = true;
+	}
+	for (const entity of batch) {
+		try {
+			await accessor.create(entity.values ?? {}, entity.id);
+		} catch (e) {
+			if (entity.id === void 0 || !isConflict(e)) throw e;
+			await accessor.update(entity.id, entity.values ?? {});
+		}
+		written.count++;
+	}
+}
+/**
+* Write imported entities in batches, reporting what was committed.
+*
+* Resumable on purpose: a failure at row 4 000 leaves rows 1–3 999 in the table
+* whatever this does, so the only useful thing to report is where to carry on
+* from. `offset` is that point — the Retry button passes back the `committed`
+* count of the error it is retrying, instead of starting from zero and
+* conflicting on every row that already exists.
+*
+* @throws {ImportSaveError} naming the rows that were not written.
+*/
+async function saveImportedEntities(dataClient, path, data, { offset = 0, batchSize = 25, onBatchCommitted = () => void 0, bulkUnsupported = { current: false } } = {}) {
+	console.debug("Saving imported data", offset, batchSize);
+	const accessor = dataClient.collection(path);
+	for (let start = offset; start < data.length; start += batchSize) {
+		const batch = data.slice(start, start + batchSize);
+		const written = { count: 0 };
+		try {
+			await writeBatch(accessor, batch, bulkUnsupported, written);
+		} catch (e) {
+			throw Object.assign(e, {
+				committed: start + written.count,
+				failedFrom: start + written.count,
+				failedTo: start + batch.length
+			});
+		}
+		onBatchCommitted(start + batch.length);
+	}
+	onBatchCommitted(data.length);
+}
+//#endregion
 //#region src/data_import/components/ImportSaveInProgress.tsx
 function ImportSaveInProgress({ path, importConfig, collection, onImportSuccess }) {
 	const [errorSaving, setErrorSaving] = useState(void 0);
 	const dataClient = useData();
 	const savingRef = useRef(false);
+	const committedRef = useRef(0);
+	const bulkUnsupportedRef = useRef({ current: false });
 	const [processedEntities, setProcessedEntities] = useState(0);
 	function save() {
 		if (savingRef.current) return;
 		savingRef.current = true;
-		saveDataBatch(dataClient, collection, path, importConfig.entities, 0, 25, setProcessedEntities).then(() => {
+		setErrorSaving(void 0);
+		saveImportedEntities(dataClient, path, importConfig.entities, {
+			offset: committedRef.current,
+			batchSize: 25,
+			onBatchCommitted: (written) => {
+				committedRef.current = written;
+				setProcessedEntities(written);
+			},
+			bulkUnsupported: bulkUnsupportedRef.current
+		}).then(() => {
 			onImportSuccess(collection);
 			savingRef.current = false;
 		}).catch((e) => {
-			setErrorSaving(e);
+			const error = e;
+			committedRef.current = error.committed ?? committedRef.current;
+			setProcessedEntities(committedRef.current);
+			setErrorSaving(error);
 			savingRef.current = false;
 		});
 	}
 	useEffect(() => {
 		save();
 	}, []);
-	if (errorSaving) return /* @__PURE__ */ jsxs(CenteredView, {
-		className: "flex flex-col gap-4 items-center",
-		children: [
-			/* @__PURE__ */ jsx(Typography, {
-				variant: "h6",
-				children: "Error saving data"
-			}),
-			/* @__PURE__ */ jsx(Typography, {
-				variant: "body2",
-				color: "error",
-				children: errorSaving.message
-			}),
-			/* @__PURE__ */ jsx(Button, {
-				onClick: save,
-				children: "Retry"
-			})
-		]
-	});
+	if (errorSaving) {
+		const total = importConfig.entities.length;
+		const failedRows = errorSaving.failedTo - errorSaving.failedFrom > 1 ? `rows ${errorSaving.failedFrom + 1}–${errorSaving.failedTo}` : `row ${errorSaving.failedFrom + 1}`;
+		return /* @__PURE__ */ jsxs(CenteredView, {
+			className: "flex flex-col gap-4 items-center",
+			children: [
+				/* @__PURE__ */ jsx(Typography, {
+					variant: "h6",
+					children: "Error saving data"
+				}),
+				/* @__PURE__ */ jsx(Typography, {
+					variant: "body2",
+					color: "error",
+					children: errorSaving.message
+				}),
+				/* @__PURE__ */ jsxs(Typography, {
+					variant: "body2",
+					children: [
+						errorSaving.committed,
+						" of ",
+						total,
+						" rows were imported. The import stopped on ",
+						failedRows,
+						", which ",
+						errorSaving.failedTo - errorSaving.failedFrom > 1 ? "were" : "was",
+						" not written."
+					]
+				}),
+				/* @__PURE__ */ jsx(Button, {
+					onClick: save,
+					children: errorSaving.committed > 0 ? `Retry from row ${errorSaving.committed + 1}` : "Retry"
+				})
+			]
+		});
+	}
 	return /* @__PURE__ */ jsxs("div", {
 		className: "flex flex-col gap-4 items-center",
 		children: [
@@ -8158,18 +8654,6 @@ function ImportSaveInProgress({ path, importConfig, collection, onImportSuccess
 		]
 	});
 }
-function saveDataBatch(dataClient, collection, path, data, offset = 0, batchSize = 25, onProgressUpdate) {
-	console.debug("Saving imported data", offset, batchSize);
-	const batch = data.slice(offset, offset + batchSize);
-	return Promise.all(batch.map((d) => dataClient.collection(path).create(d.values, d.id))).then(() => {
-		if (offset + batchSize < data.length) {
-			onProgressUpdate(offset + batchSize);
-			return saveDataBatch(dataClient, collection, path, data, offset + batchSize, batchSize, onProgressUpdate);
-		}
-		onProgressUpdate(data.length);
-		return Promise.resolve();
-	});
-}
 //#endregion
 //#region src/data_import/hooks/useImportConfig.tsx
 var useImportConfig = () => {
@@ -8241,6 +8725,10 @@ function convertDataToEntity(authController, navigation, data, idColumn, headers
 }
 function flattenEntry(obj, parent = "") {
 	return Object.keys(obj).reduce((acc, key) => {
+		if (isPrototypePollutingKey(key)) {
+			console.warn(`Skipping column "${key}": a header may not reach the prototype chain`);
+			return acc;
+		}
 		const prefixedKey = parent ? `${parent}.${key}` : key;
 		if (typeof obj[key] === "object" && !(obj[key] instanceof Date) && obj[key] !== null && !Array.isArray(obj[key])) Object.assign(acc, flattenEntry(obj[key], prefixedKey));
 		else acc[prefixedKey] = obj[key];
@@ -8269,8 +8757,12 @@ function processValueMapping(authController, value, navigation, property) {
 		return value;
 	}
 	if (from === "array" && to === "array" && Array.isArray(value) && usedProperty.of && !Array.isArray(usedProperty.of) && !isPropertyBuilder(usedProperty.of)) return value.map((v) => processValueMapping(authController, v, navigation, usedProperty.of));
-	else if (from === "string" && to === "number" && typeof value === "string") return Number(value);
-	else if (from === "string" && to === "array" && typeof value === "string" && usedProperty.of && !Array.isArray(usedProperty.of) && !isPropertyBuilder(usedProperty.of)) return value.split(",").map((v) => processValueMapping(authController, v, navigation, usedProperty.of));
+	else if (from === "string" && to === "number" && typeof value === "string") {
+		const trimmed = value.trim();
+		if (trimmed === "") return null;
+		const num = Number(trimmed);
+		return Number.isNaN(num) ? null : num;
+	} else if (from === "string" && to === "array" && typeof value === "string" && usedProperty.of && !Array.isArray(usedProperty.of) && !isPropertyBuilder(usedProperty.of)) return value.split(",").map((v) => processValueMapping(authController, v, navigation, usedProperty.of));
 	else if (from === "string" && to === "boolean") return value === "true";
 	else if (from === "number" && to === "boolean") return value === 1;
 	else if (from === "boolean" && to === "number") return value ? 1 : 0;
@@ -8311,6 +8803,7 @@ function processValueMapping(authController, value, navigation, property) {
 //#endregion
 //#region src/data_import/components/DataNewPropertiesMapping.tsx
 function DataNewPropertiesMapping({ importConfig, destinationProperties, buildPropertyView }) {
+	const { t } = useTranslation();
 	const headersMapping = importConfig.headersMapping;
 	const headingsOrder = importConfig.headingsOrder;
 	const idColumn = importConfig.idColumn;
@@ -8390,7 +8883,7 @@ function DataNewPropertiesMapping({ importConfig, destinationProperties, buildPr
 					/* @__PURE__ */ jsx(TableCell, {
 						header: true,
 						style: { width: "65%" },
-						children: "Default value"
+						children: t("default_value")
 					})
 				] }), /* @__PURE__ */ jsx(TableBody, { children: destinationProperties && getAllPropertyKeys(destinationProperties).map((key) => {
 					const property = getPropertyInPath$1(destinationProperties, key);
@@ -8470,17 +8963,22 @@ function IdSelectField({ idColumn, headersMapping, onChange }) {
 	}) });
 }
 function DefaultValuesField({ property, onValueChange, defaultValue }) {
+	const { t } = useTranslation();
+	const defaultValueLabel = t("default_value");
+	const ariaLabel = property.name ? `${defaultValueLabel}: ${property.name}` : defaultValueLabel;
 	if (property.type === "string") return /* @__PURE__ */ jsx(TextField, {
 		size: "medium",
-		placeholder: "Default value",
+		"aria-label": ariaLabel,
+		placeholder: defaultValueLabel,
 		value: defaultValue ?? "",
 		onChange: (event) => onValueChange(event.target.value)
 	});
 	else if (property.type === "number") return /* @__PURE__ */ jsx(TextField, {
 		size: "medium",
 		type: "number",
+		"aria-label": ariaLabel,
 		value: defaultValue ?? "",
-		placeholder: "Default value",
+		placeholder: defaultValueLabel,
 		onChange: (event) => onValueChange(event.target.value)
 	});
 	else if (property.type === "boolean") return /* @__PURE__ */ jsx(BooleanSwitchWithLabel, {
@@ -8517,6 +9015,7 @@ function ImportNewPropertyFieldPreview({ propertyKey, property, onEditClick, inc
 				className: "flex flex-row items-center gap-2",
 				children: [includeName && /* @__PURE__ */ jsx(TextField, {
 					size: "medium",
+					"aria-label": propertyKey ? `Name of property ${propertyKey}` : "Property name",
 					className: "text-base grow",
 					value: property?.name ?? "",
 					onChange: (e) => {
@@ -8819,8 +9318,8 @@ function EditorCollectionAction({ path, parentCollectionSlugs, parentEntityIds,
 }
 //#endregion
 //#region src/components/CollectionViewBinding/CollectionViewActions.tsx
-var ImportCollectionAction = lazy(() => import("./import-B0GyllB0.js").then((n) => n.t).then((m) => ({ default: m.ImportCollectionAction })));
-var ExportCollectionAction = lazy(() => import("./export-C-XG3aRh.js").then((n) => n.t).then((m) => ({ default: m.ExportCollectionAction })));
+var ImportCollectionAction = lazy(() => import("./import-C_4edkoD.js").then((n) => n.t).then((m) => ({ default: m.ImportCollectionAction })));
+var ExportCollectionAction = lazy(() => import("./export-L53WektO.js").then((n) => n.t).then((m) => ({ default: m.ExportCollectionAction })));
 function CollectionViewActions({ collection, relativePath, parentCollectionSlugs, parentEntityIds, onNewClick, onAddExistingClick, onMultipleDeleteClick, selectionEnabled, path, selectionController, tableController, collectionEntitiesCount, compact, children, openNewDocument }) {
 	const context = useAdminContext();
 	const { canCreate, canDelete } = usePermissions();
@@ -8829,14 +9328,14 @@ function CollectionViewActions({ collection, relativePath, parentCollectionSlugs
 	const collectionEditorController = useCollectionEditorController();
 	const hasCollectionEditor = Boolean(collectionEditorController?.editCollection);
 	const selectedEntities = selectionController.selectedEntities;
-	const addButton = canCreate(collection, path) && onNewClick && (largeLayout && !compact ? /* @__PURE__ */ jsxs(Button, {
+	const addButton = canCreate(collection, path) && onNewClick && (largeLayout && !compact ? /* @__PURE__ */ jsx(Button, {
 		id: `add_entity_${path}`,
 		onClick: onNewClick,
 		startIcon: /* @__PURE__ */ jsx(PlusIcon, { size: iconSize.small }),
 		size: "small",
 		variant: "filled",
 		color: "primary",
-		children: ["Add ", collection.singularName ?? collection.name]
+		children: t("add_specific", { name: collection.singularName ?? collection.name })
 	}) : /* @__PURE__ */ jsx(Button, {
 		id: `add_entity_${path}`,
 		onClick: onNewClick,
@@ -8947,46 +9446,462 @@ function CollectionViewActions({ collection, relativePath, parentCollectionSlugs
 	});
 }
 //#endregion
-//#region src/components/CollectionViewBinding/SlotValue.tsx
+//#region src/components/CollectionViewBinding/SearchHighlight.tsx
 /**
-* One display slot, rendered.
+* Showing a searcher *why* a row is in their results.
 *
-* A slot's value arrives one of two ways and they cannot be rendered the same:
+* A ranked list answers "which rows" and never "why this one". When the term is
+* in the title that is self-evident; when it is in a field the list does not
+* show — a certification, a nested answer, a note — the row looks arbitrary and
+* the only way to find out is to open it. That is the whole reason this exists.
 *
-* - **From a property** — render it with that property's own preview, so an
-*   enum status keeps its colour, a date keeps its format and a storage path
-*   becomes a thumbnail. This is why a declared path beats a resolver whenever
-*   the value is actually on the record.
-* - **From a resolver** — there is no property, because the value was computed
-*   or fetched. All that can be said about it is that it is text.
+* Two jobs, and they are deliberately separate:
 *
-* The branch lives here, once, rather than at each of the fourteen places the
-* list row, the card and the board card render a slot. That count is the reason:
-* the last time a rule like this was inlined per call site, it drifted into
-* seven versions.
+* 1. {@link Highlighted} marks the term inside a value the list already shows.
+* 2. {@link offSlotMatch} finds a match in a field that has no slot, so the
+*    caller can put it where the subtitle would have gone.
 */
-function SlotValue({ slot, size, textOnly = true, fill }) {
-	if (!slot || slot.value === void 0 || slot.value === null) return null;
-	if (!slot.property || !slot.propertyKey) return /* @__PURE__ */ jsx(Fragment, { children: Array.isArray(slot.value) ? slot.value.map((item) => String(item)).join(", ") : String(slot.value) });
-	return /* @__PURE__ */ jsx(PropertyPreview, {
-		propertyKey: slot.propertyKey,
-		value: slot.value,
-		property: slot.property,
-		size,
-		textOnly,
-		fill
+/** `<mark>` is Postgres's delimiter, and what `ts_headline` emits. */
+var MARK = /(<mark>.*?<\/mark>)/g;
+/**
+* Render a `ts_headline` snippet: text with `<mark>` around each hit.
+*
+* Split-and-render rather than `dangerouslySetInnerHTML`. The text around the
+* marks is whatever a user typed into their own record, and the only markup it
+* is allowed to carry is the highlight Postgres put there. Anything else stays
+* inert text.
+*/
+/**
+* Context kept before and after a hit, in characters.
+*
+* Asymmetric on purpose. The snippet renders on one truncated line, so anything
+* before the hit competes with the hit itself for the width available — with a
+* generous lead-in the mark is pushed off the right edge and the reader sees a
+* fragment with nothing highlighted in it, which is worse than no snippet at
+* all. Lead with just enough to not start abruptly, then run on.
+*/
+var SNIPPET_LEAD = 16;
+var SNIPPET_TRAIL = 90;
+/**
+* Pull the first mark near the front of the snippet.
+*
+* The snippet renders on one truncated line whose width is not knowable here —
+* a list column is wide, the same list beside an open record is not. Whatever
+* precedes the mark competes with it for that width, and when the mark loses
+* the reader gets a fragment of their record with nothing highlighted in it,
+* which reads as the feature being broken rather than as a narrow column.
+*
+* `ts_headline` centres its fragment on the match, so roughly half the window
+* is lead-in; that is the right shape for a paragraph and the wrong one for a
+* line. Trimming here rather than asking Postgres for a smaller window keeps
+* the trailing context, which is what actually explains the hit — and applies
+* the same shape to the snippets built in the browser, so a row looks the same
+* whichever path produced it.
+*/
+function trimSnippetLead(text, lead = SNIPPET_LEAD) {
+	const at = text.indexOf("<mark>");
+	if (at < 0 || at <= lead) return text;
+	return "…" + text.slice(at - lead, at).replace(/^\S*\s/, "") + text.slice(at);
+}
+function Snippet({ text, className }) {
+	return /* @__PURE__ */ jsx("span", {
+		className,
+		children: useMemo(() => trimSnippetLead(text).split(MARK), [text]).map((part, i) => part.startsWith("<mark>") ? /* @__PURE__ */ jsx("mark", {
+			className: "bg-amber-200/70 dark:bg-amber-400/30 text-inherit rounded-[3px] px-[1px]",
+			children: part.slice(6, -7)
+		}, i) : /* @__PURE__ */ jsx(React.Fragment, { children: part }, i))
 	});
 }
-//#endregion
-//#region src/components/CollectionViewBinding/EntityCardBinding.tsx
+/**
+* Mark every occurrence of the searched terms inside a plain value.
+*
+* Used for values the list already renders, where the server's snippet would be
+* the wrong thing to show: the snippet is truncated to a fragment and folded to
+* the indexed form, while the cell should keep the record's real text. So the
+* terms are re-matched here, on the display value.
+*
+* Deliberately dumber than the server's matching, and it has to be: this cannot
+* stem or unaccent without reimplementing the text search configuration in the
+* browser and getting it subtly different. It marks what it can find as a
+* prefix, case- and accent-insensitively, and marks nothing when it cannot —
+* a highlight that is merely absent reads as "no hit in this field", which is
+* the honest answer for a stem the browser cannot reproduce.
+*/
+function Highlighted({ text, terms, className }) {
+	const segments = useMemo(() => splitOnTerms(text, terms), [text, terms]);
+	if (segments.length <= 1) return /* @__PURE__ */ jsx("span", {
+		className,
+		children: text
+	});
+	return /* @__PURE__ */ jsx("span", {
+		className,
+		children: segments.map((seg, i) => seg.hit ? /* @__PURE__ */ jsx("mark", {
+			className: "bg-amber-200/70 dark:bg-amber-400/30 text-inherit rounded-[3px] px-[1px]",
+			children: seg.text
+		}, i) : /* @__PURE__ */ jsx(React.Fragment, { children: seg.text }, i))
+	});
+}
+/** Strip diacritics so `gestion` marks `gestión`, mirroring the index's unaccent. */
+var fold = (value) => value.normalize("NFD").replace(/[̀-ͯ]/g, "").toLowerCase();
+/**
+* Split `text` into hit / non-hit runs.
+*
+* Matches on the *folded* form but slices the original, so the marked text
+* keeps its accents and case — `Gestión`, not `gestion`. Folding is
+* length-preserving for the diacritics this handles, which is what makes the
+* indices transferable; a fold that changed length would misalign the slices.
+*/
+function splitOnTerms(text, terms) {
+	const haystack = fold(text);
+	const needles = terms.map(fold).filter((t) => t.length >= 2);
+	if (needles.length === 0) return [{
+		text,
+		hit: false
+	}];
+	const bounds = [];
+	for (const needle of needles) {
+		let from = 0;
+		for (;;) {
+			const at = haystack.indexOf(needle, from);
+			if (at === -1) break;
+			const before = at === 0 ? " " : haystack[at - 1];
+			if (!/[\p{L}\p{N}]/u.test(before)) bounds.push([at, at + needle.length]);
+			from = at + needle.length;
+		}
+	}
+	if (bounds.length === 0) return [{
+		text,
+		hit: false
+	}];
+	bounds.sort((a, b) => a[0] - b[0]);
+	const merged = [];
+	for (const [start, end] of bounds) {
+		const last = merged[merged.length - 1];
+		if (last && start <= last[1]) last[1] = Math.max(last[1], end);
+		else merged.push([start, end]);
+	}
+	const segments = [];
+	let cursor = 0;
+	for (const [start, end] of merged) {
+		if (start > cursor) segments.push({
+			text: text.slice(cursor, start),
+			hit: false
+		});
+		segments.push({
+			text: text.slice(start, end),
+			hit: true
+		});
+		cursor = end;
+	}
+	if (cursor < text.length) segments.push({
+		text: text.slice(cursor),
+		hit: false
+	});
+	return segments;
+}
+/**
+* The terms a searcher typed, as things to look for in a rendered value.
+*
+* Quoted phrases stay whole; `-excluded` terms are dropped, since marking a
+* word the user asked *not* to see would be actively wrong. `websearch_to_tsquery`
+* reads the same syntax on the server.
+*/
+function searchTerms(searchString) {
+	if (!searchString) return [];
+	const terms = [];
+	for (const [, phrase, bare] of searchString.matchAll(/"([^"]+)"|(\S+)/g)) {
+		const term = phrase ?? bare;
+		if (!term || term.startsWith("-")) continue;
+		if (/^(or|and)$/i.test(term)) continue;
+		terms.push(term);
+	}
+	return terms;
+}
+/**
+* The best match to show when the term is nowhere the list already displays.
+*
+* `shownKeys` are the property paths the row is already rendering, so a match
+* there needs no explaining — {@link Highlighted} marks it in place and the
+* subtitle keeps its own job. Anything else is invisible, and one of those is
+* what the subtitle slot gets replaced with.
+*
+* The first such match wins, and the server returns them in the order the
+* collection declared its `search` fields — so the field an author put first is
+* the one a reader sees, rather than whichever the database aggregated first.
+*/
+function offSlotMatch(matches, shownKeys) {
+	if (!matches || matches.length === 0) return void 0;
+	const shown = new Set(shownKeys.filter((k) => Boolean(k)));
+	return matches.find((m) => !shown.has(m.field));
+}
+/**
+* Where a search term appears in a row, computed from the row itself.
+*
+* The server can say this too — `_matches`, from `ts_headline` — and its answer
+* is better, because it knows the stemming the index used. This exists because
+* the admin cannot rely on getting it: rows reach the panel over three
+* different transports (REST, the realtime socket, the offline cache) and only
+* one of them carries query metadata. A feature that explains a result on some
+* loads and not others is worse than one that always gives a slightly simpler
+* answer.
+*
+* So: use the server's when it is there, fall back to this. Both produce the
+* same `{ field, snippet }` shape, and this one marks with the same `<mark>`.
+*/
+function localRowMatch(values, properties, terms, shownKeys) {
+	if (!values || !properties || terms.length === 0) return void 0;
+	const shown = new Set(shownKeys.filter((k) => Boolean(k)));
+	for (const [key, property] of Object.entries(properties)) {
+		if (shown.has(key)) continue;
+		const found = findInValue(values[key], terms, key, property);
+		if (found) return found;
+	}
+}
+function findInValue(value, terms, path, property) {
+	if (property && "enum" in property && property.enum) return void 0;
+	if (typeof value === "string") {
+		const snippet = snippetAround(value, terms);
+		return snippet ? {
+			field: path,
+			snippet
+		} : void 0;
+	}
+	if (Array.isArray(value)) {
+		for (const item of value) {
+			const found = findInValue(item, terms, path, void 0);
+			if (found) return found;
+		}
+		return;
+	}
+	if (value && typeof value === "object") for (const [key, nested] of Object.entries(value)) {
+		const found = findInValue(nested, terms, `${path}.${key}`, void 0);
+		if (found) return found;
+	}
+}
+/**
+* The text around the first hit, with every hit in view marked.
+*
+* Trimmed to a readable window rather than the whole field: a match in a long
+* body should show the sentence it is in, not the first line of the document,
+* and certainly not the document.
+*/
+function snippetAround(text, terms) {
+	const segments = splitOnTerms(text, terms);
+	const firstHit = segments.findIndex((s) => s.hit);
+	if (firstHit === -1) return void 0;
+	const before = segments.slice(0, firstHit).map((s) => s.text).join("");
+	const head = before.length > SNIPPET_LEAD ? "…" + before.slice(before.length - SNIPPET_LEAD).replace(/^\S*\s/, "") : before;
+	let out = head;
+	for (let i = firstHit; i < segments.length; i++) {
+		const seg = segments[i];
+		out += seg.hit ? `<mark>${seg.text}</mark>` : seg.text;
+		if (out.length > head.length + SNIPPET_TRAIL) {
+			out += "…";
+			break;
+		}
+	}
+	return out.trim();
+}
+//#endregion
+//#region src/components/CollectionViewBinding/SearchExplanation.tsx
+/**
+* The one place a view asks "why is this row here?" and gets something to draw.
+*
+* List, cards and board all render the same title-and-subtitle slots over the
+* same machinery. An explanation that shows up in one of them and not the others
+* reads as randomness rather than as a feature, so the decision and the markup
+* live here and each view calls them.
+*/
+/**
+* Terms to mark inside values the row already shows, plus the single match
+* worth putting where the subtitle would go — or nothing, when the row is not
+* the product of a search or the hit is already visible.
+*
+* Prefers the server's `_matches`, which knows the stemming the index used, and
+* falls back to reading the row directly. That fallback is not belt-and-braces:
+* rows reach the panel over REST, the realtime socket and the offline cache,
+* and only one of those carries query metadata.
+*/
+function useSearchExplanation(entity, properties, shownKeys, searchString) {
+	const terms = useMemo(() => searchTerms(searchString), [searchString]);
+	const shownKey = shownKeys.map((k) => k ?? "").join("|");
+	return {
+		terms,
+		offSlot: useMemo(() => {
+			if (terms.length === 0) return void 0;
+			const shown = shownKey.split("|").map((k) => k || void 0);
+			return offSlotMatch(entity.searchMatches, shown) ?? localRowMatch(entity.values, properties, terms, shown);
+		}, [
+			entity.searchMatches,
+			entity.values,
+			properties,
+			shownKey,
+			terms
+		])
+	};
+}
+/**
+* Which field the hit was in, and the text around it.
+*
+* Sits where the subtitle would have gone. Deliberately quiet — a small amber
+* caption and one line — because it is context for a result, not the result. It
+* has to survive a narrow column, so it truncates rather than wraps.
+*/
+function MatchExplanation({ match, label }) {
+	return /* @__PURE__ */ jsxs("div", {
+		className: "mt-0.5 flex items-baseline gap-1.5 min-w-0",
+		children: [/* @__PURE__ */ jsx("span", {
+			className: "shrink-0 text-[10px] uppercase tracking-wide font-semibold text-amber-700 dark:text-amber-500/90",
+			title: match.field,
+			children: label
+		}), /* @__PURE__ */ jsx("span", {
+			className: "truncate text-xs text-surface-500 dark:text-surface-400 min-w-0",
+			children: /* @__PURE__ */ jsx(Snippet, { text: match.snippet })
+		})]
+	});
+}
+/**
+* What to call a matched field on screen.
+*
+* The path is what the config and the server speak — `questionnaire.
+* certifications` — and is unreadable in a list. Resolve it to the property's
+* declared `name`, walking into `map` properties for a dotted path, and fall
+* back to the last segment humanised, so an unnamed field still reads as words
+* rather than as a path.
+*/
+function fieldLabel(properties, path) {
+	const segments = path.split(".");
+	let node = properties;
+	let named;
+	for (const segment of segments) {
+		const property = node?.[segment];
+		if (!property) break;
+		named = property.name ?? named;
+		node = property.properties;
+	}
+	if (named) return named;
+	return (segments[segments.length - 1] ?? path).replace(/[_-]+/g, " ").replace(/^./, (c) => c.toUpperCase());
+}
+//#endregion
+//#region src/components/CollectionViewBinding/SlotValue.tsx
+/**
+* One display slot, rendered.
+*
+* A slot's value arrives one of two ways and they cannot be rendered the same:
+*
+* - **From a property** — render it with that property's own preview, so an
+*   enum status keeps its colour, a date keeps its format and a storage path
+*   becomes a thumbnail. This is why a declared path beats a resolver whenever
+*   the value is actually on the record.
+* - **From a resolver** — there is no property, because the value was computed
+*   or fetched. All that can be said about it is that it is text.
+*
+* The branch lives here, once, rather than at each of the fourteen places the
+* list row, the card and the board card render a slot. That count is the reason:
+* the last time a rule like this was inlined per call site, it drifted into
+* seven versions.
+*/
+function SlotValue({ slot, size, textOnly = true, fill }) {
+	if (!slot || slot.value === void 0 || slot.value === null) return null;
+	if (!slot.property || !slot.propertyKey) {
+		if (slot.role === "image" && typeof slot.value === "string" && slot.value.trim()) return /* @__PURE__ */ jsx(ComputedImage, {
+			value: slot.value.trim(),
+			size,
+			fill
+		});
+		return /* @__PURE__ */ jsx(Fragment, { children: Array.isArray(slot.value) ? slot.value.map((item) => String(item)).join(", ") : String(slot.value) });
+	}
+	return /* @__PURE__ */ jsx(PropertyPreview, {
+		propertyKey: slot.propertyKey,
+		value: slot.value,
+		property: slot.property,
+		size,
+		textOnly,
+		fill
+	});
+}
+/**
+* The `tags` slot, as chips beside the status.
+*
+* Honours both arms the same way the rest of the file does. A declared **path**
+* goes through {@link SlotValue}, so an array of enum values keeps its own
+* colours — that is the stated advantage of naming a property. A **resolver**
+* returns bare strings with no property to render them as, so they become plain
+* chips; a single string is accepted as one tag, which the role's type documents.
+*
+* Lives here rather than in the list, the card and the board card because that is
+* three copies of the same decision, and this file exists to hold exactly one.
+*/
+function TagChips({ slot, max = 4 }) {
+	if (slot.property && slot.propertyKey) return /* @__PURE__ */ jsx(SlotValue, {
+		slot,
+		size: "small"
+	});
+	const values = (Array.isArray(slot.value) ? slot.value : [slot.value]).filter((item) => item !== void 0 && item !== null && String(item).trim() !== "").map((item) => String(item));
+	if (values.length === 0) return null;
+	const shown = values.slice(0, max);
+	const hidden = values.length - shown.length;
+	return /* @__PURE__ */ jsxs(Fragment, { children: [shown.map((value) => /* @__PURE__ */ jsx(Chip, {
+		size: "smallest",
+		className: "!text-[10px] !leading-tight !py-0 shrink-0 max-w-[100px] truncate",
+		children: value
+	}, value)), hidden > 0 && /* @__PURE__ */ jsxs("span", {
+		className: "text-[10px] text-surface-400 dark:text-surface-500 shrink-0",
+		children: ["+", hidden]
+	})] });
+}
+/**
+* Whether a computed image string can be fetched as-is, or has to be resolved
+* through storage first.
+*
+* Exported because it is the whole decision: rendering either branch needs a
+* provider (a storage source, a DOM), and the thing worth pinning is which
+* branch a given string takes. `//host/x` is protocol-relative and equally
+* fetchable; `data:` and `blob:` are already the bytes.
+*/
+function isFetchableImageUrl(value) {
+	return /^(https?:)?\/\//i.test(value) || /^(data|blob):/i.test(value);
+}
+/**
+* A string a resolver returned for the `image` role, rendered as a picture.
+*
+* Two things can arrive here and they need different handling, which is the whole
+* reason a property-path image is preferable: a storage property knows which
+* backend holds it, and a bare string does not.
+*
+* - An **absolute URL** is already fetchable. Rendering it through the storage
+*   layer would ask a bucket to sign a path that was never in it.
+* - Anything else is read as a **storage path** on the default source, which is
+*   the only source a value with no property can be attributed to. A resolver
+*   pointing at a named source should name the property instead.
+*/
+function ComputedImage({ value, size, fill }) {
+	if (isFetchableImageUrl(value)) return /* @__PURE__ */ jsx(UrlComponentPreview, {
+		previewType: "image",
+		url: value,
+		size,
+		fill,
+		hint: value
+	});
+	return /* @__PURE__ */ jsx(StorageThumbnail, {
+		storagePathOrDownloadUrl: value,
+		storeUrl: false,
+		size,
+		fill
+	});
+}
+//#endregion
+//#region src/components/CollectionViewBinding/EntityCardBinding.tsx
 /**
 * Card component for displaying a entity in a grid view.
 * Shows thumbnail, title, and preview properties via the shared slot system.
 */
-function EntityCardBinding({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, size = "m" }) {
+function EntityCardBinding({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, size = "m", searchString }) {
 	const authController = useAuthController();
 	const analyticsController = useAnalyticsController();
-	const slots = useEntitySlots(entity, collection, useCollectionSlotKeys(collection, authController, useCustomizationController().propertyConfigs));
+	const slotKeys = useCollectionSlotKeys(collection, authController, useCustomizationController().propertyConfigs);
+	const slots = useEntitySlots(entity, collection, slotKeys);
+	const { terms, offSlot } = useSearchExplanation(entity, collection.properties, [slotKeys.titleKey, slotKeys.subtitleKey], searchString);
 	const handleClick = (e) => {
 		if (e && (e.metaKey || e.ctrlKey) && selectionEnabled) {
 			e.preventDefault();
@@ -9049,7 +9964,10 @@ function EntityCardBinding({ entity, collection, onClick, selected, highlighted,
 				}),
 				/* @__PURE__ */ jsx("div", {
 					className: "truncate my-1 text-sm font-medium min-h-[20px]",
-					children: slots.title ? /* @__PURE__ */ jsx(SlotValue, {
+					children: slots.title ? terms.length > 0 && typeof slots.title.value === "string" ? /* @__PURE__ */ jsx(Highlighted, {
+						text: slots.title.value,
+						terms
+					}) : /* @__PURE__ */ jsx(SlotValue, {
 						slot: slots.title,
 						size: "small"
 					}) : /* @__PURE__ */ jsx(Typography, {
@@ -9058,9 +9976,15 @@ function EntityCardBinding({ entity, collection, onClick, selected, highlighted,
 						children: entity.id
 					})
 				}),
-				slots.subtitle && /* @__PURE__ */ jsx("div", {
+				offSlot ? /* @__PURE__ */ jsx(MatchExplanation, {
+					match: offSlot,
+					label: fieldLabel(collection.properties, offSlot.field)
+				}) : slots.subtitle && /* @__PURE__ */ jsx("div", {
 					className: "line-clamp-3 [&_div]:line-clamp-3 text-xs text-surface-600 dark:text-surface-400 [&_p]:!my-1 [&_p:first-child]:!mt-0 [&_p:last-child]:!mb-0",
-					children: /* @__PURE__ */ jsx(SlotValue, {
+					children: terms.length > 0 && typeof slots.subtitle.value === "string" ? /* @__PURE__ */ jsx(Highlighted, {
+						text: slots.subtitle.value,
+						terms
+					}) : /* @__PURE__ */ jsx(SlotValue, {
 						slot: slots.subtitle,
 						size: "small"
 					})
@@ -9077,12 +10001,16 @@ function EntityCardBinding({ entity, collection, onClick, selected, highlighted,
 						children: ["+", slots.relations.reduce((acc, r) => acc + Math.max(0, r.totalCount - r.items.length), 0)]
 					})]
 				}),
-				slots.status && /* @__PURE__ */ jsx("div", {
-					className: "mt-1",
-					children: /* @__PURE__ */ jsx(SlotValue, {
+				(slots.status || slots.tags) && /* @__PURE__ */ jsxs("div", {
+					className: "flex items-center gap-1 mt-1 flex-wrap",
+					children: [slots.status && /* @__PURE__ */ jsx(SlotValue, {
 						slot: slots.status,
 						size: "small"
-					})
+					}), slots.tags && /* @__PURE__ */ jsx(TagChips, { slot: slots.tags })]
+				}),
+				slots.date && /* @__PURE__ */ jsx("div", {
+					className: "mt-1 text-[10px] text-surface-500 dark:text-surface-400",
+					children: slots.date.formatted
 				})
 			]
 		})]
@@ -9129,6 +10057,7 @@ function CollectionCardViewBinding({ collection, tableController, onEntityClick,
 		renderCard: useCallback((entity, { selected, highlighted, onClick }) => /* @__PURE__ */ jsx(ResolvedEntityCard, {
 			entity,
 			collection,
+			searchString: tableController.searchString,
 			onClick,
 			selected,
 			highlighted,
@@ -9140,12 +10069,51 @@ function CollectionCardViewBinding({ collection, tableController, onEntityClick,
 			selectionEnabled,
 			size,
 			handleRowSelectionChange,
-			ResolvedEntityCard
+			ResolvedEntityCard,
+			tableController.searchString
 		])
 	});
 }
 //#endregion
 //#region src/components/CollectionViewBinding/CollectionListViewBinding.tsx
+/** A column left over from a sort or filter that is no longer applied. */
+var PRIORITY_STALE_REQUEST = 1e3;
+/** The collection's own columns. Slots sit just above it, in give-way order. */
+var PRIORITY_DECLARED = 2e3;
+var PRIORITY_DATE = PRIORITY_DECLARED;
+var PRIORITY_STATUS = 2001;
+var PRIORITY_TAGS = 2002;
+/** The sort or filter currently in force. */
+var PRIORITY_ACTIVE_REQUEST = 3e3;
+/**
+* How wide a column of this property wants to be — the Tailwind class the cell
+* gets, and the pixel cost of that class. The two are returned together because
+* they must not drift: the budget is only meaningful if it describes the widths
+* actually rendered. `lg:` variants key off the viewport, not this panel, so a
+* narrow split on a wide screen gets the larger of the two — the cost we budget.
+*/
+function getIdealColumnWidth(prop) {
+	if (prop.type === "string" && "enum" in prop) return {
+		width: "flex-shrink-0 w-32",
+		widthPx: 128
+	};
+	if (prop.type === "date" || prop.type === "number" || prop.type === "boolean") return {
+		width: "flex-shrink-0 w-28",
+		widthPx: 112
+	};
+	if (prop.type === "reference" || prop.type === "relation") return {
+		width: "flex-shrink-0 w-56 lg:w-64",
+		widthPx: 256
+	};
+	if (prop.type === "string") return {
+		width: "flex-shrink-0 w-40 lg:w-48",
+		widthPx: 192
+	};
+	return {
+		width: "flex-shrink-0 w-40",
+		widthPx: 160
+	};
+}
 /**
 * Get row padding/spacing classes based on size
 */
@@ -9159,6 +10127,31 @@ function getRowClasses(size) {
 		default: return "py-3 px-5";
 	}
 }
+/** `px-5` on both sides. */
+var ROW_PADDING_WIDTH = 40;
+/** `gap-4` between every cell of the row. */
+var COLUMN_GAP = 16;
+/**
+* The title's share of a row, taken before any column bids for width.
+*
+* A title is a name, and a name truncated to "Lider Sr. en…" has stopped being
+* one. Columns are a scanner's convenience; the title is the row's identity, so
+* a narrow list spends its width on the title and simply shows fewer columns.
+*/
+var TITLE_COMFORTABLE_WIDTH = 320;
+/** An `IconButton size="small"` (`w-8`), which is what a row action renders as. */
+var ACTION_BUTTON_WIDTH = 32;
+/** `gap-0.5` between row actions. */
+var ACTION_BUTTON_GAP = 2;
+/**
+* How many rows are read to size the actions cell.
+*
+* Actions are resolved per record, so the width they need is only knowable by
+* asking — and asking every loaded row would mean re-resolving thousands of
+* them on every page. The first rows are representative: a collection whose
+* actions vary at all varies within its first screenful.
+*/
+var ACTIONS_SAMPLE_SIZE = 20;
 /** Stable empty array for when no list-view actions are available. */
 var EMPTY_LIST_VIEW_ACTIONS = [];
 /**
@@ -9237,26 +10230,33 @@ function compactValueSummary(value, property) {
 	return null;
 }
 /**
-* Format a date value for display in the list
+* Format a date value for display in the list.
+*
+* A date column holds whatever the developer put in it, so the value is as
+* likely to be ahead of now as behind it. The relative phrase therefore comes
+* from {@link formatRelativeTime}, which reads the sign: a row due this
+* afternoon says "in 2h" rather than the "-1d ago" that flooring a negative
+* difference used to produce.
 */
-function formatDateValue(value) {
+function formatDateValue(value, now = /* @__PURE__ */ new Date()) {
 	if (!value) return null;
 	let date = null;
 	if (value instanceof Date) date = value;
 	else if (typeof value === "string" || typeof value === "number") date = new Date(value);
 	if (!date || isNaN(date.getTime())) return null;
-	const diffMs = (/* @__PURE__ */ new Date()).getTime() - date.getTime();
+	const diffMs = now.getTime() - date.getTime();
 	const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
 	if (diffDays === 0) return date.toLocaleTimeString(void 0, {
 		hour: "2-digit",
 		minute: "2-digit"
 	});
-	else if (diffDays === 1) return "Yesterday";
-	else if (diffDays < 7) return `${diffDays}d ago`;
-	else return date.toLocaleDateString(void 0, {
+	if (diffDays === 1) return "Yesterday";
+	const relative = formatRelativeTime(date, { now });
+	if (relative) return relative;
+	return date.toLocaleDateString(void 0, {
 		month: "short",
 		day: "numeric",
-		year: diffDays > 365 ? "numeric" : void 0
+		year: date.getFullYear() !== now.getFullYear() ? "numeric" : void 0
 	});
 }
 /**
@@ -9272,148 +10272,270 @@ function CollectionListViewBinding({ collection, tableController, onEntityClick,
 	const analyticsController = useAnalyticsController();
 	const context = useAdminContext();
 	const containerRef = useRef(null);
-	const [containerWidth, setContainerWidth] = useState(1200);
+	const [containerWidth, setContainerWidth] = useState(void 0);
 	useEffect(() => {
 		const el = containerRef.current;
 		if (!el) return;
+		const measure = (width) => setContainerWidth(width > 0 ? width : void 0);
+		measure(el.getBoundingClientRect().width);
+		if (typeof ResizeObserver === "undefined") return;
 		const ro = new ResizeObserver(([entry]) => {
-			if (entry) setContainerWidth(entry.contentRect.width);
+			if (entry) measure(entry.contentRect.width);
 		});
 		ro.observe(el);
 		return () => ro.disconnect();
 	}, []);
-	const { data, dataLoading, noMoreToLoad, dataLoadingError, itemCount, setItemCount, pageSize = 50, paginationEnabled } = tableController;
-	const isLoadingMore = useRef(false);
-	useEffect(() => {
-		if (!dataLoading) isLoadingMore.current = false;
-	}, [dataLoading]);
+	const { data, dataLoading, noMoreToLoad, dataLoadingError, itemCount, setItemCount, pageSize = 50, paginationEnabled, sortBy, setSortBy, filterValues, checkFilterCombination, searchString } = tableController;
 	const resolvedCollection = collection;
 	const slotKeys = useCollectionSlotKeys(resolvedCollection, authController, customizationController.propertyConfigs);
 	const { titleKey: titlePropertyKey, imageKey: imagePropertyKey, subtitleKey, statusKey: statusPropertyKey, dateKey: datePropertyKey } = slotKeys;
-	const previewKeys = useMemo(() => getEntityPreviewKeys(authController, resolvedCollection, customizationController.propertyConfigs, void 0, 10).filter((key) => key !== titlePropertyKey && key !== imagePropertyKey && key !== statusPropertyKey && key !== datePropertyKey), [
-		authController,
+	const columnMode = !!resolvedCollection.listProperties && resolvedCollection.listProperties.length > 0;
+	/**
+	* The properties an `ORDER BY` can be written for, under the same authority
+	* the table headers and the sort menu ask — so a header that offers a sort
+	* here offers it there, and none of the three invents one the driver would
+	* silently drop.
+	*/
+	const sortableKeys = useMemo(() => new Set(getSortablePropertyOptions(resolvedCollection.properties).map((option) => option.key)), [resolvedCollection.properties]);
+	/** The row's identity cell: the leading column, or the title slot. */
+	const titleColumn = useMemo(() => {
+		const key = columnMode ? resolvedCollection.listProperties?.[0] : titlePropertyKey;
+		if (!key) return void 0;
+		const property = resolvedCollection.properties[key];
+		return {
+			key,
+			label: property?.name || (columnMode ? key : "Name"),
+			property,
+			align: "left",
+			width: "flex-1 min-w-0",
+			widthPx: TITLE_COMFORTABLE_WIDTH,
+			sortable: sortableKeys.has(key),
+			priority: Number.MAX_SAFE_INTEGER
+		};
+	}, [
+		columnMode,
 		resolvedCollection,
-		customizationController.propertyConfigs,
 		titlePropertyKey,
-		imagePropertyKey,
-		statusPropertyKey,
-		datePropertyKey
+		sortableKeys
 	]);
-	const columns = useMemo(() => {
-		const cols = [];
-		const getIdealColumnWidth = (prop) => {
-			if (prop.type === "string" && "enum" in prop) return "flex-shrink-0 w-32";
-			if (prop.type === "date" || prop.type === "number" || prop.type === "boolean") return "flex-shrink-0 w-28";
-			if (prop.type === "reference" || prop.type === "relation") return "flex-shrink-0 w-56 lg:w-64";
-			if (prop.type === "string") return "flex-shrink-0 w-40 lg:w-48";
-			return "flex-shrink-0 w-40";
-		};
-		if (resolvedCollection.listProperties && resolvedCollection.listProperties.length > 0) {
-			resolvedCollection.listProperties.forEach((key, index) => {
-				const prop = resolvedCollection.properties[key];
-				if (!prop) return;
-				cols.push({
+	/**
+	* The trailing columns the collection itself implies: the developer's
+	* `listProperties` when there are any, otherwise the display slots the row
+	* has always shown to the right of the title.
+	*/
+	const declaredColumns = useMemo(() => {
+		if (columnMode) {
+			const keys = resolvedCollection.listProperties.slice(1);
+			return keys.flatMap((key, index) => {
+				const property = resolvedCollection.properties[key];
+				if (!property) return [];
+				return [{
 					key,
-					label: prop.name || key,
-					property: prop,
-					isTitle: index === 0,
-					align: prop.type === "number" || prop.type === "date" ? "right" : "left",
-					width: index === 0 ? "flex-1 min-w-[200px]" : getIdealColumnWidth(prop)
-				});
-			});
-			return cols;
-		}
-		if (titlePropertyKey) {
-			const prop = resolvedCollection.properties[titlePropertyKey];
-			if (prop) cols.push({
-				key: titlePropertyKey,
-				label: prop.name || "Name",
-				property: prop,
-				isTitle: true,
-				align: "left",
-				width: "flex-1 min-w-[200px]"
-			});
-		}
-		const showDate = datePropertyKey && size !== "xs";
-		const showStatus = statusPropertyKey && size !== "xs" && size !== "s";
-		const subtitleKey = previewKeys.length > 0 ? previewKeys[0] : void 0;
-		const allKeys = resolvedCollection.propertiesOrder || Object.keys(resolvedCollection.properties);
-		const usedKeys = /* @__PURE__ */ new Set([
-			titlePropertyKey,
-			imagePropertyKey,
-			statusPropertyKey,
-			datePropertyKey,
-			subtitleKey,
-			"id"
-		]);
-		allKeys.filter((k) => {
-			if (usedKeys.has(k)) return false;
-			const prop = resolvedCollection.properties[k];
-			if (!prop) return false;
-			if (prop.type === "string" && (prop.storage || prop.admin?.urlPreview === "image")) return false;
-			if (prop.type === "array" && prop.of && !Array.isArray(prop.of)) {
-				const inner = prop.of;
-				if (inner.type === "string" && (inner.storage || inner.admin?.urlPreview === "image")) return false;
-			}
-			return true;
-		}).forEach((key) => {
-			const prop = resolvedCollection.properties[key];
-			cols.push({
-				key,
-				label: prop.name || key,
-				property: prop,
-				align: prop.type === "number" || prop.type === "date" ? "right" : "left",
-				width: getIdealColumnWidth(prop)
-			});
-		});
-		if (showStatus && statusPropertyKey) {
-			const prop = resolvedCollection.properties[statusPropertyKey];
-			if (prop) cols.push({
-				key: statusPropertyKey,
-				label: prop.name || "Status",
-				property: prop,
-				isStatus: true,
-				align: "center",
-				width: "flex-shrink-0 w-32"
-			});
-		}
-		if (showDate && datePropertyKey) {
-			const prop = resolvedCollection.properties[datePropertyKey];
-			if (prop) cols.push({
-				key: datePropertyKey,
-				label: prop.name || "Modified",
-				property: prop,
-				isDate: true,
-				align: "right",
-				width: "flex-shrink-0 w-28"
+					label: property.name || key,
+					property,
+					align: property.type === "number" || property.type === "date" ? "right" : "left",
+					...getIdealColumnWidth(property),
+					sortable: sortableKeys.has(key),
+					priority: PRIORITY_DECLARED + (keys.length - index)
+				}];
 			});
 		}
+		const cols = [];
+		const slotColumn = (slot, key, fallbackLabel, layout, priority) => {
+			const declared = hasDeclaredDisplay(resolvedCollection, slot);
+			if (!key && !declared) return void 0;
+			const property = key ? resolvedCollection.properties[key] : void 0;
+			return {
+				key: key ?? `display:${slot}`,
+				label: property?.name || fallbackLabel,
+				slot,
+				property,
+				...layout,
+				sortable: !!key && sortableKeys.has(key),
+				priority
+			};
+		};
+		const tags = slotColumn("tags", slotKeys.tagsKey, "Tags", {
+			align: "left",
+			width: "flex-shrink-0 w-40",
+			widthPx: 160
+		}, PRIORITY_TAGS);
+		if (tags) cols.push(tags);
+		const status = slotColumn("status", statusPropertyKey, "Status", {
+			align: "left",
+			width: "flex-shrink-0 w-32",
+			widthPx: 128
+		}, PRIORITY_STATUS);
+		if (status) cols.push(status);
+		const date = slotColumn("date", datePropertyKey, "Modified", {
+			align: "right",
+			width: "flex-shrink-0 w-20",
+			widthPx: 80
+		}, PRIORITY_DATE);
+		if (date) cols.push(date);
 		return cols;
 	}, [
+		columnMode,
 		resolvedCollection,
-		titlePropertyKey,
+		slotKeys.tagsKey,
 		statusPropertyKey,
 		datePropertyKey,
+		sortableKeys
+	]);
+	/** What the row already shows without a column of its own. */
+	const shownKeys = useMemo(() => /* @__PURE__ */ new Set([
+		titleColumn?.key,
 		imagePropertyKey,
-		previewKeys,
-		size
+		subtitleKey,
+		...declaredColumns.map((col) => col.key),
+		...columnMode ? [] : slotKeys.relationKeys
+	]), [
+		titleColumn,
+		imagePropertyKey,
+		subtitleKey,
+		declaredColumns,
+		columnMode,
+		slotKeys.relationKeys
+	]);
+	/** The property the sort names, when no cell already shows it. */
+	const sortedKey = useMemo(() => {
+		const key = sortBy?.[0];
+		return key && !shownKeys.has(key) ? key : void 0;
+	}, [sortBy, shownKeys]);
+	/** The properties the filters name, minus the ones a cell already shows. */
+	const filteredKeys = useMemo(() => Object.keys(filterValues ?? {}).filter((key) => !shownKeys.has(key)), [filterValues, shownKeys]);
+	/**
+	* The last property the sort named, and the last set the filters named.
+	*
+	* A column earns its place when a sort or a filter names it, and keeps it
+	* once that sort or filter is cleared: taking it back would move every
+	* column right of it at the moment the user is comparing values across rows,
+	* and clearing a sort says nothing about wanting to stop seeing the property
+	* it sorted on.
+	*
+	* What it does *not* do is accumulate. There is only ever one sort, so
+	* ordering by four properties in turn is changing one's mind four times, not
+	* asking for four columns — and asking for four is how the row lost its
+	* status and its date to a wall of numbers. A new sort therefore replaces
+	* the property the last one left behind, and a new set of filters replaces
+	* the set before it. At most one sort column and one set of filter columns
+	* outlive their request.
+	*
+	* The list remounts per collection (it is keyed by path), so this is the
+	* memory of one visit to one collection, not a preference.
+	*/
+	const [lastSortedKey, setLastSortedKey] = useState(void 0);
+	const [lastFilteredKeys, setLastFilteredKeys] = useState([]);
+	useEffect(() => {
+		if (sortedKey) setLastSortedKey(sortedKey);
+	}, [sortedKey]);
+	useEffect(() => {
+		if (filteredKeys.length === 0) return;
+		setLastFilteredKeys((previous) => previous.length === filteredKeys.length && previous.every((key, i) => key === filteredKeys[i]) ? previous : filteredKeys);
+	}, [filteredKeys]);
+	/**
+	* Columns for what the user asked to sort or filter by and cannot see.
+	*
+	* Ordering a list by a property no cell shows produces a shuffle with no
+	* explanation in it — the rows move and nothing on screen says why. So the
+	* property joins the row as its own column, last: the filters' first, in
+	* their own order, then the sort's.
+	*/
+	const requestedColumns = useMemo(() => {
+		const active = /* @__PURE__ */ new Set([...filteredKeys, ...sortedKey ? [sortedKey] : []]);
+		const keys = [];
+		const request = (key) => {
+			if (!key || keys.includes(key) || shownKeys.has(key)) return;
+			keys.push(key);
+		};
+		(filteredKeys.length > 0 ? filteredKeys : lastFilteredKeys).forEach(request);
+		request(sortedKey ?? lastSortedKey);
+		return keys.flatMap((key, index) => {
+			const property = getResolvedPropertyInPath(resolvedCollection.properties, key);
+			if (!property) return [];
+			return [{
+				key,
+				label: property.name || key,
+				property,
+				align: property.type === "number" || property.type === "date" ? "right" : "left",
+				...getIdealColumnWidth(property),
+				sortable: sortableKeys.has(key),
+				priority: (active.has(key) ? PRIORITY_ACTIVE_REQUEST : PRIORITY_STALE_REQUEST) - index
+			}];
+		});
+	}, [
+		filteredKeys,
+		sortedKey,
+		lastFilteredKeys,
+		lastSortedKey,
+		shownKeys,
+		resolvedCollection,
+		sortableKeys
+	]);
+	const getListViewActions = useCallback((entity) => {
+		if (!getActionsForEntity) return EMPTY_LIST_VIEW_ACTIONS;
+		return getActionsForEntity({
+			entity,
+			customEntityActions: (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean)
+		}).filter((a) => a.showActionsInListView);
+	}, [
+		getActionsForEntity,
+		collection.entityActions,
+		customizationController.entityActions
 	]);
 	const showImage = size !== "xs";
+	/**
+	* Does the checkbox ride on the thumbnail rather than sit beside it?
+	*
+	* Only in the split's compact list — the one layout where the list is a
+	* column beside a record rather than the page itself, and where the 48px of
+	* checkbox cell is 48px the title does not get. Everywhere else the list has
+	* the room, and a checkbox that is always there is easier to find than one
+	* that appears under the pointer.
+	*
+	* Needs a thumbnail to ride on: at `xs` there is none, so the checkbox keeps
+	* its cell.
+	*/
+	const combineSelection = openEntityMode === "split" && selectedEntityId !== void 0 && showImage;
+	/**
+	* How much room the action buttons take, reserved identically in the header
+	* and in every row so the columns line up above one another whether or not a
+	* given record has actions.
+	*/
+	const actionsWidth = useMemo(() => {
+		if (!getActionsForEntity) return 0;
+		let most = 0;
+		for (const entity of data.slice(0, ACTIONS_SAMPLE_SIZE)) most = Math.max(most, getListViewActions(entity).length);
+		return most === 0 ? 0 : most * ACTION_BUTTON_WIDTH + (most - 1) * ACTION_BUTTON_GAP;
+	}, [
+		data,
+		getActionsForEntity,
+		getListViewActions
+	]);
 	const visibleColumns = useMemo(() => {
-		if (columns.length <= 1) return columns;
-		const titleCol = columns.find((c) => c.isTitle);
-		const extraCols = columns.filter((c) => !c.isTitle);
-		const availableForExtra = Math.max(0, containerWidth - (40 + (selectionEnabled ? 40 : 0) + (showImage ? 56 : 0) + 200));
-		const FIRST_COL_THRESHOLD = 500;
-		const EXTRA_COL_WIDTH = 160;
-		let maxExtraCols = 0;
-		if (availableForExtra >= FIRST_COL_THRESHOLD) maxExtraCols = 1 + Math.floor((availableForExtra - FIRST_COL_THRESHOLD) / EXTRA_COL_WIDTH);
-		return [...titleCol ? [titleCol] : [], ...extraCols.slice(0, maxExtraCols)];
+		const columns = [...declaredColumns, ...requestedColumns];
+		if (columns.length === 0) return columns;
+		if (containerWidth === void 0) return [];
+		const chrome = ROW_PADDING_WIDTH + (selectionEnabled && !combineSelection ? 48 : 0) + (showImage ? 56 : 0) + (actionsWidth > 0 ? actionsWidth + COLUMN_GAP : 0);
+		const available = containerWidth - chrome - TITLE_COMFORTABLE_WIDTH;
+		const cost = (col) => col.widthPx + COLUMN_GAP;
+		let total = columns.reduce((acc, col) => acc + cost(col), 0);
+		if (total <= available) return columns;
+		const dropped = /* @__PURE__ */ new Set();
+		for (const col of [...columns].sort((a, b) => a.priority - b.priority)) {
+			if (total <= available) break;
+			dropped.add(col.key);
+			total -= cost(col);
+		}
+		return columns.filter((col) => !dropped.has(col.key));
 	}, [
-		columns,
+		declaredColumns,
+		requestedColumns,
 		containerWidth,
 		selectionEnabled,
-		showImage
+		combineSelection,
+		showImage,
+		actionsWidth
 	]);
 	const handleEntityClick = useCallback((entity) => {
 		analyticsController.onAnalyticsEvent?.("entity_click", {
@@ -9431,82 +10553,126 @@ function CollectionListViewBinding({ collection, tableController, onEntityClick,
 	useCallback((entity) => {
 		return highlightedEntities?.some((e) => e.id === entity.id && e.path === entity.path) ?? false;
 	}, [highlightedEntities]);
-	const getListViewActions = useCallback((entity) => {
-		if (!getActionsForEntity) return EMPTY_LIST_VIEW_ACTIONS;
-		return getActionsForEntity({
-			entity,
-			customEntityActions: (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean)
-		}).filter((a) => a.showActionsInListView);
-	}, [
-		getActionsForEntity,
-		collection.entityActions,
-		customizationController.entityActions
-	]);
 	const rowClasses = getRowClasses(size);
 	const selectedIds = useMemo(() => new Set(selectionController?.selectedEntities.map((e) => e.id)), [selectionController?.selectedEntities]);
 	const highlightedIds = useMemo(() => new Set(highlightedEntities?.map((e) => e.id)), [highlightedEntities]);
 	const handleRowSelectionChange = useCallback((entity, selected) => {
 		handleSelectionChange(entity, selected);
 	}, [handleSelectionChange]);
-	return /* @__PURE__ */ jsx(ListView, {
-		data,
-		dataLoading,
-		noMoreToLoad,
-		dataLoadingError,
-		itemCount,
+	/**
+	* Order by a column, on the same cycle a table header runs: unordered →
+	* ascending → descending → unordered. Clicking a header here and clicking it
+	* in the table view have to mean the same thing, because they are the same
+	* collection under the same controller.
+	*/
+	const onColumnSort = useCallback((key) => {
+		if (!setSortBy) return;
+		const active = sortBy?.[0] === key ? sortBy[1] : void 0;
+		setSortBy(active === "asc" ? [key, "desc"] : active === "desc" ? void 0 : [key, "asc"]);
+		setItemCount?.(pageSize);
+	}, [
+		setSortBy,
+		sortBy,
 		setItemCount,
-		pageSize,
-		paginationEnabled,
-		onItemClick: handleEntityClick,
-		selectedIds,
-		highlightedIds,
-		selectionEnabled,
-		emptyComponent,
-		size,
-		selectedEntityId,
-		renderRow: useCallback(({ item: entity, style, className, selected, highlighted, isLast, onClick, onSelectionChange }) => {
-			return /* @__PURE__ */ jsx("div", {
-				style,
-				className,
-				children: /* @__PURE__ */ jsx(ListRow, {
-					entity,
-					collection: resolvedCollection,
-					onClick: handleEntityClick,
-					selected,
-					highlighted,
-					onSelectionChange: handleRowSelectionChange,
-					selectionEnabled,
-					columns: visibleColumns,
-					slotKeys,
-					rowClasses,
-					showImage,
-					size,
-					isLast,
-					isActive: selectedEntityId !== void 0 && entity.id === selectedEntityId,
-					listViewActions: getListViewActions(entity),
-					context,
-					path,
-					selectionController,
-					openEntityMode
-				})
-			}, entity.id);
-		}, [
-			resolvedCollection,
+		pageSize
+	]);
+	/**
+	* Whether a sort can be offered at all next to the filter already applied.
+	* A driver may refuse the combination; the table clears the filter to make
+	* room, which is a heavier answer than a header click asks for, so the
+	* header simply stops offering it — the same choice the sort menu makes.
+	*/
+	const sortIsAvailable = useCallback((key) => {
+		if (!setSortBy) return false;
+		if (!checkFilterCombination) return true;
+		const active = sortBy?.[0] === key ? sortBy[1] : void 0;
+		if (active === "desc") return true;
+		return checkFilterCombination(filterValues ?? {}, [key, active === "asc" ? "desc" : "asc"]);
+	}, [
+		setSortBy,
+		checkFilterCombination,
+		filterValues,
+		sortBy
+	]);
+	return /* @__PURE__ */ jsx("div", {
+		ref: containerRef,
+		className: "w-full",
+		children: /* @__PURE__ */ jsx(ListView, {
+			data,
+			dataLoading,
+			noMoreToLoad,
+			dataLoadingError,
+			itemCount,
+			setItemCount,
+			pageSize,
+			paginationEnabled,
+			onItemClick: handleEntityClick,
+			selectedIds,
+			highlightedIds,
 			selectionEnabled,
-			visibleColumns,
-			slotKeys,
-			rowClasses,
-			showImage,
+			emptyComponent,
 			size,
 			selectedEntityId,
-			getListViewActions,
-			context,
-			path,
-			selectionController,
-			openEntityMode,
-			handleRowSelectionChange,
-			handleEntityClick
-		])
+			header: (titleColumn || visibleColumns.length > 0) && /* @__PURE__ */ jsx(ListHeader, {
+				titleColumn,
+				columns: visibleColumns,
+				selectionEnabled: selectionEnabled && !combineSelection,
+				showImage,
+				actionsWidth,
+				sortBy,
+				onColumnSort,
+				sortIsAvailable
+			}),
+			renderRow: useCallback(({ item: entity, style, className, selected, highlighted, isLast, onClick, onSelectionChange }) => {
+				return /* @__PURE__ */ jsx("div", {
+					style,
+					className,
+					children: /* @__PURE__ */ jsx(ListRow, {
+						entity,
+						collection: resolvedCollection,
+						searchString,
+						onClick: handleEntityClick,
+						selected,
+						highlighted,
+						onSelectionChange: handleRowSelectionChange,
+						selectionEnabled,
+						combineSelection,
+						columns: visibleColumns,
+						slotKeys,
+						rowClasses,
+						showImage,
+						size,
+						isLast,
+						isActive: selectedEntityId !== void 0 && entity.id === selectedEntityId,
+						listViewActions: getListViewActions(entity),
+						actionsWidth,
+						context,
+						path,
+						selectionController,
+						openEntityMode
+					})
+				}, entity.id);
+			}, [
+				resolvedCollection,
+				selectionEnabled,
+				combineSelection,
+				visibleColumns,
+				slotKeys,
+				rowClasses,
+				showImage,
+				size,
+				selectedEntityId,
+				getListViewActions,
+				actionsWidth,
+				context,
+				path,
+				selectionController,
+				openEntityMode,
+				handleRowSelectionChange,
+				handleEntityClick,
+				searchString
+			])
+		})
 	});
 }
 /**
@@ -9517,8 +10683,9 @@ function CollectionListViewBinding({ collection, tableController, onEntityClick,
 * When collection.listProperties is explicitly set, falls back to
 * the column system for developer-defined table layouts.
 */
-var ListRow = React.memo(function ListRow({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, columns, slotKeys, rowClasses, showImage, size, isLast, isActive = false, listViewActions = [], context, path, selectionController, openEntityMode }) {
+var ListRow = React.memo(function ListRow({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, combineSelection = false, columns, slotKeys, rowClasses, showImage, size, isLast, isActive = false, listViewActions = [], actionsWidth = 0, context, path, selectionController, openEntityMode, searchString }) {
 	const slots = useEntitySlots(entity, collection, slotKeys);
+	const { terms, offSlot } = useSearchExplanation(entity, collection.properties, [slotKeys.titleKey, slotKeys.subtitleKey], searchString);
 	const handleClick = useCallback((e) => {
 		if ((e.metaKey || e.ctrlKey) && selectionEnabled) {
 			e.preventDefault();
@@ -9539,14 +10706,22 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 	const handleCheckboxChange = useCallback((checked) => {
 		onSelectionChange?.(entity, checked);
 	}, [entity, onSelectionChange]);
+	/** The thumbnail-as-checkbox cell: the square toggles, and never opens the record. */
+	const handleSelectionCellClick = useCallback((e) => {
+		e.stopPropagation();
+		onSelectionChange?.(entity, !selected);
+	}, [
+		entity,
+		onSelectionChange,
+		selected
+	]);
 	const useColumnMode = !!collection.listProperties && collection.listProperties.length > 0;
-	const extraColumns = useColumnMode ? columns.filter((c) => !c.isTitle) : [];
 	return /* @__PURE__ */ jsxs("div", {
 		className: cls("@container flex items-center gap-4 cursor-pointer group transition-colors duration-200 relative h-full", rowClasses, isActive ? "bg-surface-accent-100 dark:bg-surface-accent-950 hover:bg-surface-accent-200 dark:hover:bg-surface-accent-950" : selected ? "bg-surface-accent-50 dark:bg-surface-accent-900 hover:bg-surface-accent-100 dark:hover:bg-surface-accent-950" : highlighted ? "bg-surface-accent-50 dark:bg-surface-accent-900 hover:bg-surface-50 dark:hover:bg-surface-800/40" : "bg-white dark:bg-surface-900 hover:bg-surface-50 dark:hover:bg-surface-800/40"),
 		onClick: handleClick,
 		children: [
 			selected && !isActive && /* @__PURE__ */ jsx("div", { className: "absolute left-0 top-0 bottom-0 w-0.5 bg-primary-500 rounded-r-full" }),
-			selectionEnabled && /* @__PURE__ */ jsx("div", {
+			selectionEnabled && !combineSelection && /* @__PURE__ */ jsx("div", {
 				className: "flex-shrink-0 w-8",
 				onClick: handleCheckboxClick,
 				children: /* @__PURE__ */ jsx(Checkbox, {
@@ -9555,9 +10730,9 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 					size: "smallest"
 				})
 			}),
-			showImage && /* @__PURE__ */ jsx("div", {
-				className: "flex-shrink-0",
-				children: slots.image ? /* @__PURE__ */ jsx("div", {
+			showImage && /* @__PURE__ */ jsxs("div", {
+				className: "flex-shrink-0 relative w-10 h-10",
+				children: [slots.image ? /* @__PURE__ */ jsx("div", {
 					className: cls("w-10 h-10 rounded-lg border relative overflow-hidden bg-surface-100 dark:bg-surface-900", defaultBorderMixin),
 					children: /* @__PURE__ */ jsx(SlotValue, {
 						slot: slots.image,
@@ -9571,10 +10746,21 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 						className: "text-surface-500 dark:text-surface-400",
 						size: "small"
 					})
-				})
+				}), selectionEnabled && combineSelection && /* @__PURE__ */ jsx("div", {
+					className: cls("absolute inset-0 flex items-center justify-center rounded-lg transition-opacity duration-150", "bg-surface-950/55", selected ? "opacity-100" : "opacity-0 group-hover:opacity-100 focus-within:opacity-100"),
+					onClick: handleSelectionCellClick,
+					children: /* @__PURE__ */ jsx("div", {
+						className: "pointer-events-none",
+						children: /* @__PURE__ */ jsx(Checkbox, {
+							checked: selected ?? false,
+							onCheckedChange: handleCheckboxChange,
+							size: "smallest"
+						})
+					})
+				})]
 			}),
 			/* @__PURE__ */ jsxs("div", {
-				className: cls("min-w-0 overflow-hidden", useColumnMode ? "flex-1" : "flex-1"),
+				className: "flex-1 min-w-0 overflow-hidden",
 				children: [
 					/* @__PURE__ */ jsx("div", {
 						className: "truncate",
@@ -9582,7 +10768,10 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 							component: "div",
 							variant: "body2",
 							className: "font-semibold text-surface-900 dark:text-surface-50 truncate transition-colors group-hover:text-primary-600 dark:group-hover:text-primary-400",
-							children: /* @__PURE__ */ jsx(SlotValue, {
+							children: terms.length > 0 && typeof slots.title?.value === "string" ? /* @__PURE__ */ jsx(Highlighted, {
+								text: slots.title.value,
+								terms
+							}) : /* @__PURE__ */ jsx(SlotValue, {
 								slot: slots.title,
 								size: "small"
 							})
@@ -9593,13 +10782,19 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 							children: entity.id
 						})
 					}),
-					slots.subtitle && /* @__PURE__ */ jsx("div", {
+					offSlot ? /* @__PURE__ */ jsx(MatchExplanation, {
+						match: offSlot,
+						label: fieldLabel(collection.properties, offSlot.field)
+					}) : slots.subtitle && /* @__PURE__ */ jsx("div", {
 						className: "truncate mt-0.5",
 						children: /* @__PURE__ */ jsx(Typography, {
 							variant: "caption",
 							component: "div",
 							className: "text-surface-500 dark:text-surface-400 truncate",
-							children: /* @__PURE__ */ jsx(SlotValue, {
+							children: terms.length > 0 && typeof slots.subtitle.value === "string" ? /* @__PURE__ */ jsx(Highlighted, {
+								text: slots.subtitle.value,
+								terms
+							}) : /* @__PURE__ */ jsx(SlotValue, {
 								slot: slots.subtitle,
 								size: "small"
 							})
@@ -9619,72 +10814,20 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 					})
 				]
 			}),
-			useColumnMode ? /* @__PURE__ */ jsx(Fragment, { children: extraColumns.map((col) => {
-				const value = getValueInPath(entity.values, col.key);
-				if (col.isStatus || col.property.type === "string" && "enum" in col.property) return /* @__PURE__ */ jsx("div", {
-					className: cls(col.width, "flex", col.align === "center" ? "justify-center" : col.align === "right" ? "justify-end" : "justify-start"),
-					children: value ? /* @__PURE__ */ jsx(PropertyPreview, {
-						propertyKey: col.key,
-						value,
-						property: col.property,
-						size: "small"
-					}) : /* @__PURE__ */ jsx("span", {
-						className: "text-surface-400",
-						children: "—"
-					})
-				}, col.key);
-				if (col.isDate || col.property.type === "date") return /* @__PURE__ */ jsx("div", {
-					className: cls(col.width, col.align === "center" ? "text-center" : col.align === "right" ? "text-right" : "text-left"),
-					children: /* @__PURE__ */ jsx(Typography, {
-						variant: "caption",
-						className: "whitespace-nowrap text-surface-400 dark:text-surface-500 font-medium",
-						children: formatDateValue(value) ?? "—"
-					})
-				}, col.key);
-				if (isComplexPropertyType(col.property)) {
-					const summary = compactValueSummary(value, col.property);
-					return /* @__PURE__ */ jsx("div", {
-						className: cls(col.width, "truncate", col.align === "center" ? "text-center" : col.align === "right" ? "text-right" : "text-left"),
-						children: /* @__PURE__ */ jsx(Typography, {
-							variant: "caption",
-							className: "text-surface-500 dark:text-surface-400 truncate",
-							children: summary ?? "—"
-						})
-					}, col.key);
-				}
-				return /* @__PURE__ */ jsx("div", {
-					className: cls(col.width, "truncate", col.align === "center" ? "text-center" : col.align === "right" ? "text-right" : "text-left"),
-					children: /* @__PURE__ */ jsx(Typography, {
-						component: "div",
-						variant: "body2",
-						className: "text-surface-600 dark:text-surface-300 truncate",
-						children: value !== void 0 ? /* @__PURE__ */ jsx(PropertyPreview, {
-							propertyKey: col.key,
-							value,
-							property: col.property,
-							size: "small"
-						}) : "—"
-					})
-				}, col.key);
-			}) }) : /* @__PURE__ */ jsxs("div", {
+			columns.length > 0 && /* @__PURE__ */ jsx("div", {
 				className: "flex items-center gap-4 flex-shrink-0 ml-auto",
-				children: [slots.status && /* @__PURE__ */ jsx("div", {
-					className: "flex-shrink-0 @max-[400px]:hidden",
-					children: /* @__PURE__ */ jsx(SlotValue, {
-						slot: slots.status,
-						size: "small"
-					})
-				}), slots.date && /* @__PURE__ */ jsx("div", {
-					className: "flex-shrink-0 text-right w-[80px] @max-[500px]:hidden",
-					children: /* @__PURE__ */ jsx(Typography, {
-						variant: "caption",
-						className: "whitespace-nowrap text-surface-400 dark:text-surface-500 font-medium",
-						children: slots.date.formatted ?? "—"
+				children: columns.map((col) => /* @__PURE__ */ jsx("div", {
+					className: cls(col.width, "flex items-center overflow-hidden", col.align === "center" ? "justify-center" : col.align === "right" ? "justify-end" : "justify-start"),
+					children: /* @__PURE__ */ jsx(ListCell, {
+						column: col,
+						entity,
+						slots
 					})
-				})]
+				}, col.key))
 			}),
-			listViewActions.length > 0 && /* @__PURE__ */ jsx("div", {
-				className: "flex items-center gap-0.5 flex-shrink-0 ml-auto",
+			actionsWidth > 0 && /* @__PURE__ */ jsx("div", {
+				className: "flex items-center justify-end gap-0.5 flex-shrink-0 ml-auto",
+				style: { minWidth: actionsWidth },
 				onClick: (e) => e.stopPropagation(),
 				children: listViewActions.map((action, index) => /* @__PURE__ */ jsx(Tooltip, {
 					title: action.name,
@@ -9711,6 +10854,143 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 		]
 	});
 });
+/**
+* One cell of one row: whatever the column says fills it.
+*
+* A slot column renders the slot — a status keeps its coloured chip and a date
+* its relative wording wherever the value came from — and a property column
+* reads the record. Both go through here so the header above them is labelling
+* one thing, not two that happen to line up.
+*/
+function ListCell({ column, entity, slots }) {
+	if (column.slot === "tags") {
+		if (!slots.tags) return null;
+		return /* @__PURE__ */ jsx("div", {
+			className: "flex items-center gap-1 overflow-hidden",
+			children: /* @__PURE__ */ jsx(TagChips, {
+				slot: slots.tags,
+				max: 3
+			})
+		});
+	}
+	if (column.slot === "status") {
+		if (!slots.status) return /* @__PURE__ */ jsx(EmptyCell, {});
+		return /* @__PURE__ */ jsx(SlotValue, {
+			slot: slots.status,
+			size: "small"
+		});
+	}
+	if (column.slot === "date") return /* @__PURE__ */ jsx(Typography, {
+		variant: "caption",
+		className: "whitespace-nowrap text-surface-400 dark:text-surface-500 font-medium",
+		children: slots.date?.formatted ?? "—"
+	});
+	const property = column.property;
+	if (!property) return null;
+	const value = getValueInPath(entity.values, column.key);
+	if (property.type === "date") return /* @__PURE__ */ jsx(Typography, {
+		variant: "caption",
+		className: "whitespace-nowrap text-surface-400 dark:text-surface-500 font-medium",
+		children: formatDateValue(value) ?? "—"
+	});
+	if (isComplexPropertyType(property)) return /* @__PURE__ */ jsx(Typography, {
+		variant: "caption",
+		className: "text-surface-500 dark:text-surface-400 truncate",
+		children: compactValueSummary(value, property) ?? "—"
+	});
+	if (value === void 0 || value === null) return /* @__PURE__ */ jsx(EmptyCell, {});
+	return /* @__PURE__ */ jsx(Typography, {
+		component: "div",
+		variant: "body2",
+		className: "text-surface-600 dark:text-surface-300 truncate",
+		children: /* @__PURE__ */ jsx(PropertyPreview, {
+			propertyKey: column.key,
+			value,
+			property,
+			size: "small"
+		})
+	});
+}
+/** What a column shows for a record that has nothing in it. */
+function EmptyCell() {
+	return /* @__PURE__ */ jsx("span", {
+		className: "text-surface-400 dark:text-surface-600",
+		children: "—"
+	});
+}
+/**
+* The list's column header.
+*
+* Quiet by design: a list is read row by row, and the header is there to name
+* the columns and to be clicked, not to compete with the rows. It lays out
+* against the same widths the rows do, and skips the checkbox and the image —
+* neither is a column, and neither has anything to be called.
+*/
+function ListHeader({ titleColumn, columns, selectionEnabled, showImage, actionsWidth, sortBy, onColumnSort, sortIsAvailable }) {
+	const headerCell = (column) => /* @__PURE__ */ jsx(ListHeaderLabel, {
+		column,
+		direction: sortBy?.[0] === column.key ? sortBy[1] : void 0,
+		onSort: column.sortable && sortIsAvailable(column.key) ? () => onColumnSort(column.key) : void 0
+	});
+	return /* @__PURE__ */ jsxs("div", {
+		className: cls("flex items-center gap-4 px-5 py-1.5 select-none border-b bg-surface-50 dark:bg-surface-900", defaultBorderMixin),
+		children: [
+			selectionEnabled && /* @__PURE__ */ jsx("div", { className: "flex-shrink-0 w-8" }),
+			showImage && /* @__PURE__ */ jsx("div", { className: "flex-shrink-0 w-10" }),
+			/* @__PURE__ */ jsx("div", {
+				className: "flex-1 min-w-0 flex items-center",
+				children: titleColumn && headerCell(titleColumn)
+			}),
+			columns.length > 0 && /* @__PURE__ */ jsx("div", {
+				className: "flex items-center gap-4 flex-shrink-0 ml-auto",
+				children: columns.map((column) => /* @__PURE__ */ jsx("div", {
+					className: cls(column.width, "flex items-center overflow-hidden", column.align === "center" ? "justify-center" : column.align === "right" ? "justify-end" : "justify-start"),
+					children: headerCell(column)
+				}, column.key))
+			}),
+			actionsWidth > 0 && /* @__PURE__ */ jsx("div", {
+				className: "flex-shrink-0 ml-auto",
+				style: { minWidth: actionsWidth }
+			})
+		]
+	});
+}
+/**
+* One header label, clickable when the collection can be ordered by it.
+*
+* The arrow shows only on the column currently ordering the list: three arrows
+* in a header row are three invitations, and only one of them is ever the
+* answer to "how is this sorted".
+*/
+function ListHeaderLabel({ column, direction, onSort }) {
+	const content = /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx("span", {
+			className: "truncate",
+			children: column.label
+		}),
+		direction === "asc" && /* @__PURE__ */ jsx(ArrowUpIcon, {
+			size: 12,
+			className: "flex-shrink-0"
+		}),
+		direction === "desc" && /* @__PURE__ */ jsx(ArrowDownIcon, {
+			size: 12,
+			className: "flex-shrink-0"
+		})
+	] });
+	const base = "inline-flex items-center gap-1 max-w-full text-[11px] leading-none uppercase tracking-wider font-medium";
+	const tone = direction ? "text-surface-600 dark:text-surface-300" : "text-surface-400 dark:text-surface-500";
+	if (!onSort) return /* @__PURE__ */ jsx("span", {
+		className: cls(base, tone),
+		children: content
+	});
+	return /* @__PURE__ */ jsx("button", {
+		type: "button",
+		title: `Sort by ${column.label}`,
+		onClick: onSort,
+		className: cls(base, tone, "cursor-pointer hover:text-surface-700 dark:hover:text-surface-200 transition-colors"),
+		children: content
+	});
+}
 //#endregion
 //#region src/components/EntityDisplayHeader.tsx
 /**
@@ -10056,11 +11336,11 @@ function EntityViewBinding({ entity, collection, className, asPage = false, open
 	});
 	return /* @__PURE__ */ jsxs("div", {
 		ref: containerRef,
-		className: cls("flex-1 flex flex-row w-full min-h-0", className),
+		className: cls("@container/form flex-1 flex flex-row w-full min-h-0", className),
 		children: [/* @__PURE__ */ jsx("div", {
 			className: "flex-1 min-w-0 overflow-y-auto flex justify-center items-start",
 			children: /* @__PURE__ */ jsx("div", {
-				className: cls("@container/col w-full max-w-3xl 2xl:max-w-4xl flex flex-col", openEntityMode === "dialog" ? "pt-5 pb-8 px-6 sm:px-8" : "pt-6 pb-12 px-5 sm:px-8"),
+				className: cls("@container/col w-full max-w-3xl @7xl/form:max-w-4xl 2xl:max-w-4xl flex flex-col", openEntityMode === "dialog" ? "pt-5 pb-8 px-6 sm:px-8" : "pt-6 pb-12 px-5 sm:px-8"),
 				children: content
 			})
 		}), showRail && /* @__PURE__ */ jsx(FormRail, {
@@ -10083,11 +11363,14 @@ function EntityViewBinding({ entity, collection, className, asPage = false, open
 * editing. They live here instead, and the left half of a bar that was
 * previously empty now does the work.
 */
-function EntityIdentityBar({ collection, collectionUrl, title, entityId, status, dirty, saving, onSave, onDiscard, saveDisabled, hasErrors, onSaveAndClose, onBack, onInspect, onViewHistory, externalLink, recordActions, pluginActions, trailing, leading }) {
+function EntityIdentityBar({ collection, collectionUrl, title, entityId, status, dirty, saving, onSave, onDiscard, saveDisabled, hasErrors, onSaveAndClose, saveAndClosePlacement = "button", onClose, onBack, onInspect, onViewHistory, externalLink, recordActions, pluginActions, trailing, leading }) {
 	const { t } = useTranslation();
 	const saveLabel = status === "existing" ? t("save") : status === "copy" ? t("create_copy") : t("create");
 	const closeLabel = status === "existing" ? t("save_and_close") : status === "copy" ? t("create_copy_and_close") : t("create_and_close");
 	const hasMenu = Boolean(recordActions) || Boolean(onInspect) || Boolean(onViewHistory) || Boolean(externalLink);
+	const saveAndCloseButton = Boolean(onSaveAndClose) && saveAndClosePlacement === "button";
+	const saveAndCloseMenu = Boolean(onSaveAndClose) && saveAndClosePlacement === "menu";
+	const saveTooltip = hasErrors ? t("fix_errors_before_saving") ?? "Fix highlighted errors before saving" : void 0;
 	return /* @__PURE__ */ jsxs("div", {
 		className: cls("h-[52px] shrink-0 flex items-center gap-2 pl-1.5 pr-2 border-b", "bg-surface-50 dark:bg-surface-900", defaultBorderMixin),
 		children: [
@@ -10134,19 +11417,39 @@ function EntityIdentityBar({ collection, collectionUrl, title, entityId, status,
 				onClick: onDiscard,
 				children: status === "existing" ? t("discard") : t("clear")
 			}),
-			onSave && /* @__PURE__ */ jsx(Tooltip, {
-				title: hasErrors ? t("fix_errors_before_saving") ?? "Fix highlighted errors before saving" : void 0,
-				children: /* @__PURE__ */ jsx(LoadingButton, {
-					variant: onSaveAndClose ? "text" : "filled",
-					color: "primary",
-					size: "small",
-					loading: saving && !onSaveAndClose,
-					disabled: saveDisabled,
-					onClick: onSave,
-					children: saveLabel
-				})
+			onSave && /* @__PURE__ */ jsxs("div", {
+				className: "flex items-stretch rounded-lg overflow-hidden",
+				children: [/* @__PURE__ */ jsx(Tooltip, {
+					title: saveTooltip,
+					children: /* @__PURE__ */ jsx(LoadingButton, {
+						variant: saveAndCloseButton ? "text" : "filled",
+						color: "primary",
+						size: "small",
+						loading: saving && !saveAndCloseButton,
+						disabled: saveDisabled,
+						onClick: onSave,
+						className: saveAndCloseMenu ? "rounded-none" : void 0,
+						children: saveLabel
+					})
+				}), saveAndCloseMenu && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(Menu, {
+					align: "end",
+					trigger: /* @__PURE__ */ jsx(Button, {
+						variant: "filled",
+						color: "primary",
+						size: "small",
+						disabled: saveDisabled,
+						"aria-label": closeLabel,
+						style: { borderLeftColor: "color-mix(in oklab, currentColor 15%, transparent)" },
+						className: "rounded-none px-1.5",
+						children: /* @__PURE__ */ jsx(ChevronDownIcon, { size: iconSize.smallest })
+					}),
+					children: /* @__PURE__ */ jsxs(MenuItem, {
+						onClick: onSaveAndClose,
+						children: [/* @__PURE__ */ jsx(CheckIcon, { size: iconSize.smallest }), closeLabel]
+					})
+				}) })]
 			}),
-			onSaveAndClose && /* @__PURE__ */ jsx(LoadingButton, {
+			saveAndCloseButton && /* @__PURE__ */ jsx(LoadingButton, {
 				variant: "filled",
 				color: "primary",
 				size: "small",
@@ -10180,7 +11483,19 @@ function EntityIdentityBar({ collection, collectionUrl, title, entityId, status,
 					})
 				]
 			}),
-			trailing
+			trailing,
+			onClose && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Separator, {
+				orientation: "vertical",
+				className: "h-5 mx-1 shrink-0"
+			}), /* @__PURE__ */ jsx(Tooltip, {
+				title: `${t("close")} · Esc`,
+				children: /* @__PURE__ */ jsx(IconButton, {
+					size: "small",
+					onClick: onClose,
+					"aria-label": t("close"),
+					children: /* @__PURE__ */ jsx(XIcon, { size: iconSize.smallest })
+				})
+			})] })
 		]
 	});
 }
@@ -10250,13 +11565,17 @@ function SplitViewProvider({ value, children }) {
 * Closes the list of a split view, leaving the open record on its own.
 *
 * It leads the record's own app bar, where the breadcrumb starts — this is the
-* entity pane's old "Open full screen" button, moved to that edge and wearing a
-* double chevron pointing at the list it folds away: closing the list and
-* opening the record full screen are the same thing, so there is one control
-* and one route (`#full`) rather than two. Full screen carries the mirrored
-* chevron to bring the list back.
+* entity pane's old "Open full screen" button, moved to that edge: closing the
+* list and opening the record full screen are the same thing, so there is one
+* control and one route (`#full`) rather than two. Full screen carries the
+* mirrored icon to bring the list back.
+*
+* A pane glyph rather than the double chevron it wore first. Now that the bar
+* ends in a ✕ that dismisses the record, an arrow pointing off the left edge of
+* the record's own bar was the other thing on it that read as "close me" — and
+* it is the one control here that does not act on the record at all.
 */
-function SplitListCloseButton() {
+function SplitListCloseButton({ onBeforeHide } = {}) {
 	const { t } = useTranslation();
 	const splitView = useSplitView();
 	if (!splitView?.detailOpen) return null;
@@ -10264,9 +11583,12 @@ function SplitListCloseButton() {
 		title: t("hide_list"),
 		children: /* @__PURE__ */ jsx(IconButton, {
 			size: "small",
-			onClick: splitView.openFullScreen,
+			onClick: () => {
+				onBeforeHide?.();
+				splitView.openFullScreen();
+			},
 			"aria-label": t("hide_list"),
-			children: /* @__PURE__ */ jsx(ChevronsLeftIcon, { size: iconSize.smallest })
+			children: /* @__PURE__ */ jsx(PanelLeftCloseIcon, { size: iconSize.smallest })
 		})
 	});
 }
@@ -10276,7 +11598,7 @@ function SplitListCloseButton() {
 * Brings the list back beside a record that was opened full screen.
 *
 * The mirror of {@link SplitListCloseButton}: the same edge of the same bar,
-* the same double chevron pointing the other way, and the same single route —
+* the same pane glyph opening rather than closing, and the same single route —
 * showing the list is dropping the `#full` hash. It replaces the back arrow
 * where it applies, because the list it unfolds already holds the record.
 */
@@ -10288,7 +11610,7 @@ function SplitListShowButton({ onClick }) {
 			size: "small",
 			onClick,
 			"aria-label": t("show_list"),
-			children: /* @__PURE__ */ jsx(ChevronsRightIcon, { size: iconSize.smallest })
+			children: /* @__PURE__ */ jsx(PanelLeftOpenIcon, { size: iconSize.smallest })
 		})
 	});
 }
@@ -10322,7 +11644,7 @@ function JsonPreviewBinding({ values }) {
 }
 //#endregion
 //#region src/components/EntityInspector.tsx
-var EntityHistoryView = lazy(() => import("./history-DfMuvPfr.js").then((m) => ({ default: m.EntityHistoryView })));
+var EntityHistoryView = lazy(() => import("./history-D5SKygpJ.js").then((m) => ({ default: m.EntityHistoryView })));
 /**
 * Raw values and revision history, as an inspector rather than as tabs.
 *
@@ -10340,13 +11662,13 @@ function EntityInspector({ tab, onTabChange, onClose, collection, entity, formCo
 	useEffect(() => {
 		if (!open) return;
 		const onKeyDown = (e) => {
-			if (e.key === "Escape") {
-				e.stopPropagation();
-				onClose();
-			}
+			if (e.key !== "Escape") return;
+			if (document.querySelector("[role=\"dialog\"][data-state=\"open\"]")) return;
+			e.stopPropagation();
+			onClose();
 		};
-		window.addEventListener("keydown", onKeyDown);
-		return () => window.removeEventListener("keydown", onKeyDown);
+		document.addEventListener("keydown", onKeyDown, true);
+		return () => document.removeEventListener("keydown", onKeyDown, true);
 	}, [open, onClose]);
 	if (!open) return null;
 	return /* @__PURE__ */ jsxs("div", {
@@ -10433,6 +11755,15 @@ function useEntityDisplayTitle({ collection, entity, values, status }) {
 * Shared tab value constants used by EditViewBinding and DetailViewBinding.
 */
 var MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
+/**
+* Every tab in that row, a custom `tabComponent` included.
+*
+* `h-full` over the variant's `h-9`: the row is 40px and the tab 36px, so a
+* centred tab floated ~2px clear of the row's bottom border and the active
+* tab's underline stopped short of the record it opens. Paired with
+* `items-stretch` on the Tabs root, which the variant leaves centred.
+*/
+var ENTITY_VIEW_TAB_CLASS = "h-full data-[state=active]:bg-white dark:data-[state=active]:bg-surface-800";
 //#endregion
 //#region src/components/DetailViewBinding.tsx
 function DetailViewBinding({ entityId, ...props }) {
@@ -10458,7 +11789,7 @@ function DetailViewBinding({ entityId, ...props }) {
 		children: content
 	});
 }
-function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onTabChange, onEditClick, entity, dataLoading, layout = "full_screen", barActions, barActionsStart, onShowList }) {
+function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onTabChange, onEditClick, onCloseRequest, entity, dataLoading, layout = "full_screen", barActions, barActionsStart, onShowList }) {
 	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 	const { t } = useTranslation();
 	const context = useRebaseContext();
@@ -10494,7 +11825,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 		const target = val === "edit" ? MAIN_TAB_VALUE : val;
 		if (target !== selectedTab) setSelectedTab(target);
 	}, [selectedTabProp, defaultSelectedView]);
-	const childViews = getAdminEntityChildViews(collection).filter((v) => !v.collection.hideFromNavigation);
+	const childViews = getAdminEntityChildViews(collection).filter((v) => !v.collection.hideFromEntityViews);
 	const subcollections = childViews.map((v) => v.collection);
 	const subcollectionsCount = subcollections?.length ?? 0;
 	const customViews = collection.entityViews ?? [];
@@ -10645,9 +11976,9 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 	]);
 	const propertyDetailView = () => {
 		if (FormViewBuilder && usedEntity) return /* @__PURE__ */ jsx("div", {
-			className: "flex-1 min-w-0 overflow-y-auto flex justify-center items-start",
+			className: "@container/form flex-1 min-w-0 overflow-y-auto flex justify-center items-start",
 			children: /* @__PURE__ */ jsx("div", {
-				className: cls("w-full max-w-3xl 2xl:max-w-4xl flex flex-col", layout === "dialog" ? "pt-5 pb-12 px-6 sm:px-8" : "pt-6 pb-16 px-5 sm:px-8"),
+				className: cls("w-full max-w-3xl @7xl/form:max-w-4xl 2xl:max-w-4xl flex flex-col", layout === "dialog" ? "pt-5 pb-12 px-6 sm:px-8" : "pt-6 pb-16 px-5 sm:px-8"),
 				children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, {
 					fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}),
 					children: /* @__PURE__ */ jsx(FormViewBuilder, {
@@ -10673,7 +12004,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 	const subcollectionTabs = subcollections && subcollections.map((subcollection) => {
 		const icon = getIcon(subcollection.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: "text-sm min-w-[90px]",
+			className: cls("h-full data-[state=active]:bg-white dark:data-[state=active]:bg-surface-800", "text-sm min-w-[90px]"),
 			value: subcollection.slug,
 			children: /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -10684,7 +12015,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 	const customViewTabsStart = resolvedEntityViews.filter((view) => view.position === "start").map((view) => {
 		const icon = getIcon(view.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: !view.tabComponent ? "text-sm min-w-[90px]" : void 0,
+			className: cls(ENTITY_VIEW_TAB_CLASS, !view.tabComponent && "text-sm min-w-[90px]"),
 			value: view.key,
 			children: view.tabComponent ?? /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -10695,7 +12026,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 	const customViewTabsEnd = resolvedEntityViews.filter((view) => !view.position || view.position === "end").map((view) => {
 		const icon = getIcon(view.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: !view.tabComponent ? "text-sm min-w-[90px]" : void 0,
+			className: cls(ENTITY_VIEW_TAB_CLASS, !view.tabComponent && "text-sm min-w-[90px]"),
 			value: view.key,
 			children: view.tabComponent ?? /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -10740,6 +12071,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 				dirty: false,
 				saving: false,
 				onBack: backToCollection,
+				onClose: onCloseRequest,
 				onInspect: includeJsonView ? () => setInspectorTab("json") : void 0,
 				onViewHistory: includeHistoryView ? () => setInspectorTab("history") : void 0,
 				externalLink: usedEntity ? customizationController?.entityLinkBuilder?.({ entity: usedEntity }) : void 0,
@@ -10762,9 +12094,9 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 				] })
 			}),
 			hasAdditionalViews && /* @__PURE__ */ jsx("div", {
-				className: cls("h-10 shrink-0 flex items-stretch border-b px-2 min-w-0", defaultBorderMixin),
+				className: cls("h-10 shrink-0 flex items-stretch border-b px-2 min-w-0", "bg-surface-50 dark:bg-surface-900", defaultBorderMixin),
 				children: /* @__PURE__ */ jsxs(Tabs, {
-					className: "!w-full",
+					className: "!w-full items-stretch",
 					innerClassName: "h-full",
 					variant: "boxy",
 					value: activeTab,
@@ -10774,6 +12106,7 @@ function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp,
 					children: [
 						/* @__PURE__ */ jsx(Tab, {
 							value: "__main_##Q$SC^#S6",
+							className: cls("h-full data-[state=active]:bg-white dark:data-[state=active]:bg-surface-800", "text-sm min-w-[90px]"),
 							children: /* @__PURE__ */ jsxs("span", {
 								className: "flex items-center gap-1.5",
 								children: [getIcon(collection.icon, void 0, void 0, "smallest"), collection.singularName ?? collection.name]
@@ -10909,12 +12242,14 @@ function isListShortcutTarget(target, detailPanel) {
 * The list only has to identify a record — a title, a subtitle and a status
 * chip — while the detail beside it carries the whole record and its rail. At
 * 30% the list was taking width from the side that had four columns of fields
-* to lay out.
+* to lay out; 26% still was, by about the width of one field.
 *
 * A default, not a constraint: {@link savePanelSize} remembers the drag per
-* collection, so anyone who has already sized this list keeps their size.
+* collection, so anyone who has already sized this list keeps their size. The
+* drag floor is `minPanelSizePx`, and it holds below ~1100px of split — at that
+* width this percentage is already the floor.
 */
-var DEFAULT_PANEL_SIZE = 26;
+var DEFAULT_PANEL_SIZE = 22;
 function getSavedPanelSize(path) {
 	try {
 		const saved = localStorage.getItem(`${PANEL_SIZE_KEY}_${path}`);
@@ -10957,7 +12292,10 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 	const setDirty = useCallback((modified) => {
 		dirty.current = modified;
 	}, []);
+	const previousEntityId = useRef(selectedEntityId);
 	useEffect(() => {
+		if (previousEntityId.current === selectedEntityId) return;
+		previousEntityId.current = selectedEntityId;
 		dirty.current = false;
 	}, [selectedEntityId]);
 	const blocker = useNavigationBlocker(useCallback(({ currentLocation, nextLocation }) => {
@@ -10970,9 +12308,10 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 		return true;
 	}, []));
 	const [panelSize, setPanelSize] = useState(() => getSavedPanelSize(path));
-	useEffect(() => {
-		savePanelSize(path, panelSize);
-	}, [panelSize, path]);
+	const handlePanelSizeChange = useCallback((size) => {
+		setPanelSize(size);
+		savePanelSize(path, size);
+	}, [path]);
 	const [renderedEntityId, setRenderedEntityId] = useState(selectedEntityId);
 	const [animationPhase, setAnimationPhase] = useState(selectedEntityId !== void 0 ? "entered" : "idle");
 	const animationTimer = useRef(null);
@@ -11100,6 +12439,7 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 			parentEntityIds: usedParentEntityIds,
 			selectedTab,
 			layout: "split",
+			onCloseRequest: handleCloseDetail,
 			onEditClick: () => {
 				navigate(buildUrl(`${path}/${renderedEntityId}/edit`));
 			},
@@ -11115,6 +12455,7 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 			parentEntityIds: usedParentEntityIds,
 			selectedTab,
 			layout: "split",
+			onCloseRequest: handleCloseDetail,
 			onValuesModified: setDirty,
 			onSaved: () => {
 				setDirty(false);
@@ -11150,7 +12491,7 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 			secondPanel: detailPanel,
 			showSecondPanel: isDetailVisible,
 			panelSizePercent: animationPhase === "entering" ? 100 : panelSize,
-			onPanelSizeChange: setPanelSize,
+			onPanelSizeChange: handlePanelSizeChange,
 			minPanelSizePx: 240
 		}), /* @__PURE__ */ jsx(UnsavedChangesDialog, {
 			open: blocker?.state === "blocked",
@@ -11297,6 +12638,17 @@ function BoardCardBindingInner({ item, isDragging, isGroupedOver, style, collect
 							className: "text-[10px] text-surface-400 dark:text-surface-500 shrink-0",
 							children: ["+", slots.relations.reduce((acc, r) => acc + Math.max(0, r.totalCount - r.items.length), 0)]
 						})]
+					}),
+					slots.tags && /* @__PURE__ */ jsx("div", {
+						className: "flex items-center gap-1 mt-1 flex-wrap",
+						children: /* @__PURE__ */ jsx(TagChips, {
+							slot: slots.tags,
+							max: 3
+						})
+					}),
+					slots.date && /* @__PURE__ */ jsx("div", {
+						className: "text-[10px] text-surface-500 dark:text-surface-400 mt-1",
+						children: slots.date.formatted
 					})
 				]
 			})]
@@ -11414,6 +12766,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 	}, []);
 	const subscribeToColumn = useCallback((column, itemCount) => {
 		if (isCleaningUpRef.current) return;
+		const requestedCount = Math.min(itemCount, MAX_LIST_LIMIT);
 		const currentDataClient = dataClientRef.current;
 		const currentCollection = collectionRef.current;
 		const currentContext = contextRef.current;
@@ -11543,7 +12896,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 		const includeParams = getRelationIncludeParams(currentCollection);
 		const fetchOnce = () => accessor.find({
 			where: whereFilter,
-			limit: itemCount,
+			limit: requestedCount,
 			orderBy: orderByParam,
 			include: includeParams,
 			searchString: currentSearchString
@@ -11569,7 +12922,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 			let liveDataReceived = false;
 			const unsubscribe = accessor.listen({
 				where: whereFilter,
-				limit: itemCount,
+				limit: requestedCount,
 				orderBy: orderByParam,
 				include: includeParams,
 				searchString: currentSearchString
@@ -12152,7 +13505,7 @@ function CollectionBoardViewBinding({ collection, tableController, fullPath, par
 		analyticsController.onAnalyticsEvent?.("kanban_backfill_order", { path: fullPath });
 		setBackfillLoading(true);
 		try {
-			const entitiesToUpdate = (await dataClient.collection(fullPath).find({ limit: 1e4 })).data.filter((entity) => !isValidOrderKey(entity.values?.[orderProperty]));
+			const entitiesToUpdate = (await dataClient.collection(fullPath).find({ limit: MAX_LIST_LIMIT })).data.filter((entity) => !isValidOrderKey(entity.values?.[orderProperty]));
 			const keys = generateNKeysBetween(null, null, entitiesToUpdate.length, ORDER_KEY_DIGITS);
 			const updates = [];
 			entitiesToUpdate.forEach((entity, index) => {
@@ -12392,10 +13745,10 @@ var ALL_VIEW_MODES = [
 function ViewModeToggle({ viewMode = "table", onViewModeChange, enabledViews = ALL_VIEW_MODES, size, onSizeChanged, open, onOpenChange, kanbanPropertyOptions, selectedKanbanProperty, onKanbanPropertyChange }) {
 	const { t } = useTranslation();
 	const getViewModeIcon = () => {
-		if (viewMode === "kanban") return /* @__PURE__ */ jsx(KanbanIcon, { size: iconSize.smallest });
-		if (viewMode === "cards") return /* @__PURE__ */ jsx(LayoutGridIcon, { size: iconSize.smallest });
-		if (viewMode === "table") return /* @__PURE__ */ jsx(TableIcon, { size: iconSize.smallest });
-		return /* @__PURE__ */ jsx(ListIcon, { size: iconSize.smallest });
+		if (viewMode === "kanban") return /* @__PURE__ */ jsx(KanbanIcon, { size: iconSize.small });
+		if (viewMode === "cards") return /* @__PURE__ */ jsx(LayoutGridIcon, { size: iconSize.small });
+		if (viewMode === "table") return /* @__PURE__ */ jsx(TableIcon, { size: iconSize.small });
+		return /* @__PURE__ */ jsx(ListIcon, { size: iconSize.small });
 	};
 	const getViewModeName = () => {
 		if (viewMode === "kanban") return t("board");
@@ -12664,12 +14017,13 @@ function addRecentId(collectionId, id) {
 	return newRecentIds;
 }
 function saveSearchedIdsLocally(collectionId, ids) {
-	localStorage.setItem("recent_id_searches::" + collectionId, JSON.stringify(ids));
+	writeStoredJson("recent_id_searches::" + collectionId, ids);
 }
 function getRecentIds(collectionId) {
-	const stored = localStorage.getItem("recent_id_searches::" + collectionId);
-	if (!stored) return [];
-	return JSON.parse(stored);
+	return readStoredJson("recent_id_searches::" + collectionId, {
+		fallback: [],
+		accept: isArrayValue
+	});
 }
 //#endregion
 //#region src/components/admin/CreationResultDialog.tsx
@@ -13346,7 +14700,7 @@ function PopupFormFieldInternal({ tableKey, entityId, customFieldValidator, prop
 	const property = propertyKey && getPropertyInPath$1(collection?.properties ?? {}, propertyKey);
 	const fieldProps = propertyKey && property ? {
 		propertyKey,
-		disabled: isSubmitting || isReadOnly(property) || !!property.admin?.disabled,
+		disabled: isSubmitting || isReadOnly(property) || isDisabled(property),
 		property,
 		includeDescription: false,
 		underlyingValueHasChanged: false,
@@ -13433,7 +14787,7 @@ function PopupFormFieldInternal({ tableKey, entityId, customFieldValidator, prop
 }
 //#endregion
 //#region src/components/ClearFilterSortButton.tsx
-function ClearFilterSortButton({ tableController, enabled }) {
+function ClearFilterSortButton({ tableController, enabled, compact }) {
 	const { t } = useTranslation();
 	if (!enabled) return null;
 	const filterIsSet = !!tableController.filterValues && Object.keys(tableController.filterValues).length > 0;
@@ -13445,15 +14799,14 @@ function ClearFilterSortButton({ tableController, enabled }) {
 		else label = t("clear_sort");
 		return /* @__PURE__ */ jsx(Tooltip, {
 			title: label,
-			children: /* @__PURE__ */ jsx(Button, {
+			children: /* @__PURE__ */ jsx(IconButton, {
 				size: "small",
-				variant: "text",
 				"aria-label": label,
 				onClick: () => {
 					tableController.clearFilter?.();
 					tableController.setSortBy?.(void 0);
 				},
-				children: /* @__PURE__ */ jsx(FilterXIcon, { size: iconSize.small })
+				children: /* @__PURE__ */ jsx(FilterXIcon, { size: compact ? iconSize.smallest : iconSize.small })
 			})
 		});
 	}
@@ -13811,7 +15164,7 @@ function FilterPresetsButton({ filterPresets, tableController, compact }) {
 * is one click rather than a trip through a direction selector; clicking a
 * different one starts it ascending. The popover stays open through both.
 */
-function SortButton({ tableController, properties }) {
+function SortButton({ tableController, properties, compact }) {
 	const { t } = useTranslation();
 	const [open, setOpen] = useState(false);
 	const options = useMemo(() => getSortablePropertyOptions(properties), [properties]);
@@ -13837,6 +15190,7 @@ function SortButton({ tableController, properties }) {
 	if (!setSortBy || options.length === 0) return null;
 	const activeOption = options.find((option) => option.key === activeKey);
 	const label = activeOption ? `${t("sort_by")}: ${activeOption.title}` : t("sort");
+	const arrowSize = compact ? iconSize.smallest : iconSize.small;
 	return /* @__PURE__ */ jsx(Popover, {
 		open,
 		onOpenChange: setOpen,
@@ -13848,7 +15202,7 @@ function SortButton({ tableController, properties }) {
 			"aria-label": label,
 			title: label,
 			className: cls(activeOption && "text-primary"),
-			children: activeDirection === "desc" ? /* @__PURE__ */ jsx(ArrowDownIcon, { size: iconSize.smallest }) : activeDirection === "asc" ? /* @__PURE__ */ jsx(ArrowUpIcon, { size: iconSize.smallest }) : /* @__PURE__ */ jsx(ArrowUpDownIcon, { size: iconSize.smallest })
+			children: activeDirection === "desc" ? /* @__PURE__ */ jsx(ArrowDownIcon, { size: arrowSize }) : activeDirection === "asc" ? /* @__PURE__ */ jsx(ArrowUpIcon, { size: arrowSize }) : /* @__PURE__ */ jsx(ArrowUpDownIcon, { size: arrowSize })
 		}),
 		children: /* @__PURE__ */ jsxs("div", {
 			className: "py-2 min-w-[240px] flex flex-col",
@@ -13945,6 +15299,7 @@ function CollectionViewStartActions({ collection, relativePath, parentCollection
 			children: /* @__PURE__ */ jsx(XIcon, { size: iconSize.smallest })
 		})
 	}, "close_tooltip");
+	const iconOnlyToolbar = !largeLayout || Boolean(compact);
 	const filtersButton = resolvedProperties && tableController.setFilterValues && /* @__PURE__ */ jsx(Tooltip, {
 		title: t("filters"),
 		children: /* @__PURE__ */ jsx(Badge, {
@@ -13967,7 +15322,8 @@ function CollectionViewStartActions({ collection, relativePath, parentCollection
 	}, "filters_tooltip");
 	const sortButton = resolvedProperties && (viewMode === "list" || viewMode === "cards") && /* @__PURE__ */ jsx(SortButton, {
 		tableController,
-		properties: resolvedProperties
+		properties: resolvedProperties,
+		compact: iconOnlyToolbar
 	}, "sort_button");
 	const filterPresetsButton = !compact && collection.filterPresets?.length ? /* @__PURE__ */ jsx(FilterPresetsButton, {
 		filterPresets: collection.filterPresets,
@@ -13981,6 +15337,7 @@ function CollectionViewStartActions({ collection, relativePath, parentCollection
 			sortButton,
 			/* @__PURE__ */ jsx(ClearFilterSortButton, {
 				tableController,
+				compact: iconOnlyToolbar,
 				enabled: !collection.fixedFilter
 			}, "clear_filter"),
 			filterPresetsButton
@@ -14139,16 +15496,16 @@ var CollectionViewBindingInner = React.memo(function CollectionViewBindingInner(
 		viewMode
 	});
 	useEffect(() => {
-		if (!urlView && viewMode !== defaultViewMode) setSearchParams((prev) => {
-			const next = new URLSearchParams(prev);
+		if (!urlView && viewMode !== defaultViewMode) setSearchParams(() => {
+			const next = new URLSearchParams(window.location.search);
 			next.set(VIEW_MODE_PARAM, viewMode);
 			return next;
 		}, { replace: true });
 	}, []);
 	const setViewMode = useCallback((newMode) => {
 		setViewModeState(newMode);
-		setSearchParams((prev) => {
-			const next = new URLSearchParams(prev);
+		setSearchParams(() => {
+			const next = new URLSearchParams(window.location.search);
 			if (newMode === defaultViewMode) next.delete(VIEW_MODE_PARAM);
 			else next.set(VIEW_MODE_PARAM, newMode);
 			return next;
@@ -14452,15 +15809,17 @@ var CollectionViewBindingInner = React.memo(function CollectionViewBindingInner(
 		if (!property) property = getPropertyInPath$1(resolvedCollection.properties, propertyKey);
 		return property ?? null;
 	}, [collection.properties, resolvedCollection.properties]);
-	const displayedColumnIds = useColumnIds(useMemo(() => {
+	const collectionWithLocalOrder = useMemo(() => {
 		if (localPropertiesOrder && localPropertiesOrder !== resolvedCollection.propertiesOrder) return {
 			...resolvedCollection,
 			propertiesOrder: localPropertiesOrder
 		};
 		return resolvedCollection;
-	}, [resolvedCollection, localPropertiesOrder]), true);
+	}, [resolvedCollection, localPropertiesOrder]);
+	const displayedColumnIds = useColumnIds(collectionWithLocalOrder, true);
 	const additionalFields = useMemo(() => {
-		const subcollectionColumns = getEntityChildViews(collection).map((v) => v.collection).map((subcollection) => {
+		const redundant = getRedundantChildViewColumnIds(collectionWithLocalOrder);
+		const subcollectionColumns = getEntityChildViews(collection).map((v) => v.collection).filter((child) => !redundant.has(getSubcollectionColumnId(child))).map((subcollection) => {
 			return {
 				key: getSubcollectionColumnId(subcollection),
 				name: subcollection.name,
@@ -14488,6 +15847,7 @@ var CollectionViewBindingInner = React.memo(function CollectionViewBindingInner(
 		return [...collection.additionalFields ?? EMPTY_ARRAY, ...subcollectionColumns];
 	}, [
 		collection,
+		collectionWithLocalOrder,
 		path,
 		sidePanelController
 	]);
@@ -14993,6 +16353,7 @@ function EntityIdHeaderWidget({ collection, path, idPath, openEntityMode }) {
 						className: "flex p-2 w-full gap-2",
 						children: [/* @__PURE__ */ jsx(TextField, {
 							autoFocus: openPopup,
+							"aria-label": t("find_entity_by_id"),
 							placeholder: t("find_entity_by_id"),
 							size: "small",
 							onChange: (e) => {
@@ -15036,6 +16397,137 @@ function EntityIdHeaderWidget({ collection, path, idPath, openEntityMode }) {
 	});
 }
 //#endregion
+//#region src/form/form_utils.ts
+function extractTouchedValues(values, touched) {
+	let acc = {};
+	if (!touched || typeof touched !== "object") return acc;
+	Object.entries(touched).forEach(([key, value]) => {
+		if (value) acc = setIn(acc, key, getIn(values, key));
+	});
+	return acc;
+}
+/**
+* Recursively removes empty plain objects `{}` and empty arrays `[]` from a value tree.
+* This prevents ghost containers created by `setIn` intermediate path construction
+* (e.g. `{ address: {} }` when only `address.city` was touched but value is undefined)
+* from falsely triggering the unsaved local changes indicator.
+*/
+/**
+* Check if a value is semantically empty (null, undefined, or empty string).
+*/
+function isSemanticEmpty(v) {
+	return v === null || v === void 0 || v === "";
+}
+function removeEmptyContainers(obj) {
+	if (Array.isArray(obj)) return obj.map(removeEmptyContainers);
+	if (obj && typeof obj === "object" && Object.getPrototypeOf(obj) === Object.prototype) {
+		const result = {};
+		for (const key of Object.keys(obj)) {
+			const cleaned = removeEmptyContainers(obj[key]);
+			if (cleaned && typeof cleaned === "object" && !Array.isArray(cleaned) && Object.getPrototypeOf(cleaned) === Object.prototype && Object.keys(cleaned).length === 0) continue;
+			result[key] = cleaned;
+		}
+		if (Object.keys(result).length > 0 && Object.values(result).every(isSemanticEmpty)) return {};
+		return result;
+	}
+	return obj;
+}
+function getChanges(source, comparison) {
+	const changes = {};
+	if (!source) return {};
+	if (!comparison) return source;
+	const allKeys = Array.from(/* @__PURE__ */ new Set([...Object.keys(source), ...Object.keys(comparison)]));
+	for (const key of allKeys) {
+		const sourceValue = source[key];
+		const comparisonValue = comparison[key];
+		if (deepEqual(sourceValue, comparisonValue)) continue;
+		const sourceHasKey = source && typeof source === "object" && Object.prototype.hasOwnProperty.call(source, key);
+		if (comparison && typeof comparison === "object" && Object.prototype.hasOwnProperty.call(comparison, key) && !sourceHasKey) changes[key] = void 0;
+		else if (Array.isArray(sourceValue)) {
+			const comparisonArray = Array.isArray(comparisonValue) ? comparisonValue : [];
+			if (sourceValue.length !== comparisonArray.length) {
+				changes[key] = sourceValue;
+				continue;
+			}
+			if (sourceValue.some((item, index) => !deepEqual(item, comparisonArray[index]))) changes[key] = sourceValue;
+		} else if (isObject(sourceValue) && sourceValue && isObject(comparisonValue) && comparisonValue) {
+			const nestedChanges = getChanges(sourceValue, comparisonValue);
+			if (Object.keys(nestedChanges).length > 0) changes[key] = nestedChanges;
+		} else changes[key] = sourceValue;
+	}
+	return changes;
+}
+/**
+* What the local-changes backup still has to offer, given what the form is
+* already showing — the answer the "unsaved local changes" banner is asking for.
+* `undefined` means there is nothing left to apply, and no banner.
+*
+* Measured against what the form *opens showing*, not against the stored
+* record. The banner exists to offer a draft the form is not already displaying,
+* and an edit carried across a change of layout is in both the backup and the
+* form: measuring against the stored values alone offered to restore the values
+* already on screen, over an edit the user had never left.
+*/
+function getUnappliedLocalChanges(backupValues, openingValues) {
+	const cleaned = removeEmptyContainers(getChanges(backupValues, openingValues));
+	if (!cleaned || typeof cleaned !== "object" || Object.keys(cleaned).length === 0) return;
+	return cleaned;
+}
+/**
+* What travels when the same record changes layout — the split's "hide list",
+* full screen's "show list", the side panel's "open full screen". One mounted
+* form is replaced by another showing the same record, so the edit in progress
+* has to be handed over; left to the local-changes backup alone, the new form
+* met it as a draft from a closed tab and raised the "unsaved local changes"
+* banner over changes the user had made a second earlier and never left.
+*
+* Returns `undefined` when there is nothing to carry, which is its own answer: a
+* record nobody edited must open in the next layout exactly as clean as it was.
+*
+* Only what was edited here travels, keyed by `touched` — the same subset the
+* backup stores. Carrying the whole record instead marks every field touched in
+* the receiving form, which lights up every empty required field as an error and
+* writes the entire record back out as a "local change".
+*/
+function getEditHandoffValues({ status, dirty, values, touched, storedValues }) {
+	if (!values) return void 0;
+	if (status === "new" || status === "copy") return Object.keys(values).length > 0 ? values : void 0;
+	if (!dirty) return void 0;
+	const touchedValues = removeEmptyContainers(extractTouchedValues(values, touched ?? {}));
+	if (touchedValues && Object.keys(touchedValues).length > 0) return touchedValues;
+	const changes = getChanges(values, storedValues ?? {});
+	return Object.keys(changes).length > 0 ? changes : void 0;
+}
+function getInitialEntityValues(authController, collection, path, status, entity, propertyConfigs) {
+	const properties = collection.properties;
+	if ((status === "existing" || status === "copy") && entity) {
+		let values;
+		if (!collection.alwaysApplyDefaultValues) values = entity.values ?? getDefaultValuesFor(properties);
+		else values = mergeDeep(getDefaultValuesFor(properties), entity.values ?? {});
+		if (status === "copy") {
+			const result = { ...values };
+			for (const [key, property] of Object.entries(properties)) if (property && "isId" in property && property.isId) delete result[key];
+			return result;
+		}
+		return values;
+	} else if (status === "new") return getDefaultValuesFor(properties);
+	else {
+		console.error({
+			status,
+			entity
+		});
+		throw new Error("Form has not been initialised with the correct parameters");
+	}
+}
+function zodToFormErrors(zodError) {
+	let errors = {};
+	for (const issue of zodError.issues) {
+		const path = issue.path.join(".");
+		if (path && !getIn(errors, path)) errors = setIn(errors, path, issue.message);
+	}
+	return errors;
+}
+//#endregion
 //#region src/components/EditFormActions.tsx
 /**
 * The entity form's footer.
@@ -15278,7 +16770,17 @@ function EditViewBinding({ entityId, ...props }) {
 		databaseId: props.databaseId,
 		useCache: false
 	});
-	const initialDirtyValues = entityId ? getEntityFromMemoryCache(props.path + "/" + entityId) : props.defaultValues ?? getEntityFromMemoryCache(props.path + "#new");
+	const carriesAsNew = props.copy || entityId === void 0;
+	const handoffKey = carriesAsNew ? props.path + "#new" : props.path + "/" + entityId;
+	const handoff = useRef(null);
+	if (handoff.current?.key !== handoffKey) handoff.current = {
+		key: handoffKey,
+		values: getEntityFromMemoryCache(handoffKey)
+	};
+	useEffect(() => {
+		removeEntityFromMemoryCache(handoffKey);
+	}, [handoffKey]);
+	const initialDirtyValues = carriesAsNew ? props.defaultValues ?? handoff.current.values : handoff.current.values;
 	const { canEdit: canEditHook } = usePermissions();
 	const [status, setStatus] = useState(props.copy ? "copy" : entityId ? "existing" : "new");
 	const canEdit = useMemo(() => {
@@ -15314,7 +16816,7 @@ function EditViewBinding({ entityId, ...props }) {
 		children: content
 	});
 }
-function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onValuesModified, onSaved, onTabChange, navigateBack, entity, initialDirtyValues, dataLoading, layout = "side_panel", barActions, barActionsStart, onShowList, status, setStatus, formProps, canEdit }) {
+function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onValuesModified, onSaved, onTabChange, navigateBack, onCloseRequest, entity, initialDirtyValues, dataLoading, layout = "side_panel", barActions, barActionsStart, onShowList, status, setStatus, formProps, canEdit }) {
 	const ResolvedFormActions = useComponentOverride("EditView.FormActions", EditFormActions);
 	const ResolvedEntityForm = useComponentOverride("Entity.Form", EntityFormBinding);
 	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
@@ -15371,7 +16873,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 		const target = val === "edit" ? MAIN_TAB_VALUE : val;
 		if (target !== selectedTab) setSelectedTab(target);
 	}, [selectedTabProp, defaultSelectedView]);
-	const childViews = getAdminEntityChildViews(collection).filter((v) => !v.collection.hideFromNavigation);
+	const childViews = getAdminEntityChildViews(collection).filter((v) => !v.collection.hideFromEntityViews);
 	const subcollections = childViews.map((v) => v.collection);
 	const subcollectionsCount = subcollections?.length ?? 0;
 	const customViews = collection.entityViews ?? [];
@@ -15466,10 +16968,55 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 	const formex = formContext?.formex;
 	const hasFormErrors = Boolean(formex && Object.keys(formex.errors).length > 0 && formex.submitCount > 0);
 	const saveDisabled = Boolean(!formContext || formContext.disabled || formex?.isSubmitting || status === "existing" && !formex?.dirty);
+	/**
+	* Hand this record's edit in progress to the layout about to replace this
+	* one — the split's "hide list", full screen's "show list", the side panel's
+	* "open full screen". None of them is a navigation *away* from the record:
+	* the same record is about to be shown by a different form, and what the
+	* user has typed belongs to the record, not to the pane it was typed in.
+	*
+	* Every control that changes layout has to call this, and none of them is
+	* blocked by the unsaved-changes prompt — the prompt asks about leaving, and
+	* these do not leave. What used to happen instead is that the edit reached
+	* the next layout only as its local-changes backup, which is the channel for
+	* a draft left behind by a closed tab: the record reopened *clean*, with a
+	* banner offering to apply changes the user had never walked away from.
+	*/
+	const carryEdit = useCallback(() => {
+		const carried = formex ? getEditHandoffValues({
+			status,
+			dirty: formex.dirty,
+			values: formex.values,
+			touched: formex.touched,
+			storedValues: usedEntity?.values
+		}) : void 0;
+		if (!carried) return;
+		saveEntityToMemoryCache(status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId, carried);
+	}, [
+		formex,
+		status,
+		path,
+		entityId,
+		usedEntity
+	]);
 	const [inspectorTab, setInspectorTab] = useState(null);
 	const [savedCount, setSavedCount] = useState(0);
 	const sideDialogContext = useSideDialogContext();
-	const canCloseAfterSave = layout === "side_panel" || layout === "dialog";
+	/**
+	* Whether the save in flight was asked to dismiss the record afterwards.
+	*
+	* A ref, and for the reason {@link SideDialogs} keeps its own as one: the
+	* flag is raised and the form submitted in a single click handler, and the
+	* `onSaved` that has to act on it was captured before React could re-render.
+	* As state it read one save late — the first "save and close" saved and
+	* stayed open, and the *next* save closed the record.
+	*
+	* The side panel and the dialog use the side-dialog controller's flag,
+	* which their own close path consumes; this one covers the layouts that
+	* close by calling {@link onCloseRequest} instead.
+	*/
+	const pendingCloseRef = useRef(false);
+	const canCloseAfterSave = layout === "side_panel" || layout === "dialog" || layout === "split" && Boolean(onCloseRequest);
 	const recordActions = useRecordActions({
 		collection,
 		path,
@@ -15540,9 +17087,9 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 	const FormViewBuilder = formViewConfig?.Builder ? resolveComponentRef(formViewConfig.Builder) : null;
 	formViewConfig?.includeActions;
 	const entityReadOnlyView = !canEdit && entity ? FormViewBuilder && readOnlyFormContext ? /* @__PURE__ */ jsx("div", {
-		className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", canEdit || !mainViewVisible || selectedSecondaryForm ? "hidden" : ""),
+		className: cls("@container/form flex-1 flex flex-row w-full overflow-y-auto justify-center", canEdit || !mainViewVisible || selectedSecondaryForm ? "hidden" : ""),
 		children: /* @__PURE__ */ jsx("div", {
-			className: "w-full max-w-3xl 2xl:max-w-4xl flex flex-col pt-6 pb-16 px-5 sm:px-8",
+			className: "w-full max-w-3xl @7xl/form:max-w-4xl 2xl:max-w-4xl flex flex-col pt-6 pb-16 px-5 sm:px-8",
 			children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, {
 				fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}),
 				children: /* @__PURE__ */ jsx(FormViewBuilder, {
@@ -15612,13 +17159,17 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 			};
 			onSaved?.(res);
 			formProps?.onSaved?.(res);
+			if (pendingCloseRef.current) {
+				pendingCloseRef.current = false;
+				setTimeout(() => onCloseRequest?.(), 0);
+			}
 		},
 		Builder: resolveComponentRef(selectedSecondaryForm?.Builder)
 	});
 	const subcollectionTabs = subcollections && subcollections.map((subcollection) => {
 		const icon = getIcon(subcollection.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: "text-sm min-w-[90px]",
+			className: cls("h-full data-[state=active]:bg-white dark:data-[state=active]:bg-surface-800", "text-sm min-w-[90px]"),
 			value: subcollection.slug,
 			children: /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -15629,7 +17180,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 	const customViewTabsStart = resolvedEntityViews.filter((view) => view.position === "start").map((view) => {
 		const icon = getIcon(view.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: !view.tabComponent ? "text-sm min-w-[90px]" : void 0,
+			className: cls(ENTITY_VIEW_TAB_CLASS, !view.tabComponent && "text-sm min-w-[90px]"),
 			value: view.key,
 			children: view.tabComponent ?? /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -15640,7 +17191,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 	const customViewTabsEnd = resolvedEntityViews.filter((view) => !view.position || view.position === "end").map((view) => {
 		const icon = getIcon(view.icon, void 0, void 0, "smallest");
 		return /* @__PURE__ */ jsx(Tab, {
-			className: !view.tabComponent ? "text-sm min-w-[90px]" : void 0,
+			className: cls(ENTITY_VIEW_TAB_CLASS, !view.tabComponent && "text-sm min-w-[90px]"),
 			value: view.key,
 			children: view.tabComponent ?? /* @__PURE__ */ jsxs("span", {
 				className: "flex items-center gap-1.5",
@@ -15653,6 +17204,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 		children: /* @__PURE__ */ jsx(IconButton, {
 			size: "small",
 			onClick: () => {
+				carryEdit();
 				const editSuffix = collection.defaultEntityAction === "view" ? "/edit" : "";
 				const entityUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}${editSuffix}`);
 				navigate(`${entityUrl}#full`);
@@ -15665,7 +17217,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 		children: [
 			/* @__PURE__ */ jsx(EntityIdentityBar, {
 				collection,
-				collectionUrl: layout === "full_screen" || layout === "split" ? withViewMode(urlController.buildUrlCollectionPath(path)) : void 0,
+				collectionUrl: layout === "full_screen" || layout === "split" ? withListState(urlController.buildUrlCollectionPath(path)) : void 0,
 				title: displayTitle,
 				entityId: status === "existing" ? entityId : void 0,
 				status,
@@ -15673,15 +17225,25 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 				saving: Boolean(formContext?.isSaving),
 				hasErrors: hasFormErrors,
 				saveDisabled: !canEdit || saveDisabled,
-				onBack: layout === "full_screen" && !onShowList ? () => navigate(withViewMode(urlController.buildUrlCollectionPath(path))) : void 0,
+				onBack: layout === "full_screen" && !onShowList ? () => navigate(withListState(urlController.buildUrlCollectionPath(path))) : void 0,
 				onSave: canEdit && formContext ? () => {
 					sideDialogContext.setPendingClose?.(false);
+					pendingCloseRef.current = false;
 					formContext.submit();
 				} : void 0,
 				onSaveAndClose: canEdit && formContext && canCloseAfterSave ? () => {
+					if (layout === "split") {
+						pendingCloseRef.current = true;
+						Promise.resolve(formContext.submit()).finally(() => {
+							pendingCloseRef.current = false;
+						});
+						return;
+					}
 					sideDialogContext.setPendingClose?.(true);
 					Promise.resolve(formContext.submit()).finally(() => sideDialogContext.setPendingClose?.(false));
 				} : void 0,
+				saveAndClosePlacement: layout === "split" ? "menu" : "button",
+				onClose: onCloseRequest,
 				onDiscard: canEdit && formContext ? () => formContext.formex.resetForm() : void 0,
 				onInspect: includeJsonView ? () => setInspectorTab("json") : void 0,
 				onViewHistory: includeHistoryView ? () => setInspectorTab("history") : void 0,
@@ -15690,8 +17252,11 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 				pluginActions: formPluginActions,
 				leading: /* @__PURE__ */ jsxs(Fragment, { children: [
 					barActionsStart,
-					layout === "split" && /* @__PURE__ */ jsx(SplitListCloseButton, {}),
-					layout === "full_screen" && onShowList && /* @__PURE__ */ jsx(SplitListShowButton, { onClick: onShowList })
+					layout === "split" && /* @__PURE__ */ jsx(SplitListCloseButton, { onBeforeHide: carryEdit }),
+					layout === "full_screen" && onShowList && /* @__PURE__ */ jsx(SplitListShowButton, { onClick: () => {
+						carryEdit();
+						onShowList();
+					} })
 				] }),
 				trailing: /* @__PURE__ */ jsxs(Fragment, { children: [
 					pluginActionsTop,
@@ -15701,14 +17266,15 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 						entityId,
 						values: formContext?.values ?? usedEntity?.values ?? {},
 						status,
-						dirty: Boolean(formContext?.formex?.dirty)
+						dirty: Boolean(formContext?.formex?.dirty),
+						carryEdit
 					})
 				] })
 			}),
 			hasAdditionalViews && /* @__PURE__ */ jsx("div", {
-				className: cls("h-10 shrink-0 flex items-stretch border-b px-2 min-w-0", defaultBorderMixin),
+				className: cls("h-10 shrink-0 flex items-stretch border-b px-2 min-w-0", "bg-surface-50 dark:bg-surface-900", defaultBorderMixin),
 				children: /* @__PURE__ */ jsxs(Tabs, {
-					className: "!w-full",
+					className: "!w-full items-stretch",
 					innerClassName: "h-full",
 					variant: "boxy",
 					value: activeTab,
@@ -15718,6 +17284,7 @@ function EditViewBindingInner({ path, entityId, selectedTab: selectedTabProp, co
 					children: [
 						/* @__PURE__ */ jsx(Tab, {
 							value: "__main_##Q$SC^#S6",
+							className: cls("h-full data-[state=active]:bg-white dark:data-[state=active]:bg-surface-800", "text-sm min-w-[90px]"),
 							children: /* @__PURE__ */ jsxs("span", {
 								className: "flex items-center gap-1.5",
 								children: [getIcon(collection.icon, void 0, void 0, "smallest"), collection.singularName ?? collection.name]
@@ -15880,10 +17447,28 @@ function SidePanelBinding(props) {
 		setBlocked(false);
 		close(true);
 	};
+	/**
+	* The panel's response to a save, and the one place it decides where the
+	* panel goes next.
+	*
+	* Exactly **one** panel navigation is raised here. These branches used to
+	* run independently — a `replace` onto the saved record's address *and* a
+	* close — and because the last navigation is the one that survives, which
+	* of them the user got was settled by statement order rather than by
+	* intent. Closing wins by construction now: moving a panel to a new address
+	* it is about to leave is work whose only effect is to fight the close.
+	*
+	* `props.onUpdate` runs last for the same reason. It belongs to whoever
+	* opened the panel and it is free to navigate — the reference picker's
+	* selects the record and closes the picker — so the opener's intent should
+	* be the final word, not something this panel overwrites on its way out.
+	*/
 	const onUpdate = (params) => {
-		if (props.onUpdate) props.onUpdate(params);
 		setEditInDialog(false);
-		if (params.status !== "existing") sidePanelController.replace({
+		if (sideDialogsController.pendingClose || props.closeOnSave) {
+			sideDialogsController.setPendingClose(false);
+			closeAfterSave();
+		} else if (params.status !== "existing") sidePanelController.replace({
 			path: params.path,
 			entityId: params.entityId,
 			selectedTab: params.selectedTab,
@@ -15891,10 +17476,7 @@ function SidePanelBinding(props) {
 			collection: params.collection
 		});
 		else closeEditView();
-		if (sideDialogsController.pendingClose) {
-			sideDialogsController.setPendingClose(false);
-			closeAfterSave();
-		}
+		props.onUpdate?.(params);
 	};
 	const parentCollectionSlugs = useMemo(() => {
 		return collectionRegistryController.getParentCollectionSlugs(path);
@@ -16060,11 +17642,11 @@ function SidePanelBinding(props) {
 		onSaved: onUpdate,
 		navigateBack: closeEditView,
 		barActionsStart,
-		barActions: ({ status, values, dirty }) => windowControls(allowFullScreen && /* @__PURE__ */ jsx(IconButton, {
+		barActions: ({ carryEdit }) => windowControls(allowFullScreen && /* @__PURE__ */ jsx(IconButton, {
 			className: "self-center",
 			size: "small",
 			onClick: () => {
-				if (dirty || status === "new" || status === "copy") saveEntityToMemoryCache(status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId, values);
+				carryEdit?.();
 				setBlocked(false);
 				setBlockedNavigationMessage(void 0);
 				if (entityId) {
@@ -17695,14 +19277,15 @@ function SelectionTableBindingInternal({ onSingleEntitySelected, onMultipleEntit
 function EntitySelectionDialogActions({ collection, path, onClear, onNewClick }) {
 	const { canCreate } = usePermissions();
 	const largeLayout = useLargeLayout();
+	const { t } = useTranslation();
 	const onClick = onNewClick ? (e) => {
 		e.preventDefault();
 		onNewClick();
 	} : void 0;
-	const addButton = canCreate(collection, path) && onClick && (largeLayout ? /* @__PURE__ */ jsxs(Button, {
+	const addButton = canCreate(collection, path) && onClick && (largeLayout ? /* @__PURE__ */ jsx(Button, {
 		onClick,
 		startIcon: /* @__PURE__ */ jsx(PlusIcon, {}),
-		children: ["Add ", collection.singularName ?? collection.name]
+		children: t("add_specific", { name: collection.singularName ?? collection.name })
 	}) : /* @__PURE__ */ jsx(Button, {
 		onClick,
 		children: /* @__PURE__ */ jsx(PlusIcon, {})
@@ -17924,8 +19507,8 @@ function BlockFieldBinding({ propertyKey, value, error, showError, isSubmitting,
 		addLabel: property.name ? t("add_to_field", { fieldName: property.name }) : t("add_entry"),
 		buildEntry,
 		onInternalIdAdded: setLastAddedId,
-		disabled: isSubmitting || Boolean(property.admin?.disabled),
-		canAddElements: !property.admin?.disabled,
+		disabled: isSubmitting || isDisabled(property),
+		canAddElements: !isDisabled(property),
 		onValueChange: (value) => setFieldValue(propertyKey, value),
 		newDefaultEntry: {
 			[property.oneOf.typeField ?? DEFAULT_ONE_OF_TYPE]: firstOneOfKey,
@@ -18061,7 +19644,8 @@ function DateTimeFieldBinding({ propertyKey, value, setValue, autoFocus, error,
 				required: property.validation?.required,
 				className: showError ? "text-red-500 dark:text-red-500" : "text-text-secondary dark:text-text-secondary-dark",
 				title: property.name ?? propertyKey
-			})
+			}),
+			"aria-label": hideLabel ? property.name ?? propertyKey : void 0
 		})
 	}), /* @__PURE__ */ jsx(FieldHelperText, {
 		includeDescription,
@@ -18218,6 +19802,7 @@ function MapKeyValueRow({ id, fieldKey, value, onFieldKeyChange, onDeleteClick,
 	const { t } = useTranslation();
 	function buildInput(entryValue, fieldKey, type) {
 		if (type === "string" || type === "number") return /* @__PURE__ */ jsx(TextField, {
+			"aria-label": fieldKey ? `${t("value")}: ${fieldKey}` : t("value"),
 			placeholder: "value",
 			value: entryValue,
 			type: type === "number" ? "number" : "text",
@@ -18333,6 +19918,7 @@ function MapKeyValueRow({ id, fieldKey, value, onFieldKeyChange, onDeleteClick,
 				className: "w-[300px] max-w-[30%]",
 				children: /* @__PURE__ */ jsx(TextField, {
 					value: fieldKey,
+					"aria-label": t("key"),
 					placeholder: "key",
 					disabled: disabled || entryValue !== void 0 && entryValue !== null && entryValue !== "",
 					size: "medium",
@@ -18403,6 +19989,7 @@ function ArrayKeyValueRow({ id, index, value, setValue }) {
 	function buildInput(entryValue, type) {
 		if (type === "string" || type === "number") return /* @__PURE__ */ jsx(TextField, {
 			value: entryValue,
+			"aria-label": `Value ${index + 1}`,
 			type: type === "number" ? "number" : "text",
 			size: "medium",
 			onChange: (event) => {
@@ -18523,7 +20110,7 @@ function MapFieldBinding({ propertyKey, value, showError, error, disabled, prope
 	const mapFormView = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", {
 		className: "py-1 flex flex-col space-y-2",
 		children: Object.entries(mapProperties).filter(([_, property]) => !isHidden(property)).map(([entryKey, childProperty], index) => {
-			const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.admin?.disabled);
+			const thisDisabled = isReadOnly(childProperty) || isDisabled(childProperty);
 			return /* @__PURE__ */ jsx("div", {
 				className: "relative",
 				children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, {
@@ -18960,7 +20547,7 @@ function RepeatFieldBinding({ propertyKey, value, error, showError, isSubmitting
 			index
 		}) });
 	};
-	const canAddElements = !property.admin?.disabled && !isSubmitting && !disabled && (property.admin?.canAddElements || property.admin?.canAddElements === void 0);
+	const canAddElements = !isDisabled(property) && !isSubmitting && !disabled && (property.admin?.canAddElements || property.admin?.canAddElements === void 0);
 	const sortable = property.admin?.sortable === void 0 ? true : property.admin.sortable;
 	const arrayContainer = /* @__PURE__ */ jsx(ArrayContainer, {
 		droppableId: propertyKey,
@@ -18968,7 +20555,7 @@ function RepeatFieldBinding({ propertyKey, value, error, showError, isSubmitting
 		value: value ?? [],
 		buildEntry,
 		onInternalIdAdded: setLastAddedId,
-		disabled: isSubmitting || Boolean(property.admin?.disabled),
+		disabled: isSubmitting || isDisabled(property),
 		canAddElements,
 		sortable,
 		newDefaultEntry: getDefaultValueFor(property.of),
@@ -19125,7 +20712,7 @@ var rejectDropClasses = "transition-colors duration-200 ease-[cubic-bezier(0,0,0
 function StorageUploadFieldBinding({ propertyKey, value, setValue, error, showError, autoFocus, minimalistView, property, includeDescription, hideLabel, context, isSubmitting }) {
 	useAuthController();
 	const storageSource = useStorageSource();
-	const disabled = isReadOnly(property) || !!property.admin?.disabled || isSubmitting || context.disabled;
+	const disabled = isReadOnly(property) || isDisabled(property) || isSubmitting || context.disabled;
 	const { internalValue, setInternalValue, onFilesAdded, storage, onFileUploadComplete, storagePathBuilder, multipleFilesSupported, resolvedStorageSource } = useStorageUploadController({
 		entityValues: context.values,
 		entityId: context.entityId,
@@ -19452,6 +21039,7 @@ function TextFieldBinding({ propertyKey, value, setValue, error, showError, disa
 		required: property.validation?.required || property.isId === true,
 		title: property.name ?? propertyKey
 	});
+	const accessibleName = property.name ?? propertyKey;
 	return /* @__PURE__ */ jsxs(Fragment, { children: [
 		/* @__PURE__ */ jsx(PropertyIdCopyTooltip, {
 			propertyKey,
@@ -19467,6 +21055,7 @@ function TextFieldBinding({ propertyKey, value, setValue, error, showError, disa
 						onChange,
 						autoFocus,
 						disabled,
+						"aria-label": accessibleName,
 						className: cls("rounded-md resize-none w-full outline-none text-base bg-transparent min-h-[64px] px-3", label ? "pt-8 pb-2" : "py-2", disabled && "outline-none opacity-50 text-surface-accent-600 dark:text-surface-accent-500", showError && error ? "text-red-500 dark:text-red-600" : "")
 					}),
 					property.admin?.clearable && /* @__PURE__ */ jsx("div", {
@@ -19483,6 +21072,7 @@ function TextFieldBinding({ propertyKey, value, setValue, error, showError, disa
 				onChange,
 				autoFocus,
 				label,
+				"aria-label": label ? void 0 : accessibleName,
 				type: inputType,
 				disabled,
 				endAdornment: property.admin?.clearable && /* @__PURE__ */ jsx(IconButton, {
@@ -19618,6 +21208,7 @@ function VectorFieldBinding({ propertyKey, value, setValue, error, showError, di
 						className: cls("flex flex-col gap-2 p-4 rounded-xl border bg-surface-50/20 dark:bg-surface-800/10", defaultBorderMixin),
 						children: [/* @__PURE__ */ jsx(TextField, {
 							size,
+							"aria-label": `${property.name ?? propertyKey} vector values`,
 							value: textValue,
 							onChange,
 							autoFocus: true,
@@ -19901,6 +21492,7 @@ function BinaryFieldBinding({ propertyKey, value, setValue, error, showError, di
 						className: cls("flex flex-col gap-2 p-4 rounded-xl border", defaultBorderMixin),
 						children: [/* @__PURE__ */ jsx(TextField, {
 							size,
+							"aria-label": `${property.name ?? propertyKey} base64 value`,
 							value: text,
 							onChange,
 							autoFocus: autoFocus ?? true,
@@ -20698,7 +22290,7 @@ function PropertyFieldBindingInternal({ propertyKey, property, context, includeD
 				authController
 			});
 			const readOnly = resolvedProperty ? isReadOnly(resolvedProperty) : true;
-			const disabled = disabledProp || readOnly || Boolean(resolvedProperty?.admin?.disabled) || context.disabled;
+			const disabled = disabledProp || readOnly || (resolvedProperty ? isDisabled(resolvedProperty) : false) || context.disabled;
 			if (resolvedProperty === null || isHidden(resolvedProperty)) return /* @__PURE__ */ jsx(Fragment, {});
 			else if (readOnly) Component = ReadOnlyFieldBinding;
 			else if (resolvedProperty.admin?.Field) {
@@ -21277,96 +22869,6 @@ function LocalChangesMenu({ cachedData, formex, onClearLocalChanges, cacheKey, p
 	})] });
 }
 //#endregion
-//#region src/form/form_utils.ts
-function extractTouchedValues(values, touched) {
-	let acc = {};
-	if (!touched || typeof touched !== "object") return acc;
-	Object.entries(touched).forEach(([key, value]) => {
-		if (value) acc = setIn(acc, key, getIn(values, key));
-	});
-	return acc;
-}
-/**
-* Recursively removes empty plain objects `{}` and empty arrays `[]` from a value tree.
-* This prevents ghost containers created by `setIn` intermediate path construction
-* (e.g. `{ address: {} }` when only `address.city` was touched but value is undefined)
-* from falsely triggering the unsaved local changes indicator.
-*/
-/**
-* Check if a value is semantically empty (null, undefined, or empty string).
-*/
-function isSemanticEmpty(v) {
-	return v === null || v === void 0 || v === "";
-}
-function removeEmptyContainers(obj) {
-	if (Array.isArray(obj)) return obj.map(removeEmptyContainers);
-	if (obj && typeof obj === "object" && Object.getPrototypeOf(obj) === Object.prototype) {
-		const result = {};
-		for (const key of Object.keys(obj)) {
-			const cleaned = removeEmptyContainers(obj[key]);
-			if (cleaned && typeof cleaned === "object" && !Array.isArray(cleaned) && Object.getPrototypeOf(cleaned) === Object.prototype && Object.keys(cleaned).length === 0) continue;
-			result[key] = cleaned;
-		}
-		if (Object.keys(result).length > 0 && Object.values(result).every(isSemanticEmpty)) return {};
-		return result;
-	}
-	return obj;
-}
-function getChanges(source, comparison) {
-	const changes = {};
-	if (!source) return {};
-	if (!comparison) return source;
-	const allKeys = Array.from(/* @__PURE__ */ new Set([...Object.keys(source), ...Object.keys(comparison)]));
-	for (const key of allKeys) {
-		const sourceValue = source[key];
-		const comparisonValue = comparison[key];
-		if (deepEqual(sourceValue, comparisonValue)) continue;
-		const sourceHasKey = source && typeof source === "object" && Object.prototype.hasOwnProperty.call(source, key);
-		if (comparison && typeof comparison === "object" && Object.prototype.hasOwnProperty.call(comparison, key) && !sourceHasKey) changes[key] = void 0;
-		else if (Array.isArray(sourceValue)) {
-			const comparisonArray = Array.isArray(comparisonValue) ? comparisonValue : [];
-			if (sourceValue.length !== comparisonArray.length) {
-				changes[key] = sourceValue;
-				continue;
-			}
-			if (sourceValue.some((item, index) => !deepEqual(item, comparisonArray[index]))) changes[key] = sourceValue;
-		} else if (isObject(sourceValue) && sourceValue && isObject(comparisonValue) && comparisonValue) {
-			const nestedChanges = getChanges(sourceValue, comparisonValue);
-			if (Object.keys(nestedChanges).length > 0) changes[key] = nestedChanges;
-		} else changes[key] = sourceValue;
-	}
-	return changes;
-}
-function getInitialEntityValues(authController, collection, path, status, entity, propertyConfigs) {
-	const properties = collection.properties;
-	if ((status === "existing" || status === "copy") && entity) {
-		let values;
-		if (!collection.alwaysApplyDefaultValues) values = entity.values ?? getDefaultValuesFor(properties);
-		else values = mergeDeep(getDefaultValuesFor(properties), entity.values ?? {});
-		if (status === "copy") {
-			const result = { ...values };
-			for (const [key, property] of Object.entries(properties)) if (property && "isId" in property && property.isId) delete result[key];
-			return result;
-		}
-		return values;
-	} else if (status === "new") return getDefaultValuesFor(properties);
-	else {
-		console.error({
-			status,
-			entity
-		});
-		throw new Error("Form has not been initialised with the correct parameters");
-	}
-}
-function zodToFormErrors(zodError) {
-	let errors = {};
-	for (const issue of zodError.issues) {
-		const path = issue.path.join(".");
-		if (path && !getIn(errors, path)) errors = setIn(errors, path, issue.message);
-	}
-	return errors;
-}
-//#endregion
 //#region src/form/EntityForm.tsx
 /**
 * Headless entity form component.
@@ -21623,7 +23125,7 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 	function isFieldDisabled(property) {
 		const isNew = status === "new" || status === "copy";
 		const isIdAndAuto = (property.type === "string" || property.type === "number") && "isId" in property && typeof property.isId === "string" && property.isId !== "manual";
-		return Boolean(disabledProp || !autoSave && formex.isSubmitting || isReadOnly(property) || Boolean(property.admin?.disabled) || !isNew && "isId" in property && Boolean(property.isId) || isNew && isIdAndAuto);
+		return Boolean(disabledProp || !autoSave && formex.isSubmitting || isReadOnly(property) || isDisabled(property) || !isNew && "isId" in property && Boolean(property.isId) || isNew && isIdAndAuto);
 	}
 	const renderField = (field) => {
 		if (field.additional) {
@@ -21798,7 +23300,7 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 					className: "flex-1 min-w-0 overflow-y-auto flex justify-center items-start",
 					children: /* @__PURE__ */ jsxs("div", {
 						id: `form_${path}`,
-						className: cls("@container/col w-full max-w-3xl 2xl:max-w-4xl flex flex-col", openEntityMode === "dialog" ? "pt-5 pb-8 px-6 sm:px-8" : "pt-6 pb-12 px-5 sm:px-8"),
+						className: cls("@container/col w-full max-w-3xl @7xl/form:max-w-4xl 2xl:max-w-4xl flex flex-col", openEntityMode === "dialog" ? "pt-5 pb-8 px-6 sm:px-8" : "pt-6 pb-12 px-5 sm:px-8"),
 						children: [manualApplyLocalChanges && hasLocalChanges && localChangesCacheKey && /* @__PURE__ */ jsx("div", {
 							className: "flex justify-end mb-3",
 							children: /* @__PURE__ */ jsx(LocalChangesMenu, {
@@ -21886,9 +23388,7 @@ function EntityFormBinding({ path, entityId: entityIdProp, collection, entity, i
 	const localChangesData = useMemo(() => {
 		if (!localChangesDataRaw) return void 0;
 		const openingValues = initialDirtyValues ? mergeDeep(computedInitialValues, initialDirtyValues) : computedInitialValues;
-		const cleaned = removeEmptyContainers(getChanges(localChangesDataRaw, openingValues));
-		if (cleaned && typeof cleaned === "object" && Object.keys(cleaned).length === 0) return;
-		return cleaned;
+		return getUnappliedLocalChanges(localChangesDataRaw, openingValues);
 	}, [
 		localChangesDataRaw,
 		computedInitialValues,
@@ -22939,6 +24439,6 @@ function getFullIdPath(propertyKey, propertyNamespace) {
 	return idToPropertiesPath(propertyNamespace ? `${propertyNamespace}.${propertyKey}` : propertyKey);
 }
 //#endregion
-export { useBuildCollectionRegistryController as $, UrlComponentPreview as $n, CollectionTableBinding as $t, getFieldId as A, ArrayOfReferencesPreview as An, convertFileToJson as At, MapFieldBinding as B, getEntityPreviewKeys as Bn, mergeEntityActions as Bt, removeEmptyContainers as C, MapPropertyPreview as Cn, convertDataToEntity as Ct, getDefaultFieldConfig as D, ArrayEnumPreview as Dn, useImportConfig as Dt, DEFAULT_FIELD_CONFIGS as E, ArrayPropertyEnumPreview as En, getInferenceType as Et, SelectFieldBinding as F, useSidePanel as Fn, FieldCaption as Ft, useSelectionDialog as G, EnumValuesChip as Gn, removeInitialAndTrailingSlashes$1 as Gt, DateTimeFieldBinding as H, getEntityTitlePropertyKeyForEntity as Hn, getCollectionBySlugWithin as Ht, RepeatFieldBinding as I, CollectionRegistryContext as In, useBreadcrumbsController as It, useBuildUrlController as J, SkeletonPropertyComponent as Jn, resolveCollectionPathIds$1 as Jt, SelectionTableBinding as K, StorageThumbnail as Kn, removeInitialSlash as Kt, ReferenceFieldBinding as L, useCollectionRegistryController as Ln, BreadcrumbsProvider as Lt, TextFieldBinding as M, ReferencePreview as Mn, ArrayContainer as Mt, SwitchFieldBinding as N, EntityPreviewBinding as Nn, PropertyConfigBadge as Nt, getDefaultFieldId as O, ArrayOfStorageComponentsPreview as On, ImportSaveInProgress as Ot, StorageUploadFieldBinding as P, SidePanelControllerContext as Pn, SearchIconsView as Pt, useResolvedCollections as Q, renderSkeletonText as Qn, VirtualTableInput$1 as Qt, MultiSelectFieldBinding as R, getUserLabel as Rn, resolveEntityAction as Rt, getInitialEntityValues as S, KeyValuePreview as Sn, DataNewPropertiesMapping as St, PropertyFieldBinding as T, ArrayOfStringsPreview as Tn, processValueMapping as Tt, BlockFieldBinding as U, ArrayPropertyPreview as Un, getCollectionPathsCombinations as Ut, KeyValueFieldBinding as V, getEntityTitlePropertyKey as Vn, addInitialSlash as Vt, ArrayOfReferencesFieldBinding as W, StringPropertyPreview as Wn, getLastSegment$1 as Wt, useTopLevelNavigation as X, renderSkeletonIcon as Xn, resolveViewMode as Xt, useBuildNavigationStateController as Y, renderSkeletonCaptionText as Yn, resolveOpenEntityMode as Yt, useResolvedViews as Z, renderSkeletonImageThumbnail as Zn, useSelectionController as Zt, useCollectionsConfigController as _, PropertyPreview as _n, getResolvedPropertyInPath as _r, CollectionViewActions as _t, namespaceToPropertiesPath as a, NavigationStateContext as an, RecordMeta as ar, useBuildSidePanel as at, extractTouchedValues as b, BooleanPreview as bn, useCollectionEditorDialogsState as bt, buildCollectionGenerationCallback as c, SideDialogsControllerContext as cn, isSelfLabellingProperty as cr, copyEntityAction as ct, fromSerializableCollectionConfigs as d, useClearRestoreValue as dn, getBracketNotation as dr, resetPasswordAction as dt, SelectableTable as en, ImagePreview as er, useHistory as et, fromSerializableProperties as f, ReadOnlyFieldBinding as fn, getDefaultPropertiesOrder as fr, CreationResultDialog as ft, toSerializableProperty as g, ArrayOfMapsPreview as gn, getPropertyInPath$1 as gr, EntityCardBinding as gt, toSerializableProperties as h, FieldHelperText as hn, getPropertiesWithPropertiesOrder as hr, CollectionCardViewBinding as ht, namespaceToPropertiesOrderPath as i, useUrlController as in, FormRail as ir, getEntityViewWidth as it, VectorFieldBinding as j, InlineEntityListPreview as jn, unflattenObject as jt, getFieldConfig as k, RelationPreview as kn, ImportFileUpload as kt, validateCollectionJson as l, SelectableTableContext as ln, spanClass as lr, deleteEntityAction as lt, toSerializableCollectionConfig as m, LabelWithIcon as mn, getIconForWidget as mr, EntityViewBinding as mt, getFullIdPath as n, useAdminContext as nn, EmptyValue as nr, useResolvedNavigationFrom as nt, CollectionGenerationApiError as o, useNavigationStateController as on, FieldBlock as or, EditViewBinding as ot, fromSerializableProperty as p, LabelWithIconAndTooltip as pn, getIconForProperty as pr, DetailViewBinding as pt, SideDialogs as q, StorageThumbnailInternal as qn, removeTrailingSlash$1 as qt, idToPropertiesPath as r, UrlContext as rn, FormSections as rr, buildSidePanelsFromUrl as rt, DEFAULT_COLLECTION_GENERATION_ENDPOINT as s, useSideDialogsController as sn, LABEL_ICON_SIZE as sr, CollectionViewBinding as st, getFullId as t, CollectionRowActions as tn, sanitizeUrl as tr, resolveNavigationFrom as tt, fromSerializableCollectionConfig as u, ArrayCustomShapedFieldBinding as un, PropertyIdCopyTooltip as ur, editEntityAction as ut, EntityFormBinding as v, UserPreview as vn, isReferenceProperty as vr, useCollectionEditorController as vt, zodToFormErrors as w, ArrayOneOfPreview as wn, flattenEntry as wt, getChanges as x, DatePreview as xn, ImportNewPropertyFieldPreview as xt, EntityForm as y, NumberPropertyPreview as yn, isRelationProperty as yr, ConfigControllerProvider as yt, MarkdownEditorFieldBinding as z, useResolvedUser as zn, resolveEntityView as zt };
+export { getEntityViewWidth as $, SkeletonPropertyComponent as $n, resolveCollectionPathIds$1 as $t, SelectFieldBinding as A, ArrayOfStringsPreview as An, saveImportedEntities as At, useSelectionDialog as B, useSidePanel as Bn, FieldCaption as Bt, getDefaultFieldId as C, UserPreview as Cn, isReferenceProperty as Cr, convertDataToEntity as Ct, TextFieldBinding as D, KeyValuePreview as Dn, useImportConfig as Dt, VectorFieldBinding as E, DatePreview as En, getInferenceType as Et, MapFieldBinding as F, ArrayOfReferencesPreview as Fn, parseCsvToObjects as Ft, useTopLevelNavigation as G, getEntityPreviewKeys as Gn, mergeEntityActions as Gt, SideDialogs as H, useCollectionRegistryController as Hn, BreadcrumbsProvider as Ht, KeyValueFieldBinding as I, InlineEntityListPreview as In, unflattenObject as It, useBuildCollectionRegistryController as J, ArrayPropertyPreview as Jn, getCollectionPathsCombinations as Jt, useResolvedViews as K, getEntityTitlePropertyKey as Kn, addInitialSlash as Kt, DateTimeFieldBinding as L, ReferencePreview as Ln, ArrayContainer as Lt, ReferenceFieldBinding as M, ArrayEnumPreview as Mn, convertFileToJson as Mt, MultiSelectFieldBinding as N, ArrayOfStorageComponentsPreview as Nn, detectCsvDelimiter as Nt, SwitchFieldBinding as O, MapPropertyPreview as On, ImportSaveInProgress as Ot, MarkdownEditorFieldBinding as P, RelationPreview as Pn, parseCsvRows as Pt, buildSidePanelsFromUrl as Q, StorageThumbnailInternal as Qn, removeTrailingSlash$1 as Qt, BlockFieldBinding as R, EntityPreviewBinding as Rn, PropertyConfigBadge as Rt, getDefaultFieldConfig as S, PropertyPreview as Sn, getResolvedPropertyInPath as Sr, DataNewPropertiesMapping as St, getFieldId as T, BooleanPreview as Tn, processValueMapping as Tt, useBuildUrlController as U, getUserLabel as Un, resolveEntityAction as Ut, SelectionTableBinding as V, CollectionRegistryContext as Vn, useBreadcrumbsController as Vt, useBuildNavigationStateController as W, useResolvedUser as Wn, resolveEntityView as Wt, resolveNavigationFrom as X, EnumValuesChip as Xn, removeInitialAndTrailingSlashes$1 as Xt, useHistory as Y, StringPropertyPreview as Yn, getLastSegment$1 as Yt, useResolvedNavigationFrom as Z, StorageThumbnail as Zn, removeInitialSlash as Zt, useCollectionsConfigController as _, ReadOnlyFieldBinding as _n, getDefaultPropertiesOrder as _r, CollectionViewActions as _t, namespaceToPropertiesPath as a, SelectableTable as an, ImagePreview as ar, removeEmptyContainers as at, PropertyFieldBinding as b, FieldHelperText as bn, getPropertiesWithPropertiesOrder as br, useCollectionEditorDialogsState as bt, buildCollectionGenerationCallback as c, UrlContext as cn, FormSections as cr, copyEntityAction as ct, fromSerializableCollectionConfigs as d, useNavigationStateController as dn, FieldBlock as dr, resetPasswordAction as dt, resolveOpenEntityMode as en, renderSkeletonCaptionText as er, useBuildSidePanel as et, fromSerializableProperties as f, useSideDialogsController as fn, LABEL_ICON_SIZE as fr, CreationResultDialog as ft, toSerializableProperty as g, useClearRestoreValue as gn, getBracketNotation as gr, EntityCardBinding as gt, toSerializableProperties as h, ArrayCustomShapedFieldBinding as hn, PropertyIdCopyTooltip as hr, CollectionCardViewBinding as ht, namespaceToPropertiesOrderPath as i, CollectionTableBinding as in, UrlComponentPreview as ir, getInitialEntityValues as it, RepeatFieldBinding as j, ArrayPropertyEnumPreview as jn, ImportFileUpload as jt, StorageUploadFieldBinding as k, ArrayOneOfPreview as kn, IMPORT_BATCH_SIZE as kt, validateCollectionJson as l, useUrlController as ln, FormRail as lr, deleteEntityAction as lt, toSerializableCollectionConfig as m, SelectableTableContext as mn, spanClass as mr, EntityViewBinding as mt, getFullIdPath as n, useSelectionController as nn, renderSkeletonImageThumbnail as nr, extractTouchedValues as nt, CollectionGenerationApiError as o, CollectionRowActions as on, sanitizeUrl as or, zodToFormErrors as ot, fromSerializableProperty as p, SideDialogsControllerContext as pn, isSelfLabellingProperty as pr, DetailViewBinding as pt, useResolvedCollections as q, getEntityTitlePropertyKeyForEntity as qn, getCollectionBySlugWithin as qt, idToPropertiesPath as r, VirtualTableInput$1 as rn, renderSkeletonText as rr, getChanges as rt, DEFAULT_COLLECTION_GENERATION_ENDPOINT as s, useAdminContext as sn, EmptyValue as sr, CollectionViewBinding as st, getFullId as t, resolveViewMode as tn, renderSkeletonIcon as tr, EditViewBinding as tt, fromSerializableCollectionConfig as u, NavigationStateContext as un, RecordMeta as ur, editEntityAction as ut, EntityFormBinding as v, LabelWithIconAndTooltip as vn, getIconForProperty as vr, useCollectionEditorController as vt, getFieldConfig as w, NumberPropertyPreview as wn, isRelationProperty as wr, flattenEntry as wt, DEFAULT_FIELD_CONFIGS as x, ArrayOfMapsPreview as xn, getPropertyInPath$1 as xr, ImportNewPropertyFieldPreview as xt, EntityForm as y, LabelWithIcon as yn, getIconForWidget as yr, ConfigControllerProvider as yt, ArrayOfReferencesFieldBinding as z, SidePanelControllerContext as zn, SearchIconsView as zt };
 
-//# sourceMappingURL=util-DHNXodBo.js.map
+//# sourceMappingURL=util-C-D5yD2n.js.map