camox 0.69.0 → 0.72.0

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

@@ -1,5 +1,6 @@
 import { isLexicalState, lexicalStateToPlainText } from "../../core/lib/lexicalState.js";
 import { titleField } from "../../core/recordItem.js";
+import { emptyFieldValue } from "@camox/api-contract";
 
 //#region src/features/content/collection-form.ts
 /** The form's fields, the one the record's title starts with first. */
@@ -8,7 +9,8 @@ function collectionFormFields(contentSchema, toTitle) {
 	const first = titleField(toTitle);
 	return Object.entries(schema.properties).sort(([a], [b]) => Number(b === first) - Number(a === first));
 }
-function collectionFormDefaults(fields, content = {}) {
+/** The form's values: the record's content, and the empty value of each field it lacks. */
+function collectionFormValues(fields, content = {}) {
 	return Object.fromEntries(fields.map(([name, schema]) => {
 		if (schema.fieldType === "Reference") return [name, content[name] ?? null];
 		if (schema.fieldType === "ReferenceList") {
@@ -20,12 +22,9 @@ function collectionFormDefaults(fields, content = {}) {
 			const assets = content[name];
 			return [name, Array.isArray(assets) ? assets.map(editorAsset) : []];
 		}
-		const value = content[name] ?? schema.default;
+		const value = content[name] ?? emptyFieldValue(schema);
 		if (schema.fieldType === "String" && isLexicalState(value)) return [name, lexicalStateToPlainText(value)];
-		if (value !== void 0) return [name, value];
-		if (schema.fieldType === "Boolean") return [name, false];
-		if (schema.fieldType === "Enum") return [name, schema.enum?.[0] ?? ""];
-		return [name, ""];
+		return [name, value];
 	}));
 }
 const isAssetFieldType = (fieldType) => fieldType === "Image" || fieldType === "File" || fieldType === "ImageList" || fieldType === "FileList";
@@ -59,4 +58,4 @@ function collectionFormContent(fields, values, original = {}) {
 }
 
 //#endregion
-export { collectionFormContent, collectionFormDefaults, collectionFormFields, editorAssetField, serializeAssetField };
+export { collectionFormContent, collectionFormFields, collectionFormValues, editorAssetField, serializeAssetField };

package/dist/features/page/CuratedPageContent.js

@@ -14,8 +14,8 @@ import { jsx } from "react/jsx-runtime";
 //#region src/features/page/CuratedPageContent.tsx
 /** A block read with its bundle, rendered by its definition's code as a page shows it. */
 function PageBlock(t0) {
-	const $ = c(19);
-	const { blockId, mode } = t0;
+	const $ = c(18);
+	const { blockId } = t0;
 	let t1;
 	if ($[0] !== blockId) {
 		t1 = reads.blockBundle(blockId);
@@ -57,32 +57,26 @@ function PageBlock(t0) {
 		$[9] = t10;
 	} else t10 = $[9];
 	let t11;
-	if ($[10] !== blockDef._internal.Component || $[11] !== mode || $[12] !== t10) {
-		t11 = /* @__PURE__ */ jsx(T0, {
-			blockData: t10,
-			mode,
-			showAddBlockTop: false,
-			showAddBlockBottom: false
-		});
+	if ($[10] !== blockDef._internal.Component || $[11] !== t10) {
+		t11 = /* @__PURE__ */ jsx(T0, { blockData: t10 });
 		$[10] = blockDef._internal.Component;
-		$[11] = mode;
-		$[12] = t10;
-		$[13] = t11;
-	} else t11 = $[13];
+		$[11] = t10;
+		$[12] = t11;
+	} else t11 = $[12];
 	let t12;
-	if ($[14] !== data.files || $[15] !== data.repeatableItems || $[16] !== t11 || $[17] !== t4) {
+	if ($[13] !== data.files || $[14] !== data.repeatableItems || $[15] !== t11 || $[16] !== t4) {
 		t12 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
 			files: t2,
 			repeatableItems: t3,
 			blocks: t4,
 			children: t11
 		});
-		$[14] = data.files;
-		$[15] = data.repeatableItems;
-		$[16] = t11;
-		$[17] = t4;
-		$[18] = t12;
-	} else t12 = $[18];
+		$[13] = data.files;
+		$[14] = data.repeatableItems;
+		$[15] = t11;
+		$[16] = t4;
+		$[17] = t12;
+	} else t12 = $[17];
 	return t12;
 }
 /** A curated page as visitors see it, without editing. */
@@ -170,10 +164,7 @@ function _temp(block) {
 	return /* @__PURE__ */ jsx(BlockErrorBoundary, {
 		blockId: block.id,
 		blockType: block.type,
-		children: /* @__PURE__ */ jsx(PageBlock, {
-			blockId: block.id,
-			mode: "site"
-		})
+		children: /* @__PURE__ */ jsx(PageBlock, { blockId: block.id })
 	}, block.id);
 }
 

package/dist/features/page/UnplacedBlockContent.js

@@ -8,8 +8,6 @@ import { jsx } from "react/jsx-runtime";
 /**
 * A block placed nowhere, alone, as a page would show it: the look document's Block Definition
 * mode (ADR 0032). Its bundle is read like a page's block, so it renders and hydrates as one.
-* Thumbnails render a Block Definition their own way (`BlockPeek`); only the block render is
-* shared.
 */
 function UnplacedBlockContent(t0) {
 	const $ = c(8);
@@ -23,10 +21,7 @@ function UnplacedBlockContent(t0) {
 	const { block } = useRead(t1);
 	let t2;
 	if ($[2] !== blockId) {
-		t2 = /* @__PURE__ */ jsx(PageBlock, {
-			blockId,
-			mode: "site"
-		});
+		t2 = /* @__PURE__ */ jsx(PageBlock, { blockId });
 		$[2] = blockId;
 		$[3] = t2;
 	} else t2 = $[3];

package/dist/features/preview/CamoxPreview.js

@@ -20,7 +20,6 @@ import { PreviewEditingOwnerContext } from "./previewSelection.js";
 import { RendererFramesProvider, RendererSlot, useRendererHost, useRendererStatus } from "../renderer/RendererFrames.js";
 import { STUDIO_CANVAS_PATH } from "../studio/routes.js";
 import { studioStore } from "../studio/studioStore.js";
-import { AddBlockSheet } from "./components/AddBlockSheet.js";
 import { CanvasPreview, prefetchCanvas } from "./components/CanvasPreview.js";
 import { CreatePageModal } from "./components/CreatePageModal.js";
 import { PageRecordContext, getPageRecord, useDerivedPageResult, useFollowPageRecord } from "./pageRecord.js";
@@ -409,7 +408,7 @@ function usePrefetchCanvas(enabled, projectUuid) {
 }
 /** Studio chrome is shared; only curated previews require a Camox page record. */
 const PreviewShell = (t0) => {
-	const $ = c(62);
+	const $ = c(61);
 	const { children, pageData, derivedLayout, pageLocation, canvasOnly, runtimeBasePath: t1, pageShown: t2 } = t0;
 	const runtimeBasePath = t1 === void 0 ? "" : t1;
 	const pageShown = t2 === void 0 ? true : t2;
@@ -476,7 +475,6 @@ const PreviewShell = (t0) => {
 		t6 = () => {
 			if (!isMobileStudio) return;
 			previewStore.send({ type: "hideCanvas" });
-			previewStore.send({ type: "closeAddBlockSheet" });
 		};
 		t7 = [isMobileStudio];
 		$[8] = isMobileStudio;
@@ -645,60 +643,59 @@ const PreviewShell = (t0) => {
 		$[43] = t23;
 	} else t23 = $[43];
 	let t24;
-	if ($[44] !== isCanvasEnabled || $[45] !== pageId) {
-		t24 = !isCanvasEnabled && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(CreatePageModal, {}), pageId != null && /* @__PURE__ */ jsx(AddBlockSheet, {})] });
+	if ($[44] !== isCanvasEnabled) {
+		t24 = !isCanvasEnabled && /* @__PURE__ */ jsx(CreatePageModal, {});
 		$[44] = isCanvasEnabled;
-		$[45] = pageId;
-		$[46] = t24;
-	} else t24 = $[46];
+		$[45] = t24;
+	} else t24 = $[45];
 	let t25;
-	if ($[47] !== t11 || $[48] !== t23 || $[49] !== t24) {
+	if ($[46] !== t11 || $[47] !== t23 || $[48] !== t24) {
 		t25 = /* @__PURE__ */ jsxs("div", {
 			className: t11,
 			children: [t23, t24]
 		});
-		$[47] = t11;
-		$[48] = t23;
-		$[49] = t24;
-		$[50] = t25;
-	} else t25 = $[50];
+		$[46] = t11;
+		$[47] = t23;
+		$[48] = t24;
+		$[49] = t25;
+	} else t25 = $[49];
 	let t26;
-	if ($[51] !== editingOwner || $[52] !== t25) {
+	if ($[50] !== editingOwner || $[51] !== t25) {
 		t26 = /* @__PURE__ */ jsx(PreviewEditingOwnerContext, {
 			value: editingOwner,
 			children: t25
 		});
-		$[51] = editingOwner;
-		$[52] = t25;
-		$[53] = t26;
-	} else t26 = $[53];
+		$[50] = editingOwner;
+		$[51] = t25;
+		$[52] = t26;
+	} else t26 = $[52];
 	let t27;
-	if ($[54] !== projectUuid) {
+	if ($[53] !== projectUuid) {
 		t27 = /* @__PURE__ */ jsx(ContentCollectionItemSheet, { projectUuid });
-		$[54] = projectUuid;
-		$[55] = t27;
-	} else t27 = $[55];
+		$[53] = projectUuid;
+		$[54] = t27;
+	} else t27 = $[54];
 	let t28;
-	if ($[56] !== t26 || $[57] !== t27) {
+	if ($[55] !== t26 || $[56] !== t27) {
 		t28 = /* @__PURE__ */ jsxs(CollectionItemSheetProvider, {
 			onRouteTargetClose: _temp8,
 			children: [t26, t27]
 		});
-		$[56] = t26;
-		$[57] = t27;
-		$[58] = t28;
-	} else t28 = $[58];
+		$[55] = t26;
+		$[56] = t27;
+		$[57] = t28;
+	} else t28 = $[57];
 	const website = t28;
 	let t29;
-	if ($[59] !== runtimeBasePath || $[60] !== website) {
+	if ($[58] !== runtimeBasePath || $[59] !== website) {
 		t29 = /* @__PURE__ */ jsx(RendererFramesProvider, {
 			runtimeBasePath,
 			children: website
 		});
-		$[59] = runtimeBasePath;
-		$[60] = website;
-		$[61] = t29;
-	} else t29 = $[61];
+		$[58] = runtimeBasePath;
+		$[59] = website;
+		$[60] = t29;
+	} else t29 = $[60];
 	return t29;
 };
 /**

package/dist/features/preview/EditablePageContent.js

@@ -12,8 +12,8 @@ import { Fragment, jsx } from "react/jsx-runtime";
 
 //#region src/features/preview/EditablePageContent.tsx
 const BlockRenderer = (t0) => {
-	const $ = c(28);
-	const { blockId, mode, showAddBlockTop, showAddBlockBottom } = t0;
+	const $ = c(24);
+	const { blockId } = t0;
 	let t1;
 	if ($[0] !== blockId) {
 		t1 = reads.blockBundle(blockId);
@@ -32,27 +32,25 @@ const BlockRenderer = (t0) => {
 	const blockDef = t2;
 	if (!blockDef) {
 		let t3;
-		if ($[5] !== blockId || $[6] !== data.block.type || $[7] !== mode) {
+		if ($[5] !== blockId || $[6] !== data.block.type) {
 			t3 = /* @__PURE__ */ jsx(RemovedBlockPlaceholder, {
 				blockId,
-				type: data.block.type,
-				mode
+				type: data.block.type
 			});
 			$[5] = blockId;
 			$[6] = data.block.type;
-			$[7] = mode;
-			$[8] = t3;
-		} else t3 = $[8];
+			$[7] = t3;
+		} else t3 = $[7];
 		return t3;
 	}
 	const t3 = data.files;
 	const t4 = data.repeatableItems;
 	let t5;
-	if ($[9] !== data.block) {
+	if ($[8] !== data.block) {
 		t5 = [data.block];
-		$[9] = data.block;
-		$[10] = t5;
-	} else t5 = $[10];
+		$[8] = data.block;
+		$[9] = t5;
+	} else t5 = $[9];
 	const T0 = blockDef._internal.Component;
 	const t6 = data.block.id;
 	const t7 = data.block.type;
@@ -60,7 +58,7 @@ const BlockRenderer = (t0) => {
 	const t9 = data.block.settings;
 	const t10 = String(data.block.position);
 	let t11;
-	if ($[11] !== data.block.id || $[12] !== data.block.type || $[13] !== t10 || $[14] !== t8 || $[15] !== t9) {
+	if ($[10] !== data.block.id || $[11] !== data.block.type || $[12] !== t10 || $[13] !== t8 || $[14] !== t9) {
 		t11 = {
 			_id: t6,
 			type: t7,
@@ -68,177 +66,159 @@ const BlockRenderer = (t0) => {
 			settings: t9,
 			position: t10
 		};
-		$[11] = data.block.id;
-		$[12] = data.block.type;
-		$[13] = t10;
-		$[14] = t8;
-		$[15] = t9;
-		$[16] = t11;
-	} else t11 = $[16];
+		$[10] = data.block.id;
+		$[11] = data.block.type;
+		$[12] = t10;
+		$[13] = t8;
+		$[14] = t9;
+		$[15] = t11;
+	} else t11 = $[15];
 	let t12;
-	if ($[17] !== blockDef._internal.Component || $[18] !== mode || $[19] !== showAddBlockBottom || $[20] !== showAddBlockTop || $[21] !== t11) {
-		t12 = /* @__PURE__ */ jsx(T0, {
-			blockData: t11,
-			mode,
-			showAddBlockTop,
-			showAddBlockBottom
-		});
-		$[17] = blockDef._internal.Component;
-		$[18] = mode;
-		$[19] = showAddBlockBottom;
-		$[20] = showAddBlockTop;
-		$[21] = t11;
-		$[22] = t12;
-	} else t12 = $[22];
+	if ($[16] !== blockDef._internal.Component || $[17] !== t11) {
+		t12 = /* @__PURE__ */ jsx(T0, { blockData: t11 });
+		$[16] = blockDef._internal.Component;
+		$[17] = t11;
+		$[18] = t12;
+	} else t12 = $[18];
 	let t13;
-	if ($[23] !== data.files || $[24] !== data.repeatableItems || $[25] !== t12 || $[26] !== t5) {
+	if ($[19] !== data.files || $[20] !== data.repeatableItems || $[21] !== t12 || $[22] !== t5) {
 		t13 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
 			files: t3,
 			repeatableItems: t4,
 			blocks: t5,
 			children: t12
 		});
-		$[23] = data.files;
-		$[24] = data.repeatableItems;
-		$[25] = t12;
-		$[26] = t5;
-		$[27] = t13;
-	} else t13 = $[27];
+		$[19] = data.files;
+		$[20] = data.repeatableItems;
+		$[21] = t12;
+		$[22] = t5;
+		$[23] = t13;
+	} else t13 = $[23];
 	return t13;
 };
 const EditablePageContent = () => {
-	const $ = c(34);
+	const $ = c(31);
 	const pageData = usePreviewedPage();
 	const { pageBlocks, beforeBlocks, afterBlocks, layoutFiles, layoutItems } = usePageBlocks(pageData);
 	const camoxApp = useCamoxApp();
 	const { locale } = useViewLocale();
-	let layout;
-	let layoutBlocksMap;
 	let t0;
-	if ($[0] !== afterBlocks || $[1] !== beforeBlocks || $[2] !== camoxApp || $[3] !== pageBlocks || $[4] !== pageData) {
-		layout = pageData.layout ? camoxApp.getLayoutById(pageData.layout.layoutId) : void 0;
-		let t1;
-		bb0: {
-			if (!pageData.layout) {
-				t1 = null;
-				break bb0;
-			}
-			let blocks;
-			if ($[8] !== afterBlocks || $[9] !== beforeBlocks) {
-				const allLayoutBlocks = [...beforeBlocks, ...afterBlocks];
-				blocks = {};
-				for (const block of allLayoutBlocks) blocks[block.type] = {
-					_id: block.id,
-					type: block.type,
-					content: block.content,
-					settings: block.settings,
-					position: String(block.position)
-				};
-				$[8] = afterBlocks;
-				$[9] = beforeBlocks;
-				$[10] = blocks;
-			} else blocks = $[10];
-			t1 = blocks;
+	if ($[0] !== camoxApp || $[1] !== pageData.layout) {
+		t0 = pageData.layout ? camoxApp.getLayoutById(pageData.layout.layoutId) : void 0;
+		$[0] = camoxApp;
+		$[1] = pageData.layout;
+		$[2] = t0;
+	} else t0 = $[2];
+	const layout = t0;
+	let t1;
+	bb0: {
+		if (!pageData.layout) {
+			t1 = null;
+			break bb0;
 		}
-		layoutBlocksMap = t1;
-		t0 = pageBlocks.map((blockData, index) => /* @__PURE__ */ jsx(BlockErrorBoundary, {
-			blockId: blockData.id,
-			blockType: blockData.type,
-			children: /* @__PURE__ */ jsx(BlockRenderer, {
-				blockId: blockData.id,
-				mode: "site",
-				showAddBlockTop: index === 0 ? layout?._internal.blockDefinitions.some(_temp) ?? false : true,
-				showAddBlockBottom: true
-			})
-		}, blockData.id));
-		$[0] = afterBlocks;
-		$[1] = beforeBlocks;
-		$[2] = camoxApp;
-		$[3] = pageBlocks;
-		$[4] = pageData;
-		$[5] = layout;
-		$[6] = layoutBlocksMap;
-		$[7] = t0;
-	} else {
-		layout = $[5];
-		layoutBlocksMap = $[6];
-		t0 = $[7];
+		let blocks;
+		if ($[3] !== afterBlocks || $[4] !== beforeBlocks) {
+			const allLayoutBlocks = [...beforeBlocks, ...afterBlocks];
+			blocks = {};
+			for (const block of allLayoutBlocks) blocks[block.type] = {
+				_id: block.id,
+				type: block.type,
+				content: block.content,
+				settings: block.settings,
+				position: String(block.position)
+			};
+			$[3] = afterBlocks;
+			$[4] = beforeBlocks;
+			$[5] = blocks;
+		} else blocks = $[5];
+		t1 = blocks;
 	}
-	let t1;
-	if ($[11] !== t0) {
-		t1 = /* @__PURE__ */ jsx(Fragment, { children: t0 });
-		$[11] = t0;
-		$[12] = t1;
-	} else t1 = $[12];
-	const pageBlocksContent = t1;
+	const layoutBlocksMap = t1;
+	let t2;
+	if ($[6] !== pageBlocks) {
+		t2 = pageBlocks.map(_temp);
+		$[6] = pageBlocks;
+		$[7] = t2;
+	} else t2 = $[7];
+	let t3;
+	if ($[8] !== t2) {
+		t3 = /* @__PURE__ */ jsx(Fragment, { children: t2 });
+		$[8] = t2;
+		$[9] = t3;
+	} else t3 = $[9];
+	const pageBlocksContent = t3;
 	if (layout && layoutBlocksMap) {
 		const ToReact = layout._internal.toReact;
-		let t2;
-		if ($[13] !== afterBlocks || $[14] !== beforeBlocks) {
-			t2 = [...beforeBlocks, ...afterBlocks];
-			$[13] = afterBlocks;
-			$[14] = beforeBlocks;
-			$[15] = t2;
-		} else t2 = $[15];
-		const T0 = layout._internal.Provider;
-		let t3;
-		if ($[16] !== locale || $[17] !== pageData) {
-			t3 = curatedLayoutContext(pageData, locale);
-			$[16] = locale;
-			$[17] = pageData;
-			$[18] = t3;
-		} else t3 = $[18];
 		let t4;
-		if ($[19] !== ToReact || $[20] !== pageBlocksContent || $[21] !== t3) {
-			t4 = /* @__PURE__ */ jsx(ToReact, {
-				...t3,
+		if ($[10] !== afterBlocks || $[11] !== beforeBlocks) {
+			t4 = [...beforeBlocks, ...afterBlocks];
+			$[10] = afterBlocks;
+			$[11] = beforeBlocks;
+			$[12] = t4;
+		} else t4 = $[12];
+		const T0 = layout._internal.Provider;
+		let t5;
+		if ($[13] !== locale || $[14] !== pageData) {
+			t5 = curatedLayoutContext(pageData, locale);
+			$[13] = locale;
+			$[14] = pageData;
+			$[15] = t5;
+		} else t5 = $[15];
+		let t6;
+		if ($[16] !== ToReact || $[17] !== pageBlocksContent || $[18] !== t5) {
+			t6 = /* @__PURE__ */ jsx(ToReact, {
+				...t5,
 				children: pageBlocksContent
 			});
-			$[19] = ToReact;
-			$[20] = pageBlocksContent;
-			$[21] = t3;
-			$[22] = t4;
-		} else t4 = $[22];
-		let t5;
-		if ($[23] !== layout._internal.Provider || $[24] !== layoutBlocksMap || $[25] !== t4) {
-			t5 = /* @__PURE__ */ jsx(T0, {
+			$[16] = ToReact;
+			$[17] = pageBlocksContent;
+			$[18] = t5;
+			$[19] = t6;
+		} else t6 = $[19];
+		let t7;
+		if ($[20] !== layout._internal.Provider || $[21] !== layoutBlocksMap || $[22] !== t6) {
+			t7 = /* @__PURE__ */ jsx(T0, {
 				layoutBlocks: layoutBlocksMap,
-				children: t4
+				children: t6
 			});
-			$[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, {
+			$[20] = layout._internal.Provider;
+			$[21] = layoutBlocksMap;
+			$[22] = t6;
+			$[23] = t7;
+		} else t7 = $[23];
+		let t8;
+		if ($[24] !== layoutFiles || $[25] !== layoutItems || $[26] !== t4 || $[27] !== t7) {
+			t8 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
 				files: layoutFiles,
 				repeatableItems: layoutItems,
-				blocks: t2,
-				children: t5
+				blocks: t4,
+				children: t7
 			});
-			$[27] = layoutFiles;
-			$[28] = layoutItems;
-			$[29] = t2;
-			$[30] = t5;
-			$[31] = t6;
-		} else t6 = $[31];
-		return t6;
+			$[24] = layoutFiles;
+			$[25] = layoutItems;
+			$[26] = t4;
+			$[27] = t7;
+			$[28] = t8;
+		} else t8 = $[28];
+		return t8;
 	}
-	let t2;
-	if ($[32] !== pageBlocksContent) {
-		t2 = /* @__PURE__ */ jsx("main", {
+	let t4;
+	if ($[29] !== pageBlocksContent) {
+		t4 = /* @__PURE__ */ jsx("main", {
 			className: "flex min-h-screen flex-col",
 			children: pageBlocksContent
 		});
-		$[32] = pageBlocksContent;
-		$[33] = t2;
-	} else t2 = $[33];
-	return t2;
+		$[29] = pageBlocksContent;
+		$[30] = t4;
+	} else t4 = $[30];
+	return t4;
 };
-function _temp(b) {
-	return b.slot === "before";
+function _temp(blockData) {
+	return /* @__PURE__ */ jsx(BlockErrorBoundary, {
+		blockId: blockData.id,
+		blockType: blockData.type,
+		children: /* @__PURE__ */ jsx(BlockRenderer, { blockId: blockData.id })
+	}, blockData.id);
 }
 
 //#endregion