camox 0.46.0 → 0.48.0

package/dist/features/preview/components/PageTree.js

@@ -4,6 +4,7 @@ import { cn } from "../../../lib/utils.js";
 import { previewStore, selectionBlockId, selectionForOwner } from "../previewStore.js";
 import { useEditingFrame } from "../editingFrame.js";
 import { PreviewEditingOwnerContext } from "../previewSelection.js";
+import { entityName } from "../entityName.js";
 import { useUpdateBlockPosition } from "./useUpdateBlockPosition.js";
 import { BlockActionsPopover } from "./BlockActionsPopover.js";
 import { usePreviewedPage } from "../CamoxPreview.js";
@@ -228,7 +229,7 @@ const animateLayoutChanges = (args) => {
 	return defaultAnimateLayoutChanges(args);
 };
 const SortableBlock = (t0) => {
-	const $ = c(37);
+	const $ = c(39);
 	const { block } = t0;
 	const [gripPopoverOpen, setGripPopoverOpen] = React.useState(false);
 	let t1;
@@ -291,9 +292,13 @@ const SortableBlock = (t0) => {
 		$[12] = t7;
 	} else t7 = $[12];
 	const gripButton = t7;
-	let t8;
+	const t8 = ctx.shouldShowHover;
+	const t9 = ctx.shouldShowActive;
+	const t10 = ctx.handleBlockMouseEnter;
+	const t11 = ctx.handleBlockMouseLeave;
+	let t12;
 	if ($[13] !== block || $[14] !== gripButton || $[15] !== gripPopoverOpen) {
-		t8 = /* @__PURE__ */ jsx(BlockActionsPopover, {
+		t12 = /* @__PURE__ */ jsx(BlockActionsPopover, {
 			block,
 			open: gripPopoverOpen,
 			onOpenChange: setGripPopoverOpen,
@@ -302,67 +307,72 @@ const SortableBlock = (t0) => {
 		$[13] = block;
 		$[14] = gripButton;
 		$[15] = gripPopoverOpen;
-		$[16] = t8;
-	} else t8 = $[16];
-	const t9 = block.summary || block.type;
-	let t10;
-	if ($[17] !== ctx.toggleSelection || $[18] !== t9) {
-		t10 = /* @__PURE__ */ jsx(BlockTreeItemTrigger, {
-			displayText: t9,
+		$[16] = t12;
+	} else t12 = $[16];
+	let t13;
+	if ($[17] !== block) {
+		t13 = entityName(block, block.type);
+		$[17] = block;
+		$[18] = t13;
+	} else t13 = $[18];
+	let t14;
+	if ($[19] !== ctx.toggleSelection || $[20] !== t13) {
+		t14 = /* @__PURE__ */ jsx(BlockTreeItemTrigger, {
+			displayText: t13,
 			onClick: ctx.toggleSelection
 		});
-		$[17] = ctx.toggleSelection;
-		$[18] = t9;
-		$[19] = t10;
-	} else t10 = $[19];
-	let t11;
-	if ($[20] !== ctx.ellipsisPopoverOpen) {
-		t11 = /* @__PURE__ */ jsx(BlockTreeItemEllipsis, { open: ctx.ellipsisPopoverOpen });
-		$[20] = ctx.ellipsisPopoverOpen;
-		$[21] = t11;
-	} else t11 = $[21];
-	let t12;
-	if ($[22] !== block || $[23] !== ctx.ellipsisPopoverOpen || $[24] !== ctx.setEllipsisPopoverOpen || $[25] !== t11) {
-		t12 = /* @__PURE__ */ jsx(BlockActionsPopover, {
+		$[19] = ctx.toggleSelection;
+		$[20] = t13;
+		$[21] = t14;
+	} else t14 = $[21];
+	let t15;
+	if ($[22] !== ctx.ellipsisPopoverOpen) {
+		t15 = /* @__PURE__ */ jsx(BlockTreeItemEllipsis, { open: ctx.ellipsisPopoverOpen });
+		$[22] = ctx.ellipsisPopoverOpen;
+		$[23] = t15;
+	} else t15 = $[23];
+	let t16;
+	if ($[24] !== block || $[25] !== ctx.ellipsisPopoverOpen || $[26] !== ctx.setEllipsisPopoverOpen || $[27] !== t15) {
+		t16 = /* @__PURE__ */ jsx(BlockActionsPopover, {
 			block,
 			open: ctx.ellipsisPopoverOpen,
 			onOpenChange: ctx.setEllipsisPopoverOpen,
-			children: t11
+			children: t15
 		});
-		$[22] = block;
-		$[23] = ctx.ellipsisPopoverOpen;
-		$[24] = ctx.setEllipsisPopoverOpen;
-		$[25] = t11;
-		$[26] = t12;
-	} else t12 = $[26];
-	let t13;
-	if ($[27] !== ctx.handleBlockMouseEnter || $[28] !== ctx.handleBlockMouseLeave || $[29] !== ctx.shouldShowActive || $[30] !== ctx.shouldShowHover || $[31] !== setNodeRef || $[32] !== style || $[33] !== t10 || $[34] !== t12 || $[35] !== t8) {
-		t13 = /* @__PURE__ */ jsxs(BlockTreeItemHeader, {
+		$[24] = block;
+		$[25] = ctx.ellipsisPopoverOpen;
+		$[26] = ctx.setEllipsisPopoverOpen;
+		$[27] = t15;
+		$[28] = t16;
+	} else t16 = $[28];
+	let t17;
+	if ($[29] !== ctx.handleBlockMouseEnter || $[30] !== ctx.handleBlockMouseLeave || $[31] !== ctx.shouldShowActive || $[32] !== ctx.shouldShowHover || $[33] !== setNodeRef || $[34] !== style || $[35] !== t12 || $[36] !== t14 || $[37] !== t16) {
+		t17 = /* @__PURE__ */ jsxs(BlockTreeItemHeader, {
 			ref: setNodeRef,
 			style,
 			className: "group",
-			shouldShowHover: ctx.shouldShowHover,
-			shouldShowActive: ctx.shouldShowActive,
-			onMouseEnter: ctx.handleBlockMouseEnter,
-			onMouseLeave: ctx.handleBlockMouseLeave,
+			shouldShowHover: t8,
+			shouldShowActive: t9,
+			onMouseEnter: t10,
+			onMouseLeave: t11,
 			children: [
-				t8,
-				t10,
-				t12
+				t12,
+				t14,
+				t16
 			]
 		});
-		$[27] = ctx.handleBlockMouseEnter;
-		$[28] = ctx.handleBlockMouseLeave;
-		$[29] = ctx.shouldShowActive;
-		$[30] = ctx.shouldShowHover;
-		$[31] = setNodeRef;
-		$[32] = style;
-		$[33] = t10;
-		$[34] = t12;
-		$[35] = t8;
-		$[36] = t13;
-	} else t13 = $[36];
-	return t13;
+		$[29] = ctx.handleBlockMouseEnter;
+		$[30] = ctx.handleBlockMouseLeave;
+		$[31] = ctx.shouldShowActive;
+		$[32] = ctx.shouldShowHover;
+		$[33] = setNodeRef;
+		$[34] = style;
+		$[35] = t12;
+		$[36] = t14;
+		$[37] = t16;
+		$[38] = t17;
+	} else t17 = $[38];
+	return t17;
 };
 const LayoutBlockItem = (t0) => {
 	const $ = c(26);
@@ -723,7 +733,7 @@ const PageTree = (t0) => {
 					className: "flex items-center gap-1 px-1 py-2 text-sm",
 					children: [/* @__PURE__ */ jsx(GripVertical, { className: "text-muted-foreground mx-1.5 h-4 w-4" }), /* @__PURE__ */ jsx("span", {
 						className: "truncate",
-						children: activeBlock.summary
+						children: entityName(activeBlock, activeBlock.type)
 					})]
 				})
 			});

package/dist/features/preview/components/PreviewToolbar.js

@@ -14,130 +14,116 @@ import * as Tooltip$1 from "@camox/ui/tooltip";
 import { FloatingToolbar } from "@camox/ui/floating-toolbar";
 
 //#region src/features/preview/components/PreviewToolbar.tsx
-const PreviewToolbar = (t0) => {
-	const $ = c(24);
-	const { onCanvasShownChange } = t0;
+const PreviewToolbar = () => {
+	const $ = c(21);
 	const isCanvasShown = useSelector(previewStore, selectIsCanvasShown);
 	const isToolbarHidden = useSelector(previewStore, _temp);
 	const viewportMode = useSelector(previewStore, _temp2);
 	if (isToolbarHidden) return null;
-	let t1;
-	if ($[0] !== onCanvasShownChange) {
-		t1 = (checked) => {
-			if (onCanvasShownChange) {
-				onCanvasShownChange(checked);
-				return;
-			}
-			previewStore.send({ type: checked ? "showCanvas" : "hideCanvas" });
-		};
-		$[0] = onCanvasShownChange;
-		$[1] = t1;
-	} else t1 = $[1];
-	let t2;
-	if ($[2] !== isCanvasShown || $[3] !== t1) {
-		t2 = /* @__PURE__ */ jsx(Switch, {
+	let t0;
+	if ($[0] !== isCanvasShown) {
+		t0 = /* @__PURE__ */ jsx(Switch, {
 			id: "show-canvas",
 			checked: isCanvasShown,
-			onCheckedChange: t1
+			onCheckedChange: _temp3
 		});
-		$[2] = isCanvasShown;
-		$[3] = t1;
-		$[4] = t2;
-	} else t2 = $[4];
-	let t3;
-	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = /* @__PURE__ */ jsxs(Label, {
+		$[0] = isCanvasShown;
+		$[1] = t0;
+	} else t0 = $[1];
+	let t1;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = /* @__PURE__ */ jsxs(Label, {
 			htmlFor: "show-canvas",
 			className: "flex items-center gap-2",
 			children: ["Show canvas ", formatShortcut(TOGGLE_CANVAS_SHORTCUT)]
 		});
-		$[5] = t3;
-	} else t3 = $[5];
-	let t4;
-	if ($[6] !== t2) {
-		t4 = /* @__PURE__ */ jsxs("div", {
+		$[2] = t1;
+	} else t1 = $[2];
+	let t2;
+	if ($[3] !== t0) {
+		t2 = /* @__PURE__ */ jsxs("div", {
 			className: "flex shrink-0 items-center gap-2 px-2",
 			onPointerEnter: prefetchCanvas,
 			onFocus: prefetchCanvas,
-			children: [t2, t3]
+			children: [t0, t1]
 		});
-		$[6] = t2;
-		$[7] = t4;
-	} else t4 = $[7];
-	const t5 = viewportMode === "full" ? "desktop" : viewportMode;
-	let t6;
-	if ($[8] !== t5) {
-		t6 = /* @__PURE__ */ jsx(DeviceSelector, {
-			value: t5,
+		$[3] = t0;
+		$[4] = t2;
+	} else t2 = $[4];
+	const t3 = viewportMode === "full" ? "desktop" : viewportMode;
+	let t4;
+	if ($[5] !== t3) {
+		t4 = /* @__PURE__ */ jsx(DeviceSelector, {
+			value: t3,
 			desktopLabel: "Full view",
-			onValueChange: _temp3
+			onValueChange: _temp4
 		});
-		$[8] = t5;
-		$[9] = t6;
-	} else t6 = $[9];
-	let t7;
-	if ($[10] !== isCanvasShown) {
-		t7 = /* @__PURE__ */ jsx(Button, {
+		$[5] = t3;
+		$[6] = t4;
+	} else t4 = $[6];
+	let t5;
+	if ($[7] !== isCanvasShown) {
+		t5 = /* @__PURE__ */ jsx(Button, {
 			type: "button",
 			variant: "ghost",
 			size: "icon",
 			disabled: isCanvasShown,
-			onClick: _temp4,
+			onClick: _temp5,
 			"aria-label": "Hide toolbar",
 			className: "text-muted-foreground"
 		});
-		$[10] = isCanvasShown;
+		$[7] = isCanvasShown;
+		$[8] = t5;
+	} else t5 = $[8];
+	let t6;
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+		t6 = /* @__PURE__ */ jsx(X, {});
+		$[9] = t6;
+	} else t6 = $[9];
+	let t7;
+	if ($[10] !== t5) {
+		t7 = /* @__PURE__ */ jsx(Tooltip$1.TooltipTrigger, {
+			render: t5,
+			children: t6
+		});
+		$[10] = t5;
 		$[11] = t7;
 	} else t7 = $[11];
 	let t8;
 	if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
-		t8 = /* @__PURE__ */ jsx(X, {});
+		t8 = /* @__PURE__ */ jsx(Tooltip$1.TooltipContent, { children: "Hide toolbar" });
 		$[12] = t8;
 	} else t8 = $[12];
 	let t9;
 	if ($[13] !== t7) {
-		t9 = /* @__PURE__ */ jsx(Tooltip$1.TooltipTrigger, {
-			render: t7,
-			children: t8
+		t9 = /* @__PURE__ */ jsx("div", {
+			className: "-ml-2 flex items-center gap-2",
+			children: /* @__PURE__ */ jsxs(Tooltip$1.Tooltip, { children: [t7, t8] })
 		});
 		$[13] = t7;
 		$[14] = t9;
 	} else t9 = $[14];
 	let t10;
-	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
-		t10 = /* @__PURE__ */ jsx(Tooltip$1.TooltipContent, { children: "Hide toolbar" });
-		$[15] = t10;
-	} else t10 = $[15];
-	let t11;
-	if ($[16] !== t9) {
-		t11 = /* @__PURE__ */ jsx("div", {
-			className: "-ml-2 flex items-center gap-2",
-			children: /* @__PURE__ */ jsxs(Tooltip$1.Tooltip, { children: [t9, t10] })
-		});
-		$[16] = t9;
-		$[17] = t11;
-	} else t11 = $[17];
-	let t12;
-	if ($[18] !== t11 || $[19] !== t6) {
-		t12 = /* @__PURE__ */ jsxs("div", {
+	if ($[15] !== t4 || $[16] !== t9) {
+		t10 = /* @__PURE__ */ jsxs("div", {
 			className: "flex shrink-0 items-center gap-6 self-stretch",
-			children: [t6, t11]
+			children: [t4, t9]
 		});
-		$[18] = t11;
-		$[19] = t6;
-		$[20] = t12;
-	} else t12 = $[20];
-	let t13;
-	if ($[21] !== t12 || $[22] !== t4) {
-		t13 = /* @__PURE__ */ jsxs(FloatingToolbar, {
+		$[15] = t4;
+		$[16] = t9;
+		$[17] = t10;
+	} else t10 = $[17];
+	let t11;
+	if ($[18] !== t10 || $[19] !== t2) {
+		t11 = /* @__PURE__ */ jsxs(FloatingToolbar, {
 			className: "fixed bottom-2 w-max justify-between gap-6 transition-none",
-			children: [t4, t12]
+			children: [t2, t10]
 		});
-		$[21] = t12;
-		$[22] = t4;
-		$[23] = t13;
-	} else t13 = $[23];
-	return t13;
+		$[18] = t10;
+		$[19] = t2;
+		$[20] = t11;
+	} else t11 = $[20];
+	return t11;
 };
 function _temp(state) {
 	return state.context.isToolbarHidden;
@@ -145,13 +131,16 @@ function _temp(state) {
 function _temp2(state_0) {
 	return state_0.context.viewportMode;
 }
-function _temp3(device) {
+function _temp3(checked) {
+	return previewStore.send({ type: checked ? "showCanvas" : "hideCanvas" });
+}
+function _temp4(device) {
 	return previewStore.send({
 		type: "setViewportMode",
 		mode: device === "desktop" ? "full" : device
 	});
 }
-function _temp4() {
+function _temp5() {
 	return previewStore.send({ type: "hideToolbar" });
 }
 

package/dist/features/preview/components/RecordCard.js

@@ -4,16 +4,17 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/features/preview/components/RecordCard.tsx
 /**
-* A linked collection record: label and collection title.
-* `leading` holds controls before it, such as a drag handle; `actions` holds trailing
+* A linked collection record: its title, its description when it has one, and its collection's
+* title. `leading` holds controls before it, such as a drag handle; `actions` holds trailing
 * controls such as unlink.
 */
 function RecordCard(t0) {
-	const $ = c(15);
-	const { label, collectionTitle, onOpen, leading, actions } = t0;
+	const $ = c(18);
+	const { label, description, collectionTitle, onOpen, leading, actions } = t0;
 	let t1;
 	if ($[0] !== label) {
 		t1 = /* @__PURE__ */ jsx("span", {
+			"data-record-title": true,
 			className: "truncate text-sm font-medium",
 			children: label
 		});
@@ -21,28 +22,43 @@ function RecordCard(t0) {
 		$[1] = t1;
 	} else t1 = $[1];
 	let t2;
-	if ($[2] !== collectionTitle) {
-		t2 = /* @__PURE__ */ jsx("span", {
+	if ($[2] !== description) {
+		t2 = description && /* @__PURE__ */ jsx("span", {
+			"data-record-description": true,
 			className: "text-muted-foreground truncate text-xs",
-			children: collectionTitle
+			children: description
 		});
-		$[2] = collectionTitle;
+		$[2] = description;
 		$[3] = t2;
 	} else t2 = $[3];
 	let t3;
-	if ($[4] !== t1 || $[5] !== t2) {
-		t3 = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("span", {
+	if ($[4] !== collectionTitle) {
+		t3 = /* @__PURE__ */ jsx("span", {
+			className: "text-muted-foreground truncate text-xs",
+			children: collectionTitle
+		});
+		$[4] = collectionTitle;
+		$[5] = t3;
+	} else t3 = $[5];
+	let t4;
+	if ($[6] !== t1 || $[7] !== t2 || $[8] !== t3) {
+		t4 = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("span", {
 			className: "flex min-w-0 flex-1 flex-col gap-0.5",
-			children: [t1, t2]
+			children: [
+				t1,
+				t2,
+				t3
+			]
 		}) });
-		$[4] = t1;
-		$[5] = t2;
-		$[6] = t3;
-	} else t3 = $[6];
-	const body = t3;
-	let t4;
-	if ($[7] !== body || $[8] !== label || $[9] !== onOpen) {
-		t4 = onOpen ? /* @__PURE__ */ jsx("button", {
+		$[6] = t1;
+		$[7] = t2;
+		$[8] = t3;
+		$[9] = t4;
+	} else t4 = $[9];
+	const body = t4;
+	let t5;
+	if ($[10] !== body || $[11] !== label || $[12] !== onOpen) {
+		t5 = onOpen ? /* @__PURE__ */ jsx("button", {
 			type: "button",
 			"aria-label": `Open ${label}`,
 			className: "flex min-w-0 flex-1 items-center gap-2 rounded-sm p-1 text-left",
@@ -52,28 +68,28 @@ function RecordCard(t0) {
 			className: "flex min-w-0 flex-1 items-center gap-2 p-1",
 			children: body
 		});
-		$[7] = body;
-		$[8] = label;
-		$[9] = onOpen;
-		$[10] = t4;
-	} else t4 = $[10];
-	let t5;
-	if ($[11] !== actions || $[12] !== leading || $[13] !== t4) {
-		t5 = /* @__PURE__ */ jsxs("div", {
+		$[10] = body;
+		$[11] = label;
+		$[12] = onOpen;
+		$[13] = t5;
+	} else t5 = $[13];
+	let t6;
+	if ($[14] !== actions || $[15] !== leading || $[16] !== t5) {
+		t6 = /* @__PURE__ */ jsxs("div", {
 			"data-record-card": true,
 			className: "text-foreground hover:bg-accent/75 flex w-full min-w-0 items-center gap-1 overflow-hidden rounded-lg border-2 p-1",
 			children: [
 				leading,
-				t4,
+				t5,
 				actions
 			]
 		});
-		$[11] = actions;
-		$[12] = leading;
-		$[13] = t4;
-		$[14] = t5;
-	} else t5 = $[14];
-	return t5;
+		$[14] = actions;
+		$[15] = leading;
+		$[16] = t5;
+		$[17] = t6;
+	} else t6 = $[17];
+	return t6;
 }
 
 //#endregion

package/dist/features/preview/components/RecordCombobox.js

@@ -8,7 +8,7 @@ import { Combobox } from "@base-ui/react/combobox";
 
 //#region src/features/preview/components/RecordCombobox.tsx
 /**
-* Picks a collection record by label. The footer action (e.g. Create item) receives the
+* Picks a collection record by title, each shown with its description. The footer action (e.g. Create item) receives the
 * current search text so it can prefill a new record.
 */
 function RecordCombobox(t0) {
@@ -158,9 +158,16 @@ function _temp4(record_3) {
 	return /* @__PURE__ */ jsx(Combobox.Item, {
 		value: record_3,
 		className: "data-highlighted:bg-accent data-highlighted:text-accent-foreground flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none",
-		children: /* @__PURE__ */ jsx("span", {
-			className: "min-w-0 flex-1 truncate",
-			children: record_3.label
+		children: /* @__PURE__ */ jsxs("span", {
+			className: "flex min-w-0 flex-1 flex-col",
+			children: [/* @__PURE__ */ jsx("span", {
+				"data-record-title": true,
+				className: "truncate",
+				children: record_3.title
+			}), record_3.description && /* @__PURE__ */ jsx("span", {
+				className: "text-muted-foreground truncate text-xs",
+				children: record_3.description
+			})]
 		})
 	}, record_3.id);
 }
@@ -171,7 +178,7 @@ function _temp2(record_0) {
 	return record_0.id;
 }
 function _temp(record) {
-	return record.label;
+	return record.title;
 }
 
 //#endregion

package/dist/features/preview/components/ReferenceFieldEditor.js

@@ -1,6 +1,7 @@
 import { useProjectUuid } from "../../../lib/auth.js";
 import { useCamoxApp } from "../../provider/components/CamoxAppContext.js";
 import { reads, useReadQuery } from "../../../lib/studio-reads.js";
+import { titleField } from "../../../core/recordItem.js";
 import { useCollectionItemSheet } from "../../content/CollectionItemSheetContext.js";
 import { referencePickerFocus, useReferencePickerFocusRequested } from "../referencePickerFocus.js";
 import { DrillRow } from "./DrillRow.js";
@@ -31,7 +32,7 @@ function ReferenceFieldEditor({ collectionId, fieldId, value, required = false,
 	const selectedId = typeof value === "string" && value ? value : null;
 	const selected = records.data?.find((option) => option.id === value);
 	const hydrated = record?.id === selectedId ? record : null;
-	const selectedLabel = selected?.label ?? hydrated?.label ?? "Unavailable item";
+	const selectedLabel = selected?.title ?? hydrated?.title ?? "Unavailable item";
 	const [pickerOpen, setPickerOpen] = React.useState(false);
 	const focusRequested = useReferencePickerFocusRequested(drill ? void 0 : fieldId);
 	const pickerReady = !selectedId && records.isSuccess && !saving;
@@ -84,6 +85,7 @@ function ReferenceFieldEditor({ collectionId, fieldId, value, required = false,
 		children: [
 			selectedId && /* @__PURE__ */ jsx(RecordCard, {
 				label: selectedLabel,
+				description: selected ? selected.description : hydrated?.description,
 				collectionTitle,
 				onOpen: onOpenRecord ? () => onOpenRecord(selectedId) : void 0,
 				actions: /* @__PURE__ */ jsxs(Tooltip, { children: [/* @__PURE__ */ jsx(TooltipTrigger, {
@@ -112,7 +114,7 @@ function ReferenceFieldEditor({ collectionId, fieldId, value, required = false,
 					label: "Create item",
 					onSelect: (search) => sheet.open({
 						collectionId,
-						initialContent: collection && search.trim() ? { [collection._internal.label]: search } : void 0,
+						initialContent: collection && search.trim() && titleField(collection._internal.toTitle) ? { [titleField(collection._internal.toTitle)]: search } : void 0,
 						onSaved: (created) => save(created.id)
 					})
 				} : void 0