camox 0.47.0 → 0.48.0

package/dist/features/content/ContentCollection.js

@@ -177,9 +177,15 @@ const ContentCollection = (t0) => {
 						itemId: record.id
 					}),
 					className: "focus-visible:bg-accent flex min-w-0 flex-1 items-center gap-2 px-4 py-3 text-sm",
-					children: [/* @__PURE__ */ jsx("span", {
-						className: "truncate",
-						children: record.label || "Untitled item"
+					children: [/* @__PURE__ */ jsxs("span", {
+						className: "flex min-w-0 flex-col items-start text-left",
+						children: [/* @__PURE__ */ jsx("span", {
+							className: "max-w-full truncate",
+							children: record.title || "Untitled item"
+						}), record.description && /* @__PURE__ */ jsx("span", {
+							className: "text-muted-foreground max-w-full truncate text-xs",
+							children: record.description
+						})]
 					}), record.duplicatePageValue && /* @__PURE__ */ jsx("span", {
 						className: "text-destructive shrink-0 text-xs",
 						title: "Another item's page has the same URL. Change one of them before publishing.",
@@ -189,7 +195,7 @@ const ContentCollection = (t0) => {
 					projectUuid,
 					collectionId: collection.collectionId,
 					id: record.id,
-					label: record.label,
+					label: record.title,
 					compact: true
 				})]
 			}, record.id)), /* @__PURE__ */ jsx("li", {
@@ -244,9 +250,9 @@ const ContentCollection = (t0) => {
 	return t14;
 };
 const fieldLabel = (name, schema) => schema.title ?? name.replace(/([A-Z])/g, " $1").replace(/^./, (letter) => letter.toUpperCase());
-function CollectionItemForm({ contentSchema, label, projectUuid, collectionId, record, initialContent, onSaved }) {
+function CollectionItemForm({ contentSchema, toTitle, projectUuid, collectionId, record, initialContent, onSaved }) {
 	const studioCache = useStudioCache();
-	const fields = collectionFormFields(contentSchema, label);
+	const fields = collectionFormFields(contentSchema, toTitle);
 	const [savedRecord, setSavedRecord] = useState(record);
 	const [error, setError] = useState(null);
 	const create = useMutation(collectionMutations.create());
@@ -502,7 +508,7 @@ const ContentCollectionItemEditor = (t0) => {
 	if ($[20] !== collectionId || $[21] !== definition || $[22] !== initialContent || $[23] !== itemId || $[24] !== onSaved || $[25] !== projectUuid || $[26] !== recordQuery) {
 		t9 = definition && (!itemId || recordQuery.data) && /* @__PURE__ */ jsx(CollectionItemForm, {
 			contentSchema: definition.contentSchema,
-			label: definition.label,
+			toTitle: definition.toTitle,
 			projectUuid,
 			collectionId,
 			record: itemId ? recordQuery.data : void 0,

package/dist/features/content/collection-form.js

@@ -1,8 +1,12 @@
 import { isLexicalState, lexicalStateToPlainText } from "../../core/lib/lexicalState.js";
+import { titleField } from "../../core/recordItem.js";
 
 //#region src/features/content/collection-form.ts
-function collectionFormFields(contentSchema, label) {
-	return Object.entries(contentSchema.properties).sort(([a], [b]) => Number(b === label) - Number(a === label));
+/** The form's fields, the one the record's title starts with first. */
+function collectionFormFields(contentSchema, toTitle) {
+	const schema = contentSchema;
+	const first = titleField(toTitle);
+	return Object.entries(schema.properties).sort(([a], [b]) => Number(b === first) - Number(a === first));
 }
 function collectionFormDefaults(fields, content = {}) {
 	return Object.fromEntries(fields.map(([name, schema]) => {

package/dist/features/content/components/MissingFromLocale.js

@@ -144,7 +144,7 @@ function missingGroups(missing, collections) {
 				entity: "record",
 				id: record.id,
 				collectionId: record.collectionId,
-				name: record.label || "Untitled item"
+				name: record.title || "Untitled item"
 			}))
 		});
 	}

package/dist/features/og/pageImage.js

@@ -0,0 +1,89 @@
+import { c } from "react/compiler-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
+
+//#region src/features/og/pageImage.tsx
+/** The size every page image renders at, which the page head states. */
+const PAGE_IMAGE_SIZE = {
+	width: 1200,
+	height: 630
+};
+/**
+* A page's image, chosen in order: the editor's custom image, else `/og` for the page, which
+* renders its layout's `toImage` or Camox's default image. `/og` names the page by its path,
+* with its locale's prefix.
+*/
+function pageImageUrl({ origin, path, customImageUrl }) {
+	return customImageUrl || `${origin}/og?${new URLSearchParams({ path }).toString()}`;
+}
+/** Camox's default image, for a page whose layout has no `toImage`: its title and project. */
+function DefaultPageImage(t0) {
+	const $ = c(9);
+	const { page, project } = t0;
+	let t1;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = {
+			display: "flex",
+			flexDirection: "column",
+			justifyContent: "center",
+			width: "100%",
+			height: "100%",
+			backgroundColor: "#09090b",
+			padding: "60px 80px"
+		};
+		$[0] = t1;
+	} else t1 = $[0];
+	let t2;
+	if ($[1] !== project.name) {
+		t2 = project.name && /* @__PURE__ */ jsx("div", {
+			style: {
+				fontSize: 24,
+				color: "#a1a1aa",
+				marginBottom: 24,
+				textTransform: "uppercase",
+				letterSpacing: "0.1em"
+			},
+			children: project.name
+		});
+		$[1] = project.name;
+		$[2] = t2;
+	} else t2 = $[2];
+	let t3;
+	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
+		t3 = {
+			fontSize: 64,
+			fontWeight: 700,
+			color: "#fafafa",
+			lineHeight: 1.2
+		};
+		$[3] = t3;
+	} else t3 = $[3];
+	let t4;
+	if ($[4] !== page.title) {
+		t4 = /* @__PURE__ */ jsx("div", {
+			style: t3,
+			children: page.title
+		});
+		$[4] = page.title;
+		$[5] = t4;
+	} else t4 = $[5];
+	let t5;
+	if ($[6] !== t2 || $[7] !== t4) {
+		t5 = /* @__PURE__ */ jsxs("div", {
+			style: t1,
+			children: [t2, t4]
+		});
+		$[6] = t2;
+		$[7] = t4;
+		$[8] = t5;
+	} else t5 = $[8];
+	return t5;
+}
+/** Renders a page image as a PNG response. Server only. */
+async function renderPageImage(element) {
+	if (import.meta.env?.SSR === false) throw new Error("OG images can only be rendered on the server.");
+	const { ImageResponse } = await import("camox/_internal/imageResponse");
+	return new ImageResponse(element, PAGE_IMAGE_SIZE);
+}
+
+//#endregion
+export { DefaultPageImage, PAGE_IMAGE_SIZE, pageImageUrl, renderPageImage };

package/dist/features/page/CuratedPageContent.js

@@ -1,8 +1,10 @@
 import { useProjectUuid } from "../../lib/auth.js";
+import { useViewLocale } from "../../lib/view-locale-context.js";
 import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
 import { NormalizedDataProvider, usePageBlocks } from "../../lib/normalized-data.js";
 import { reads, useRead } from "../../lib/studio-reads.js";
 import { BlockErrorBoundary } from "../preview/components/BlockErrorBoundary.js";
+import { curatedLayoutContext } from "../../core/layoutContext.js";
 import { useLocalePath } from "../../lib/view-locale.js";
 import { SharedLayoutContent } from "./SharedLayoutContent.js";
 import { c } from "react/compiler-runtime";
@@ -84,7 +86,7 @@ function PageBlock(t0) {
 }
 /** A curated page as visitors see it, without editing. */
 function CuratedPageContent() {
-	const $ = c(19);
+	const $ = c(23);
 	const pathname = useLocalePath();
 	const projectUuid = useProjectUuid();
 	const camoxApp = useCamoxApp();
@@ -108,49 +110,60 @@ function CuratedPageContent() {
 		$[5] = t1;
 	} else t1 = $[5];
 	const layout = t1;
+	const { locale } = useViewLocale();
 	let t2;
-	if ($[6] !== pageBlocks) {
-		t2 = pageBlocks.map(_temp);
-		$[6] = pageBlocks;
-		$[7] = t2;
-	} else t2 = $[7];
-	const pageBlocksContent = t2;
+	if ($[6] !== locale || $[7] !== pageData) {
+		t2 = curatedLayoutContext(pageData, locale);
+		$[6] = locale;
+		$[7] = pageData;
+		$[8] = t2;
+	} else t2 = $[8];
+	const context = t2;
+	let t3;
+	if ($[9] !== pageBlocks) {
+		t3 = pageBlocks.map(_temp);
+		$[9] = pageBlocks;
+		$[10] = t3;
+	} else t3 = $[10];
+	const pageBlocksContent = t3;
 	if (!layout) {
-		let t3;
-		if ($[8] !== pageBlocksContent) {
-			t3 = /* @__PURE__ */ jsx("main", {
+		let t4;
+		if ($[11] !== pageBlocksContent) {
+			t4 = /* @__PURE__ */ jsx("main", {
 				className: "flex min-h-screen flex-col",
 				children: pageBlocksContent
 			});
-			$[8] = pageBlocksContent;
-			$[9] = t3;
-		} else t3 = $[9];
-		return t3;
+			$[11] = pageBlocksContent;
+			$[12] = t4;
+		} else t4 = $[12];
+		return t4;
 	}
-	let t3;
-	if ($[10] !== afterBlocks || $[11] !== beforeBlocks) {
-		t3 = [...beforeBlocks, ...afterBlocks];
-		$[10] = afterBlocks;
-		$[11] = beforeBlocks;
-		$[12] = t3;
-	} else t3 = $[12];
 	let t4;
-	if ($[13] !== layout || $[14] !== layoutFiles || $[15] !== layoutItems || $[16] !== pageBlocksContent || $[17] !== t3) {
-		t4 = /* @__PURE__ */ jsx(SharedLayoutContent, {
+	if ($[13] !== afterBlocks || $[14] !== beforeBlocks) {
+		t4 = [...beforeBlocks, ...afterBlocks];
+		$[13] = afterBlocks;
+		$[14] = beforeBlocks;
+		$[15] = t4;
+	} else t4 = $[15];
+	let t5;
+	if ($[16] !== context || $[17] !== layout || $[18] !== layoutFiles || $[19] !== layoutItems || $[20] !== pageBlocksContent || $[21] !== t4) {
+		t5 = /* @__PURE__ */ jsx(SharedLayoutContent, {
 			layout,
-			blocks: t3,
+			context,
+			blocks: t4,
 			files: layoutFiles,
 			repeatableItems: layoutItems,
 			children: pageBlocksContent
 		});
-		$[13] = layout;
-		$[14] = layoutFiles;
-		$[15] = layoutItems;
-		$[16] = pageBlocksContent;
-		$[17] = t3;
-		$[18] = t4;
-	} else t4 = $[18];
-	return t4;
+		$[16] = context;
+		$[17] = layout;
+		$[18] = layoutFiles;
+		$[19] = layoutItems;
+		$[20] = pageBlocksContent;
+		$[21] = t4;
+		$[22] = t5;
+	} else t5 = $[22];
+	return t5;
 }
 function _temp(block) {
 	return /* @__PURE__ */ jsx(BlockErrorBoundary, {

package/dist/features/page/DerivedPageContent.js

@@ -1,4 +1,7 @@
+import { useViewLocale } from "../../lib/view-locale-context.js";
 import { usePageBlocks } from "../../lib/normalized-data.js";
+import { asCollectionItem, recordPageValues } from "../../core/recordItem.js";
+import { buildLayoutContext } from "../../core/layoutContext.js";
 import { SharedLayoutContent } from "./SharedLayoutContent.js";
 import { c } from "react/compiler-runtime";
 import { jsx } from "react/jsx-runtime";
@@ -6,7 +9,7 @@ import { jsx } from "react/jsx-runtime";
 //#region src/features/page/DerivedPageContent.tsx
 const EMPTY_PAGE = { blockIds: [] };
 function DerivedPageContent(t0) {
-	const $ = c(14);
+	const $ = c(18);
 	const { camoxApp, derived } = t0;
 	let t1;
 	if ($[0] !== derived.layout) {
@@ -18,38 +21,62 @@ function DerivedPageContent(t0) {
 		$[1] = t1;
 	} else t1 = $[1];
 	const { beforeBlocks, afterBlocks, layoutFiles, layoutItems } = usePageBlocks(t1);
+	const { locale } = useViewLocale();
+	let layout;
+	let result;
 	let t2;
-	if ($[2] !== camoxApp || $[3] !== derived.layoutId) {
-		t2 = camoxApp.getLayoutById(derived.layoutId);
+	if ($[2] !== camoxApp || $[3] !== derived || $[4] !== locale) {
+		layout = camoxApp.getLayoutById(derived.layoutId);
+		if (!layout) throw new Error(`Unknown derived layout: ${derived.layoutId}`);
+		const { page, result: t3 } = derived;
+		result = t3;
+		const record = asCollectionItem(result);
+		const collection = record && camoxApp.getCollectionById(record.collectionId);
+		t2 = buildLayoutContext(layout._internal, {
+			path: page?.path ?? "",
+			locale: locale.tag,
+			projectName: page?.projectName ?? "",
+			data: result?.data,
+			params: page?.params,
+			record: record && collection ? recordPageValues(collection, record) : void 0
+		});
 		$[2] = camoxApp;
-		$[3] = derived.layoutId;
-		$[4] = t2;
-	} else t2 = $[4];
-	const layout = t2;
-	if (!layout) throw new Error(`Unknown derived layout: ${derived.layoutId}`);
+		$[3] = derived;
+		$[4] = locale;
+		$[5] = layout;
+		$[6] = result;
+		$[7] = t2;
+	} else {
+		layout = $[5];
+		result = $[6];
+		t2 = $[7];
+	}
+	const context = t2;
 	let t3;
-	if ($[5] !== afterBlocks || $[6] !== beforeBlocks) {
+	if ($[8] !== afterBlocks || $[9] !== beforeBlocks) {
 		t3 = [...beforeBlocks, ...afterBlocks];
-		$[5] = afterBlocks;
-		$[6] = beforeBlocks;
-		$[7] = t3;
-	} else t3 = $[7];
+		$[8] = afterBlocks;
+		$[9] = beforeBlocks;
+		$[10] = t3;
+	} else t3 = $[10];
 	let t4;
-	if ($[8] !== derived.result || $[9] !== layout || $[10] !== layoutFiles || $[11] !== layoutItems || $[12] !== t3) {
+	if ($[11] !== context || $[12] !== layout || $[13] !== layoutFiles || $[14] !== layoutItems || $[15] !== result || $[16] !== t3) {
 		t4 = /* @__PURE__ */ jsx(SharedLayoutContent, {
 			layout,
-			result: derived.result,
+			context,
+			result,
 			blocks: t3,
 			files: layoutFiles,
 			repeatableItems: layoutItems
 		});
-		$[8] = derived.result;
-		$[9] = layout;
-		$[10] = layoutFiles;
-		$[11] = layoutItems;
-		$[12] = t3;
-		$[13] = t4;
-	} else t4 = $[13];
+		$[11] = context;
+		$[12] = layout;
+		$[13] = layoutFiles;
+		$[14] = layoutItems;
+		$[15] = result;
+		$[16] = t3;
+		$[17] = t4;
+	} else t4 = $[17];
 	return t4;
 }
 

package/dist/features/page/SharedLayoutContent.js

@@ -6,8 +6,8 @@ import { jsx } from "react/jsx-runtime";
 //#region src/features/page/SharedLayoutContent.tsx
 /** Shared before/after rendering for both curated and data-derived pages. */
 function SharedLayoutContent(t0) {
-	const $ = c(15);
-	const { layout, blocks, files, repeatableItems, result, children } = t0;
+	const $ = c(16);
+	const { layout, context, blocks, files, repeatableItems, result, children } = t0;
 	let result_0;
 	if ($[0] !== blocks) {
 		result_0 = {};
@@ -22,41 +22,45 @@ function SharedLayoutContent(t0) {
 		$[1] = result_0;
 	} else result_0 = $[1];
 	const layoutBlocks = result_0;
-	const Component = layout._internal.component;
+	const ToReact = layout._internal.toReact;
 	let t1;
-	if ($[2] !== Component || $[3] !== children) {
-		t1 = /* @__PURE__ */ jsx(Component, { children });
-		$[2] = Component;
+	if ($[2] !== ToReact || $[3] !== children || $[4] !== context) {
+		t1 = /* @__PURE__ */ jsx(ToReact, {
+			...context,
+			children
+		});
+		$[2] = ToReact;
 		$[3] = children;
-		$[4] = t1;
-	} else t1 = $[4];
+		$[4] = context;
+		$[5] = t1;
+	} else t1 = $[5];
 	let t2;
-	if ($[5] !== layout._internal.Provider || $[6] !== layoutBlocks || $[7] !== result || $[8] !== t1) {
+	if ($[6] !== layout._internal.Provider || $[7] !== layoutBlocks || $[8] !== result || $[9] !== t1) {
 		t2 = /* @__PURE__ */ jsx(layout._internal.Provider, {
 			layoutBlocks,
 			result,
 			children: t1
 		});
-		$[5] = layout._internal.Provider;
-		$[6] = layoutBlocks;
-		$[7] = result;
-		$[8] = t1;
-		$[9] = t2;
-	} else t2 = $[9];
+		$[6] = layout._internal.Provider;
+		$[7] = layoutBlocks;
+		$[8] = result;
+		$[9] = t1;
+		$[10] = t2;
+	} else t2 = $[10];
 	let t3;
-	if ($[10] !== blocks || $[11] !== files || $[12] !== repeatableItems || $[13] !== t2) {
+	if ($[11] !== blocks || $[12] !== files || $[13] !== repeatableItems || $[14] !== t2) {
 		t3 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
 			files,
 			repeatableItems,
 			blocks,
 			children: t2
 		});
-		$[10] = blocks;
-		$[11] = files;
-		$[12] = repeatableItems;
-		$[13] = t2;
-		$[14] = t3;
-	} else t3 = $[14];
+		$[11] = blocks;
+		$[12] = files;
+		$[13] = repeatableItems;
+		$[14] = t2;
+		$[15] = t3;
+	} else t3 = $[15];
 	return t3;
 }
 

package/dist/features/preview/CamoxPreview.js

@@ -8,6 +8,7 @@ import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
 import { NormalizedDataProvider, usePageBlocks } from "../../lib/normalized-data.js";
 import { reads, useRead, useStudioCache } from "../../lib/studio-reads.js";
 import { BlockErrorBoundary } from "./components/BlockErrorBoundary.js";
+import { curatedLayoutContext } from "../../core/layoutContext.js";
 import { CollectionItemSheetProvider } from "../content/CollectionItemSheetContext.js";
 import { cn } from "../../lib/utils.js";
 import { ContentCollectionItemSheet } from "../content/ContentCollection.js";
@@ -164,10 +165,11 @@ const BlockRenderer = (t0) => {
 	return t13;
 };
 const PageContent = () => {
-	const $ = c(30);
+	const $ = c(34);
 	const pageData = usePreviewedPage();
 	const { pageBlocks, beforeBlocks, afterBlocks, layoutFiles, layoutItems } = usePageBlocks(pageData);
 	const camoxApp = useCamoxApp();
+	const { locale } = useViewLocale();
 	let layout;
 	let layoutBlocksMap;
 	let t0;
@@ -228,7 +230,7 @@ const PageContent = () => {
 	} else t1 = $[12];
 	const pageBlocksContent = t1;
 	if (layout && layoutBlocksMap) {
-		const LayoutComponent = layout._internal.component;
+		const ToReact = layout._internal.toReact;
 		let t2;
 		if ($[13] !== afterBlocks || $[14] !== beforeBlocks) {
 			t2 = [...beforeBlocks, ...afterBlocks];
@@ -236,49 +238,61 @@ const PageContent = () => {
 			$[14] = beforeBlocks;
 			$[15] = t2;
 		} else t2 = $[15];
+		const T0 = layout._internal.Provider;
 		let t3;
-		if ($[16] !== LayoutComponent || $[17] !== pageBlocksContent) {
-			t3 = /* @__PURE__ */ jsx(LayoutComponent, { children: pageBlocksContent });
-			$[16] = LayoutComponent;
-			$[17] = pageBlocksContent;
+		if ($[16] !== locale || $[17] !== pageData) {
+			t3 = curatedLayoutContext(pageData, locale);
+			$[16] = locale;
+			$[17] = pageData;
 			$[18] = t3;
 		} else t3 = $[18];
 		let t4;
-		if ($[19] !== layout._internal.Provider || $[20] !== layoutBlocksMap || $[21] !== t3) {
-			t4 = /* @__PURE__ */ jsx(layout._internal.Provider, {
-				layoutBlocks: layoutBlocksMap,
-				children: t3
+		if ($[19] !== ToReact || $[20] !== pageBlocksContent || $[21] !== t3) {
+			t4 = /* @__PURE__ */ jsx(ToReact, {
+				...t3,
+				children: pageBlocksContent
 			});
-			$[19] = layout._internal.Provider;
-			$[20] = layoutBlocksMap;
+			$[19] = ToReact;
+			$[20] = pageBlocksContent;
 			$[21] = t3;
 			$[22] = t4;
 		} else t4 = $[22];
 		let t5;
-		if ($[23] !== layoutFiles || $[24] !== layoutItems || $[25] !== t2 || $[26] !== t4) {
-			t5 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
+		if ($[23] !== layout._internal.Provider || $[24] !== layoutBlocksMap || $[25] !== t4) {
+			t5 = /* @__PURE__ */ jsx(T0, {
+				layoutBlocks: layoutBlocksMap,
+				children: t4
+			});
+			$[23] = layout._internal.Provider;
+			$[24] = layoutBlocksMap;
+			$[25] = t4;
+			$[26] = t5;
+		} else t5 = $[26];
+		let t6;
+		if ($[27] !== layoutFiles || $[28] !== layoutItems || $[29] !== t2 || $[30] !== t5) {
+			t6 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
 				files: layoutFiles,
 				repeatableItems: layoutItems,
 				blocks: t2,
-				children: t4
+				children: t5
 			});
-			$[23] = layoutFiles;
-			$[24] = layoutItems;
-			$[25] = t2;
-			$[26] = t4;
-			$[27] = t5;
-		} else t5 = $[27];
-		return t5;
+			$[27] = layoutFiles;
+			$[28] = layoutItems;
+			$[29] = t2;
+			$[30] = t5;
+			$[31] = t6;
+		} else t6 = $[31];
+		return t6;
 	}
 	let t2;
-	if ($[28] !== pageBlocksContent) {
+	if ($[32] !== pageBlocksContent) {
 		t2 = /* @__PURE__ */ jsx("main", {
 			className: "flex min-h-screen flex-col",
 			children: pageBlocksContent
 		});
-		$[28] = pageBlocksContent;
-		$[29] = t2;
-	} else t2 = $[29];
+		$[32] = pageBlocksContent;
+		$[33] = t2;
+	} else t2 = $[33];
 	return t2;
 };
 /**

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

@@ -76,6 +76,7 @@ const AddBlockSheet = ({ focusCreatedBlock = true }) => {
 				settings: variables.settings ?? null,
 				slot: null,
 				summary: "",
+				title: "",
 				position,
 				createdAt: now,
 				updatedAt: now

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

@@ -4,6 +4,7 @@ import { usePageBlocks } from "../../../lib/normalized-data.js";
 import { formatShortcut } from "../../../lib/utils.js";
 import { blockMutations, repeatableItemMutations } from "../../../lib/queries.js";
 import { isBlockSelection, previewStore, selectionForPage, selectionItemId } from "../previewStore.js";
+import { entityName } from "../entityName.js";
 import { useUpdateBlockPosition } from "./useUpdateBlockPosition.js";
 import { usePreviewedPage } from "../CamoxPreview.js";
 import { c } from "react/compiler-runtime";
@@ -28,7 +29,7 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 	const handleDeleteBlock = async (block) => {
 		try {
 			await deleteBlock.mutateAsync({ id: block.id });
-			toast.success(`Deleted "${block.summary || block.type}" block`);
+			toast.success(`Deleted "${entityName(block, block.type)}" block`);
 		} catch (error) {
 			console.error("Failed to delete block:", error);
 			toast.error("Could not delete block");
@@ -39,7 +40,7 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 	const handleDuplicateBlock = async (block) => {
 		try {
 			await duplicateBlock.mutateAsync({ id: block.id });
-			toast.success(`Duplicated "${block.summary}" block`);
+			toast.success(`Duplicated "${entityName(block, block.type)}" block`);
 		} catch (error) {
 			console.error("Failed to duplicate block:", error);
 			toast.error("Could not duplicate block");
@@ -209,8 +210,9 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 		open: !!blockToDelete,
 		onOpenChange: (open) => !open && setBlockToDelete(null),
 		children: /* @__PURE__ */ jsxs(AlertDialogContent, { children: [/* @__PURE__ */ jsxs(AlertDialogHeader, { children: [/* @__PURE__ */ jsx(AlertDialogTitle, { children: "Delete block" }), /* @__PURE__ */ jsxs(AlertDialogDescription, { children: [
-			"Are you sure you want to delete ",
-			/* @__PURE__ */ jsx("strong", { children: blockToDelete?.summary }),
+			"Are you sure you want to delete",
+			" ",
+			/* @__PURE__ */ jsx("strong", { children: blockToDelete && entityName(blockToDelete, blockToDelete.type) }),
 			"? This action cannot be undone."
 		] })] }), /* @__PURE__ */ jsxs(AlertDialogFooter, { children: [/* @__PURE__ */ jsx(AlertDialogCancel, {
 			variant: "outline",
@@ -310,7 +312,7 @@ function useBlockActionsShortcuts() {
 							return;
 						}
 						const block_0 = pageBlocks.find((b_0) => b_0.id === sel_0.blockId);
-						deleteBlock({ id: sel_0.blockId }).then(() => toast.success(`Deleted "${block_0?.summary || block_0?.type}" block`), _temp6);
+						deleteBlock({ id: sel_0.blockId }).then(() => toast.success(`Deleted "${block_0 ? entityName(block_0, block_0.type) : ""}" block`), _temp6);
 						previewStore.send({ type: "clearSelection" });
 					}
 				},
@@ -339,7 +341,7 @@ function useBlockActionsShortcuts() {
 							return;
 						}
 						const block_1 = pageBlocks.find((b_1) => b_1.id === sel_2.blockId);
-						duplicateBlock({ id: sel_2.blockId }).then(() => toast.success(`Duplicated "${block_1?.summary}" block`), _temp9);
+						duplicateBlock({ id: sel_2.blockId }).then(() => toast.success(`Duplicated "${block_1 ? entityName(block_1, block_1.type) : ""}" block`), _temp9);
 					}
 				},
 				{