camox 0.71.0 → 0.72.0

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

@@ -18,7 +18,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "@camox/ui/popover";
 import { Command as Command$1, CommandGroup, CommandInput, CommandItem, CommandList, CommandSeparator, CommandShortcut } from "@camox/ui/command";
 
 //#region src/features/preview/components/BlockActionsPopover.tsx
-const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "start", isLayoutBlock, layoutSlot }) => {
+const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "start" }) => {
 	const [blockToDelete, setBlockToDelete] = React.useState(null);
 	const page = usePreviewedPage();
 	const { pageBlocks } = usePageBlocks(page);
@@ -45,21 +45,6 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 			toast.error("Could not duplicate block");
 		}
 	};
-	const handleAddBlockAbove = (block) => {
-		if (!page) return;
-		const blockIndex = pageBlocks.findIndex((b) => b.id === block.id);
-		const afterPosition = blockIndex > 0 ? pageBlocks[blockIndex - 1].position : "";
-		previewStore.send({
-			type: "openAddBlockSheet",
-			afterPosition
-		});
-	};
-	const handleAddBlockBelow = (block) => {
-		previewStore.send({
-			type: "openAddBlockSheet",
-			afterPosition: block.position
-		});
-	};
 	const getBlocksAbove = (block) => {
 		if (!page) return [];
 		const blockIndex = pageBlocks.findIndex((b) => b.id === block.id);
@@ -101,97 +86,46 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 			children: /* @__PURE__ */ jsxs(Command$1, { children: [/* @__PURE__ */ jsx(CommandInput, { placeholder: "Search actions..." }), /* @__PURE__ */ jsxs(CommandList, {
 				className: "max-h-[350px]",
 				children: [
-					isLayoutBlock && layoutSlot === "before" && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(CommandGroup, { children: /* @__PURE__ */ jsx(CommandItem, {
-						onSelect: () => {
-							previewStore.send({
-								type: "openAddBlockSheet",
-								afterPosition: ""
-							});
-							onOpenChange(false);
-						},
-						children: /* @__PURE__ */ jsxs("div", {
-							className: "flex items-center gap-2",
-							children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Add block below"]
-						})
-					}) }) }),
-					isLayoutBlock && layoutSlot === "after" && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(CommandGroup, { children: /* @__PURE__ */ jsx(CommandItem, {
+					/* @__PURE__ */ jsx(CommandGroup, { children: /* @__PURE__ */ jsxs(CommandItem, {
+						className: "justify-between",
 						onSelect: () => {
-							const lastPageBlock = pageBlocks[pageBlocks.length - 1];
-							previewStore.send({
-								type: "openAddBlockSheet",
-								afterPosition: lastPageBlock?.position
-							});
+							handleDuplicateBlock(block);
 							onOpenChange(false);
 						},
-						children: /* @__PURE__ */ jsxs("div", {
+						children: [/* @__PURE__ */ jsxs("div", {
 							className: "flex items-center gap-2",
-							children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Add block above"]
-						})
-					}) }) }),
-					!isLayoutBlock && /* @__PURE__ */ jsxs(Fragment, { children: [
-						/* @__PURE__ */ jsxs(CommandGroup, { children: [/* @__PURE__ */ jsxs(CommandItem, {
-							className: "justify-between",
+							children: [/* @__PURE__ */ jsx(Copy, { className: "h-4 w-4" }), "Duplicate block"]
+						}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("Mod+D") })]
+					}) }),
+					/* @__PURE__ */ jsx(CommandSeparator, {}),
+					/* @__PURE__ */ jsxs(CommandGroup, { children: [
+						/* @__PURE__ */ jsxs(CommandItem, {
 							onSelect: () => {
-								handleAddBlockBelow(block);
+								handleDeleteBlocksAbove(block);
 								onOpenChange(false);
 							},
-							children: [/* @__PURE__ */ jsxs("div", {
-								className: "flex items-center gap-2",
-								children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Add block below"]
-							}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("O") })]
-						}), /* @__PURE__ */ jsxs(CommandItem, {
-							className: "justify-between",
+							disabled: getBlocksAbove(block).length === 0,
+							children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Delete blocks above"]
+						}),
+						/* @__PURE__ */ jsxs(CommandItem, {
 							onSelect: () => {
-								handleAddBlockAbove(block);
+								handleDeleteBlocksBelow(block);
 								onOpenChange(false);
 							},
-							children: [/* @__PURE__ */ jsxs("div", {
-								className: "flex items-center gap-2",
-								children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Add block above"]
-							}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("Shift+O") })]
-						})] }),
-						/* @__PURE__ */ jsx(CommandSeparator, {}),
-						/* @__PURE__ */ jsx(CommandGroup, { children: /* @__PURE__ */ jsxs(CommandItem, {
+							disabled: getBlocksBelow(block).length === 0,
+							children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Delete blocks below"]
+						}),
+						/* @__PURE__ */ jsxs(CommandItem, {
 							className: "justify-between",
 							onSelect: () => {
-								handleDuplicateBlock(block);
+								handleDeleteBlock(block);
 								onOpenChange(false);
 							},
 							children: [/* @__PURE__ */ jsxs("div", {
 								className: "flex items-center gap-2",
-								children: [/* @__PURE__ */ jsx(Copy, { className: "h-4 w-4" }), "Duplicate block"]
-							}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("Mod+D") })]
-						}) }),
-						/* @__PURE__ */ jsx(CommandSeparator, {}),
-						/* @__PURE__ */ jsxs(CommandGroup, { children: [
-							/* @__PURE__ */ jsxs(CommandItem, {
-								onSelect: () => {
-									handleDeleteBlocksAbove(block);
-									onOpenChange(false);
-								},
-								disabled: getBlocksAbove(block).length === 0,
-								children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Delete blocks above"]
-							}),
-							/* @__PURE__ */ jsxs(CommandItem, {
-								onSelect: () => {
-									handleDeleteBlocksBelow(block);
-									onOpenChange(false);
-								},
-								disabled: getBlocksBelow(block).length === 0,
-								children: [/* @__PURE__ */ jsx("span", { className: "w-4" }), "Delete blocks below"]
-							}),
-							/* @__PURE__ */ jsxs(CommandItem, {
-								className: "justify-between",
-								onSelect: () => {
-									handleDeleteBlock(block);
-									onOpenChange(false);
-								},
-								children: [/* @__PURE__ */ jsxs("div", {
-									className: "flex items-center gap-2",
-									children: [/* @__PURE__ */ jsx(Trash2, { className: "h-4 w-4" }), "Delete block"]
-								}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("Mod+Backspace") })]
-							})
-						] })
+								children: [/* @__PURE__ */ jsx(Trash2, { className: "h-4 w-4" }), "Delete block"]
+							}), /* @__PURE__ */ jsx(CommandShortcut, { children: formatShortcut("Mod+Backspace") })]
+						})
 					] })
 				]
 			})] })
@@ -293,12 +227,12 @@ function useBlockActionsShortcuts() {
 						if (!sel_0) return;
 						const itemId_0 = selectionItemId(sel_0);
 						if (itemId_0 != null) {
-							deleteRepeatableItem({ id: itemId_0 }).then(_temp4, _temp5);
+							deleteRepeatableItem({ id: itemId_0 }).then(_temp3, _temp4);
 							previewStore.send({ type: "selectParent" });
 							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 ? entityName(block_0, block_0.type) : ""}" block`), _temp6);
+						deleteBlock({ id: sel_0.blockId }).then(() => toast.success(`Deleted "${block_0 ? entityName(block_0, block_0.type) : ""}" block`), _temp5);
 						previewStore.send({ type: "clearSelection" });
 					}
 				},
@@ -320,11 +254,11 @@ function useBlockActionsShortcuts() {
 						if (!sel_2) return;
 						const itemId_1 = selectionItemId(sel_2);
 						if (itemId_1 != null) {
-							duplicateRepeatableItem({ id: itemId_1 }).then(_temp7, _temp8);
+							duplicateRepeatableItem({ id: itemId_1 }).then(_temp6, _temp7);
 							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 ? entityName(block_1, block_1.type) : ""}" block`), _temp9);
+						duplicateBlock({ id: sel_2.blockId }).then(() => toast.success(`Duplicated "${block_1 ? entityName(block_1, block_1.type) : ""}" block`), _temp8);
 					}
 				},
 				{
@@ -351,7 +285,7 @@ function useBlockActionsShortcuts() {
 							id: sel_4.blockId,
 							afterPosition,
 							beforePosition
-						}).then(_temp10, _temp11);
+						}).then(_temp9, _temp10);
 					}
 				},
 				{
@@ -379,50 +313,7 @@ function useBlockActionsShortcuts() {
 							id: sel_6.blockId,
 							afterPosition: afterPosition_0,
 							beforePosition: beforePosition_0
-						}).then(_temp12, _temp13);
-					}
-				},
-				{
-					id: "add-block-below",
-					label: "Add block below",
-					groupLabel: "Website",
-					shortcut: "O",
-					checkIfAvailable: () => {
-						const ctx_3 = previewStore.getSnapshot().context;
-						if (ctx_3.view !== "canvas") return false;
-						return blockSelectionForPage(ctx_3, page.page.id) !== null;
-					},
-					execute: () => {
-						const sel_7 = blockSelectionForPage(previewStore.getSnapshot().context, page.page.id);
-						if (!sel_7 || !page) return;
-						const block_2 = pageBlocks.find((b_6) => b_6.id === sel_7.blockId);
-						if (!block_2) return;
-						previewStore.send({
-							type: "openAddBlockSheet",
-							afterPosition: block_2.position
-						});
-					}
-				},
-				{
-					id: "add-block-above",
-					label: "Add block above",
-					groupLabel: "Website",
-					shortcut: "Shift+O",
-					checkIfAvailable: () => {
-						const ctx_4 = previewStore.getSnapshot().context;
-						if (ctx_4.view !== "canvas") return false;
-						return blockSelectionForPage(ctx_4, page.page.id) !== null;
-					},
-					execute: () => {
-						const sel_8 = blockSelectionForPage(previewStore.getSnapshot().context, page.page.id);
-						if (!sel_8 || !page) return;
-						const blockIndex = pageBlocks.findIndex((b_7) => b_7.id === sel_8.blockId);
-						if (blockIndex === -1) return;
-						const afterPosition_1 = blockIndex > 0 ? pageBlocks[blockIndex - 1].position : "";
-						previewStore.send({
-							type: "openAddBlockSheet",
-							afterPosition: afterPosition_1
-						});
+						}).then(_temp11, _temp12);
 					}
 				}
 			];
@@ -433,7 +324,7 @@ function useBlockActionsShortcuts() {
 			return () => {
 				actionsStore.send({
 					type: "unregisterManyActions",
-					ids: actions.map(_temp14)
+					ids: actions.map(_temp13)
 				});
 			};
 		};
@@ -470,33 +361,33 @@ function useBlockActionsShortcuts() {
 	} else t6 = $[22];
 	React.useEffect(t5, t6);
 }
-function _temp14(a) {
+function _temp13(a) {
 	return a.id;
 }
-function _temp13() {
+function _temp12() {
 	return toast.error("Could not move block");
 }
-function _temp12() {}
-function _temp11() {
+function _temp11() {}
+function _temp10() {
 	return toast.error("Could not move block");
 }
-function _temp10() {}
-function _temp9() {
+function _temp9() {}
+function _temp8() {
 	return toast.error("Could not duplicate block");
 }
-function _temp8() {
+function _temp7() {
 	return toast.error("Could not duplicate item");
 }
-function _temp7() {
+function _temp6() {
 	return toast.success("Duplicated item");
 }
-function _temp6() {
+function _temp5() {
 	return toast.error("Could not delete block");
 }
-function _temp5() {
+function _temp4() {
 	return toast.error("Could not delete item");
 }
-function _temp4() {
+function _temp3() {
 	return toast.success("Deleted item");
 }
 

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

@@ -1,8 +1,8 @@
 import { CanvasLoadingScreen } from "../../canvas/CanvasLoadingScreen.js";
-import { ViewportContinuity, ViewportContinuityContext } from "../viewportContinuity.js";
-import { PreviewActivationContext } from "./PreviewActivation.js";
 import { PreviewPageFrame, PreviewPageFrameContext } from "../previewPageFrame.js";
 import { PreviewPreparationContext } from "../previewPreparation.js";
+import { ViewportContinuity, ViewportContinuityContext } from "../viewportContinuity.js";
+import { PreviewActivationContext } from "./PreviewActivation.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";

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

@@ -1,11 +1,11 @@
 import { useLocation, useNavigate } from "../../navigation/navigation.js";
 import { cn } from "../../../lib/utils.js";
-import { listenForLinkIntent } from "../../runtime/linkPrefetch.js";
-import { PageViewportContext } from "../../runtime/pageViewport.js";
-import { PreviewDocumentContext } from "../../runtime/PreviewDocumentContext.js";
 import { ViewportContinuityContext, capturePreviewAnchor, restorePreviewAnchor } from "../viewportContinuity.js";
 import { PreviewActivationContext } from "./PreviewActivation.js";
 import { EMPTY_PREVIEW_DOCUMENT, isSiteStyle, restyle } from "./previewStyles.js";
+import { listenForLinkIntent } from "../../runtime/linkPrefetch.js";
+import { PageViewportContext } from "../../runtime/pageViewport.js";
+import { PreviewDocumentContext } from "../../runtime/PreviewDocumentContext.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";

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

@@ -6,8 +6,8 @@ import { Button } from "@camox/ui/button";
 import { ChevronsUpDown, SearchIcon } from "lucide-react";
 import { Combobox } from "@base-ui/react/combobox";
 import { Popover, PopoverContent, PopoverTrigger } from "@camox/ui/popover";
-import { commandFilter } from "@camox/ui/command";
 import { InputGroup, InputGroupAddon, InputGroupInput } from "@camox/ui/input-group";
+import { commandFilter } from "@camox/ui/command";
 import { defaultRangeExtractor, useVirtualizer } from "@tanstack/react-virtual";
 
 //#region src/features/preview/components/IconFieldEditor.tsx

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

@@ -258,7 +258,6 @@ const ItemFieldsEditor = (t0) => {
 			const renderField = () => {
 				if (field_0.fieldType === "Reference" && field_0.collectionId) return /* @__PURE__ */ jsx(ReferenceFieldEditor, {
 					collectionId: field_0.collectionId,
-					fieldId: fieldId_1,
 					value: data[field_0.name],
 					required: field_0.required,
 					record: singleReference(references, field_0.name),
@@ -273,7 +272,6 @@ const ItemFieldsEditor = (t0) => {
 				}, field_0.name);
 				if (field_0.fieldType === "ReferenceList" && field_0.collectionId) return /* @__PURE__ */ jsx(ReferenceListFieldEditor, {
 					collectionId: field_0.collectionId,
-					fieldId: fieldId_1,
 					value: data[field_0.name],
 					maxItems: field_0.maxItems,
 					query: field_0.query,
@@ -358,7 +356,7 @@ const ItemFieldsEditor = (t0) => {
 					}, field_0.name);
 				}
 				if (field_0.fieldType === "Icon") return /* @__PURE__ */ jsx(IconFieldEditor, {
-					value: String(data[field_0.name] ?? schema?.properties?.[field_0.name]?.default ?? ""),
+					value: typeof data[field_0.name] === "string" ? data[field_0.name] : "",
 					ids: field_0.enumValues ?? [],
 					onChange: (value_3) => onFieldChange(field_0.name, value_3)
 				}, field_0.name);

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

@@ -1,69 +1,11 @@
-import { usePageBlocks } from "../../../lib/normalized-data.js";
-import { previewStore, selectIsCanvasShown, selectionForOwner } from "../previewStore.js";
+import { previewStore, selectionForOwner } from "../previewStore.js";
 import { useEditingFrame } from "../editingFrame.js";
-import { isOverlayMessage, overlayFieldId, recordFieldId } from "../overlayMessages.js";
-import { usePreviewedPage } from "../CamoxPreview.js";
+import { overlayFieldId, recordFieldId } from "../overlayMessages.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
-import { jsx } from "react/jsx-runtime";
 import { useSelector } from "@xstate/store-react";
 
 //#region src/features/preview/components/Overlays.tsx
-function CuratedAddBlockListener(t0) {
-	const $ = c(5);
-	const { frame } = t0;
-	const page = usePreviewedPage();
-	const { pageBlocks } = usePageBlocks(page);
-	const { document: editingDocument } = useEditingFrame();
-	const isEditingFrame = !!editingDocument && editingDocument === frame?.contentDocument;
-	let t1;
-	let t2;
-	if ($[0] !== isEditingFrame || $[1] !== page.page.id || $[2] !== pageBlocks) {
-		t1 = () => {
-			const handleMessage = (event) => {
-				if (!isOverlayMessage(event.data)) return;
-				const message = event.data;
-				if (message.type === "CAMOX_ADD_BLOCK_REQUEST") {
-					const snapshot = previewStore.getSnapshot();
-					if (!selectIsCanvasShown(snapshot)) return;
-					if (!isEditingFrame) return;
-					const owner = snapshot.context.editingContext;
-					if (owner?.kind !== "page" || owner.pageId !== page.page.id) return;
-					const { blockPosition, insertPosition } = message;
-					let afterPosition = null;
-					if (message.afterPosition !== void 0) afterPosition = message.afterPosition;
-					else if (insertPosition === "after") afterPosition = blockPosition;
-					else {
-						const blockIndex = pageBlocks.findIndex((b) => b.position === blockPosition);
-						if (blockIndex > 0) afterPosition = pageBlocks[blockIndex - 1].position ?? null;
-						else if (blockIndex === 0) afterPosition = "";
-					}
-					previewStore.send({
-						type: "openAddBlockSheet",
-						afterPosition
-					});
-				}
-			};
-			window.addEventListener("message", handleMessage);
-			return () => window.removeEventListener("message", handleMessage);
-		};
-		t2 = [
-			pageBlocks,
-			page.page.id,
-			isEditingFrame
-		];
-		$[0] = isEditingFrame;
-		$[1] = page.page.id;
-		$[2] = pageBlocks;
-		$[3] = t1;
-		$[4] = t2;
-	} else {
-		t1 = $[3];
-		t2 = $[4];
-	}
-	React.useEffect(t1, t2);
-	return null;
-}
 /** The field ID of a selected String field; only those are focused in the page. */
 function stringFieldId(selection) {
 	if (!selection) return null;
@@ -75,22 +17,21 @@ function stringFieldId(selection) {
 	}
 }
 const Overlays = (t0) => {
-	const $ = c(10);
-	const { frame, canAddBlocks: t1, owner } = t0;
-	const canAddBlocks = t1 === void 0 ? false : t1;
-	let t2;
+	const $ = c(7);
+	const { frame, owner } = t0;
+	let t1;
 	if ($[0] !== owner) {
-		t2 = (state) => selectionForOwner(state.context, owner);
+		t1 = (state) => selectionForOwner(state.context, owner);
 		$[0] = owner;
-		$[1] = t2;
-	} else t2 = $[1];
-	const selection = useSelector(previewStore, t2);
+		$[1] = t1;
+	} else t1 = $[1];
+	const selection = useSelector(previewStore, t1);
 	const { document: editingDocument, send } = useEditingFrame();
 	const isEditingFrame = !!editingDocument && editingDocument === frame?.contentDocument;
+	let t2;
 	let t3;
-	let t4;
 	if ($[2] !== isEditingFrame || $[3] !== selection || $[4] !== send) {
-		t3 = () => {
+		t2 = () => {
 			const fieldId = stringFieldId(selection);
 			if (!fieldId || !isEditingFrame) return;
 			send({
@@ -98,7 +39,7 @@ const Overlays = (t0) => {
 				fieldId
 			});
 		};
-		t4 = [
+		t3 = [
 			selection,
 			isEditingFrame,
 			send
@@ -106,21 +47,14 @@ const Overlays = (t0) => {
 		$[2] = isEditingFrame;
 		$[3] = selection;
 		$[4] = send;
-		$[5] = t3;
-		$[6] = t4;
+		$[5] = t2;
+		$[6] = t3;
 	} else {
-		t3 = $[5];
-		t4 = $[6];
+		t2 = $[5];
+		t3 = $[6];
 	}
-	React.useEffect(t3, t4);
-	let t5;
-	if ($[7] !== canAddBlocks || $[8] !== frame) {
-		t5 = canAddBlocks ? /* @__PURE__ */ jsx(CuratedAddBlockListener, { frame }) : null;
-		$[7] = canAddBlocks;
-		$[8] = frame;
-		$[9] = t5;
-	} else t5 = $[9];
-	return t5;
+	React.useEffect(t2, t3);
+	return null;
 };
 
 //#endregion