camox 0.40.0 → 0.41.0

package/dist/features/navigation/navigation.js

@@ -31,19 +31,20 @@ async function browserNavigate({ replace, to }) {
 	window.dispatchEvent(new PopStateEvent("popstate"));
 }
 function NavigationProvider(t0) {
-	const $ = c(10);
-	if ($[0] !== "ddcd98e64cdc09695f4e9227379a4d90d1598ced9253a16b3dee21623e108a54") {
-		for (let $i = 0; $i < 10; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "ddcd98e64cdc09695f4e9227379a4d90d1598ced9253a16b3dee21623e108a54";
+	const $ = c(11);
+	if ($[0] !== "b077805671357d8c221f5828542d8c58cc7da9751e57801b28455420b1a9209a") {
+		for (let $i = 0; $i < 11; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "b077805671357d8c221f5828542d8c58cc7da9751e57801b28455420b1a9209a";
 	}
-	const { children, getLocation: t1, initialLocation, navigate: t2 } = t0;
+	const { children, getLocation: t1, initialLocation, location: controlledLocation, navigate: t2 } = t0;
 	const getLocation = t1 === void 0 ? getBrowserLocation : t1;
 	const navigate = t2 === void 0 ? browserNavigate : t2;
 	const [location, setLocation] = React.useState(initialLocation ?? getLocation);
 	let t3;
 	let t4;
-	if ($[1] !== getLocation) {
+	if ($[1] !== controlledLocation || $[2] !== getLocation) {
 		t3 = () => {
+			if (controlledLocation) return;
 			const updateLocation = () => setLocation(getLocation());
 			window.addEventListener("popstate", updateLocation);
 			window.addEventListener("camox:navigation", updateLocation);
@@ -52,37 +53,39 @@ function NavigationProvider(t0) {
 				window.removeEventListener("camox:navigation", updateLocation);
 			};
 		};
-		t4 = [getLocation];
-		$[1] = getLocation;
-		$[2] = t3;
-		$[3] = t4;
+		t4 = [getLocation, controlledLocation];
+		$[1] = controlledLocation;
+		$[2] = getLocation;
+		$[3] = t3;
+		$[4] = t4;
 	} else {
-		t3 = $[2];
-		t4 = $[3];
+		t3 = $[3];
+		t4 = $[4];
 	}
 	React.useEffect(t3, t4);
-	let t5;
-	if ($[4] !== location || $[5] !== navigate) {
-		t5 = {
-			location,
+	const t5 = controlledLocation ?? location;
+	let t6;
+	if ($[5] !== navigate || $[6] !== t5) {
+		t6 = {
+			location: t5,
 			navigate
 		};
-		$[4] = location;
 		$[5] = navigate;
 		$[6] = t5;
-	} else t5 = $[6];
-	const value = t5;
-	let t6;
-	if ($[7] !== children || $[8] !== value) {
-		t6 = /* @__PURE__ */ jsx(NavigationContext.Provider, {
+		$[7] = t6;
+	} else t6 = $[7];
+	const value = t6;
+	let t7;
+	if ($[8] !== children || $[9] !== value) {
+		t7 = /* @__PURE__ */ jsx(NavigationContext.Provider, {
 			value,
 			children
 		});
-		$[7] = children;
-		$[8] = value;
-		$[9] = t6;
-	} else t6 = $[9];
-	return t6;
+		$[8] = children;
+		$[9] = value;
+		$[10] = t7;
+	} else t7 = $[10];
+	return t7;
 }
 function useLocation(options) {
 	const context = React.useContext(NavigationContext);
@@ -98,10 +101,10 @@ function useNavigate() {
 	return useNavigate$1();
 }
 const Link = React.forwardRef(function Link(props, ref) {
-	const $ = c(33);
-	if ($[0] !== "ddcd98e64cdc09695f4e9227379a4d90d1598ced9253a16b3dee21623e108a54") {
-		for (let $i = 0; $i < 33; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "ddcd98e64cdc09695f4e9227379a4d90d1598ced9253a16b3dee21623e108a54";
+	const $ = c(34);
+	if ($[0] !== "b077805671357d8c221f5828542d8c58cc7da9751e57801b28455420b1a9209a") {
+		for (let $i = 0; $i < 34; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "b077805671357d8c221f5828542d8c58cc7da9751e57801b28455420b1a9209a";
 	}
 	const context = React.useContext(NavigationContext);
 	if (!context) {
@@ -168,10 +171,11 @@ const Link = React.forwardRef(function Link(props, ref) {
 	} else t3 = $[18];
 	const t4 = t3.join(" ") || void 0;
 	let t5;
-	if ($[19] !== context || $[20] !== href || $[21] !== onClick || $[22] !== target) {
+	if ($[19] !== context || $[20] !== href || $[21] !== onClick || $[22] !== props.download || $[23] !== target) {
 		t5 = (event) => {
 			onClick?.(event);
 			if (event.defaultPrevented) return;
+			if (props.download !== void 0) return;
 			if (target && target !== "_self") return;
 			if (event.metaKey || event.altKey || event.ctrlKey || event.shiftKey) return;
 			if (event.button !== 0) return;
@@ -181,11 +185,12 @@ const Link = React.forwardRef(function Link(props, ref) {
 		$[19] = context;
 		$[20] = href;
 		$[21] = onClick;
-		$[22] = target;
-		$[23] = t5;
-	} else t5 = $[23];
+		$[22] = props.download;
+		$[23] = target;
+		$[24] = t5;
+	} else t5 = $[24];
 	let t6;
-	if ($[24] !== activeAnchorProps || $[25] !== children || $[26] !== href || $[27] !== ref || $[28] !== rest || $[29] !== t4 || $[30] !== t5 || $[31] !== target) {
+	if ($[25] !== activeAnchorProps || $[26] !== children || $[27] !== href || $[28] !== ref || $[29] !== rest || $[30] !== t4 || $[31] !== t5 || $[32] !== target) {
 		t6 = /* @__PURE__ */ jsx("a", {
 			...rest,
 			...activeAnchorProps,
@@ -196,16 +201,16 @@ const Link = React.forwardRef(function Link(props, ref) {
 			onClick: t5,
 			children
 		});
-		$[24] = activeAnchorProps;
-		$[25] = children;
-		$[26] = href;
-		$[27] = ref;
-		$[28] = rest;
-		$[29] = t4;
-		$[30] = t5;
-		$[31] = target;
-		$[32] = t6;
-	} else t6 = $[32];
+		$[25] = activeAnchorProps;
+		$[26] = children;
+		$[27] = href;
+		$[28] = ref;
+		$[29] = rest;
+		$[30] = t4;
+		$[31] = t5;
+		$[32] = target;
+		$[33] = t6;
+	} else t6 = $[33];
 	return t6;
 });
 function Navigate({ replace, to }) {

package/dist/features/page/DerivedPageContent.js

@@ -0,0 +1,61 @@
+import { usePageBlocks } from "../../lib/normalized-data.js";
+import { SharedLayoutContent } from "./SharedLayoutContent.js";
+import { c } from "react/compiler-runtime";
+import { jsx } from "react/jsx-runtime";
+
+//#region src/features/page/DerivedPageContent.tsx
+const EMPTY_PAGE = { blockIds: [] };
+function DerivedPageContent(t0) {
+	const $ = c(15);
+	if ($[0] !== "6487df3c34ea736b7fe1e429fb8204e3df36577cbc2cd7e7dcc4f965d8f49c56") {
+		for (let $i = 0; $i < 15; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "6487df3c34ea736b7fe1e429fb8204e3df36577cbc2cd7e7dcc4f965d8f49c56";
+	}
+	const { camoxApp, derived, source } = t0;
+	let t1;
+	if ($[1] !== derived.layout) {
+		t1 = {
+			page: EMPTY_PAGE,
+			layout: derived.layout
+		};
+		$[1] = derived.layout;
+		$[2] = t1;
+	} else t1 = $[2];
+	const { beforeBlocks, afterBlocks, layoutFiles, layoutItems } = usePageBlocks(t1, source);
+	let t2;
+	if ($[3] !== camoxApp || $[4] !== derived.layoutId) {
+		t2 = camoxApp.getLayoutById(derived.layoutId);
+		$[3] = camoxApp;
+		$[4] = derived.layoutId;
+		$[5] = t2;
+	} else t2 = $[5];
+	const layout = t2;
+	if (!layout) throw new Error(`Unknown derived layout: ${derived.layoutId}`);
+	let t3;
+	if ($[6] !== afterBlocks || $[7] !== beforeBlocks) {
+		t3 = [...beforeBlocks, ...afterBlocks];
+		$[6] = afterBlocks;
+		$[7] = beforeBlocks;
+		$[8] = t3;
+	} else t3 = $[8];
+	let t4;
+	if ($[9] !== derived.data || $[10] !== layout || $[11] !== layoutFiles || $[12] !== layoutItems || $[13] !== t3) {
+		t4 = /* @__PURE__ */ jsx(SharedLayoutContent, {
+			layout,
+			data: derived.data,
+			blocks: t3,
+			files: layoutFiles,
+			repeatableItems: layoutItems
+		});
+		$[9] = derived.data;
+		$[10] = layout;
+		$[11] = layoutFiles;
+		$[12] = layoutItems;
+		$[13] = t3;
+		$[14] = t4;
+	} else t4 = $[14];
+	return t4;
+}
+
+//#endregion
+export { DerivedPageContent };

package/dist/features/page/PublishedPageContent.js

@@ -5,9 +5,9 @@ import { viewBlockQueries } from "../../lib/view-queries.js";
 import { NormalizedDataProvider, usePageBlocks } from "../../lib/normalized-data.js";
 import { BlockErrorBoundary } from "../preview/components/BlockErrorBoundary.js";
 import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
+import { SharedLayoutContent } from "./SharedLayoutContent.js";
 import { c } from "react/compiler-runtime";
 import { useSuspenseQuery } from "@tanstack/react-query";
-import "react";
 import { jsx } from "react/jsx-runtime";
 import { queryKeys } from "@camox/api-contract/query-keys";
 
@@ -21,9 +21,9 @@ function pageStructureQueryFn(path, projectSlug, source) {
 }
 function PublishedBlock(t0) {
 	const $ = c(21);
-	if ($[0] !== "6b1d872701fbf673bbf88f17d9fcd827a3ba76fd3c668c35080c3a59e9b03bf1") {
+	if ($[0] !== "d19cbe1f618268fc303b4603ba9a175ff1c94ca8d6fa7a8f779112900a3487f5") {
 		for (let $i = 0; $i < 21; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "6b1d872701fbf673bbf88f17d9fcd827a3ba76fd3c668c35080c3a59e9b03bf1";
+		$[0] = "d19cbe1f618268fc303b4603ba9a175ff1c94ca8d6fa7a8f779112900a3487f5";
 	}
 	const { blockId, mode, source } = t0;
 	let t1;
@@ -96,10 +96,10 @@ function PublishedBlock(t0) {
 	return t12;
 }
 function PublishedPageContent(t0) {
-	const $ = c(35);
-	if ($[0] !== "6b1d872701fbf673bbf88f17d9fcd827a3ba76fd3c668c35080c3a59e9b03bf1") {
-		for (let $i = 0; $i < 35; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "6b1d872701fbf673bbf88f17d9fcd827a3ba76fd3c668c35080c3a59e9b03bf1";
+	const $ = c(30);
+	if ($[0] !== "d19cbe1f618268fc303b4603ba9a175ff1c94ca8d6fa7a8f779112900a3487f5") {
+		for (let $i = 0; $i < 30; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "d19cbe1f618268fc303b4603ba9a175ff1c94ca8d6fa7a8f779112900a3487f5";
 	}
 	const { source } = t0;
 	const { pathname } = useLocation();
@@ -142,94 +142,63 @@ function PublishedPageContent(t0) {
 	} else t4 = $[13];
 	const layout = t4;
 	let t5;
-	bb0: {
-		if (!pageData.layout) {
-			t5 = null;
-			break bb0;
-		}
-		let blocks;
-		if ($[14] !== afterBlocks || $[15] !== beforeBlocks) {
-			blocks = {};
-			for (const block of [...beforeBlocks, ...afterBlocks]) blocks[block.type] = {
-				_id: block.id,
-				type: block.type,
-				content: block.content,
-				settings: block.settings,
-				position: String(block.position)
-			};
-			$[14] = afterBlocks;
-			$[15] = beforeBlocks;
-			$[16] = blocks;
-		} else blocks = $[16];
-		t5 = blocks;
-	}
-	const layoutBlocksMap = t5;
-	let t6;
-	if ($[17] !== pageBlocks || $[18] !== source) {
-		let t7;
-		if ($[20] !== source) {
-			t7 = (block_0) => /* @__PURE__ */ jsx(BlockErrorBoundary, {
-				blockId: block_0.id,
-				blockType: block_0.type,
+	if ($[14] !== pageBlocks || $[15] !== source) {
+		let t6;
+		if ($[17] !== source) {
+			t6 = (block) => /* @__PURE__ */ jsx(BlockErrorBoundary, {
+				blockId: block.id,
+				blockType: block.type,
 				children: /* @__PURE__ */ jsx(PublishedBlock, {
-					blockId: block_0.id,
+					blockId: block.id,
 					mode: "site",
 					source
 				})
-			}, block_0.id);
-			$[20] = source;
-			$[21] = t7;
-		} else t7 = $[21];
-		t6 = pageBlocks.map(t7);
-		$[17] = pageBlocks;
-		$[18] = source;
-		$[19] = t6;
-	} else t6 = $[19];
-	const pageBlocksContent = t6;
-	if (!layout || !layoutBlocksMap) {
-		let t7;
-		if ($[22] !== pageBlocksContent) {
-			t7 = /* @__PURE__ */ jsx("main", {
+			}, block.id);
+			$[17] = source;
+			$[18] = t6;
+		} else t6 = $[18];
+		t5 = pageBlocks.map(t6);
+		$[14] = pageBlocks;
+		$[15] = source;
+		$[16] = t5;
+	} else t5 = $[16];
+	const pageBlocksContent = t5;
+	if (!layout) {
+		let t6;
+		if ($[19] !== pageBlocksContent) {
+			t6 = /* @__PURE__ */ jsx("main", {
 				className: "flex min-h-screen flex-col",
 				children: pageBlocksContent
 			});
-			$[22] = pageBlocksContent;
-			$[23] = t7;
-		} else t7 = $[23];
-		return t7;
+			$[19] = pageBlocksContent;
+			$[20] = t6;
+		} else t6 = $[20];
+		return t6;
 	}
-	const LayoutComponent = layout._internal.component;
+	let t6;
+	if ($[21] !== afterBlocks || $[22] !== beforeBlocks) {
+		t6 = [...beforeBlocks, ...afterBlocks];
+		$[21] = afterBlocks;
+		$[22] = beforeBlocks;
+		$[23] = t6;
+	} else t6 = $[23];
 	let t7;
-	if ($[24] !== LayoutComponent || $[25] !== pageBlocksContent) {
-		t7 = /* @__PURE__ */ jsx(LayoutComponent, { children: pageBlocksContent });
-		$[24] = LayoutComponent;
-		$[25] = pageBlocksContent;
-		$[26] = t7;
-	} else t7 = $[26];
-	let t8;
-	if ($[27] !== layout._internal.Provider || $[28] !== layoutBlocksMap || $[29] !== t7) {
-		t8 = /* @__PURE__ */ jsx(layout._internal.Provider, {
-			layoutBlocks: layoutBlocksMap,
-			children: t7
-		});
-		$[27] = layout._internal.Provider;
-		$[28] = layoutBlocksMap;
-		$[29] = t7;
-		$[30] = t8;
-	} else t8 = $[30];
-	let t9;
-	if ($[31] !== layoutFiles || $[32] !== layoutItems || $[33] !== t8) {
-		t9 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
+	if ($[24] !== layout || $[25] !== layoutFiles || $[26] !== layoutItems || $[27] !== pageBlocksContent || $[28] !== t6) {
+		t7 = /* @__PURE__ */ jsx(SharedLayoutContent, {
+			layout,
+			blocks: t6,
 			files: layoutFiles,
 			repeatableItems: layoutItems,
-			children: t8
+			children: pageBlocksContent
 		});
-		$[31] = layoutFiles;
-		$[32] = layoutItems;
-		$[33] = t8;
-		$[34] = t9;
-	} else t9 = $[34];
-	return t9;
+		$[24] = layout;
+		$[25] = layoutFiles;
+		$[26] = layoutItems;
+		$[27] = pageBlocksContent;
+		$[28] = t6;
+		$[29] = t7;
+	} else t7 = $[29];
+	return t7;
 }
 
 //#endregion

package/dist/features/page/SharedLayoutContent.js

@@ -0,0 +1,66 @@
+import { NormalizedDataProvider } from "../../lib/normalized-data.js";
+import { c } from "react/compiler-runtime";
+import "react";
+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);
+	if ($[0] !== "ebb40224ff334d8d67c214de65bf725acf95dfbfdf466cb61fb0206cfe7c7851") {
+		for (let $i = 0; $i < 15; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "ebb40224ff334d8d67c214de65bf725acf95dfbfdf466cb61fb0206cfe7c7851";
+	}
+	const { layout, blocks, files, repeatableItems, data, children } = t0;
+	let result;
+	if ($[1] !== blocks) {
+		result = {};
+		for (const block of blocks) result[block.type] = {
+			_id: block.id,
+			type: block.type,
+			content: block.content,
+			settings: block.settings,
+			position: String(block.position)
+		};
+		$[1] = blocks;
+		$[2] = result;
+	} else result = $[2];
+	const layoutBlocks = result;
+	const Component = layout._internal.component;
+	let t1;
+	if ($[3] !== Component || $[4] !== children) {
+		t1 = /* @__PURE__ */ jsx(Component, { children });
+		$[3] = Component;
+		$[4] = children;
+		$[5] = t1;
+	} else t1 = $[5];
+	let t2;
+	if ($[6] !== data || $[7] !== layout._internal.Provider || $[8] !== layoutBlocks || $[9] !== t1) {
+		t2 = /* @__PURE__ */ jsx(layout._internal.Provider, {
+			layoutBlocks,
+			data,
+			children: t1
+		});
+		$[6] = data;
+		$[7] = layout._internal.Provider;
+		$[8] = layoutBlocks;
+		$[9] = t1;
+		$[10] = t2;
+	} else t2 = $[10];
+	let t3;
+	if ($[11] !== files || $[12] !== repeatableItems || $[13] !== t2) {
+		t3 = /* @__PURE__ */ jsx(NormalizedDataProvider, {
+			files,
+			repeatableItems,
+			children: t2
+		});
+		$[11] = files;
+		$[12] = repeatableItems;
+		$[13] = t2;
+		$[14] = t3;
+	} else t3 = $[14];
+	return t3;
+}
+
+//#endregion
+export { SharedLayoutContent };

package/dist/features/preview/CamoxPreview.d.ts

@@ -1,3 +1,4 @@
+import { DerivedLayoutStructure } from "./components/DerivedLayoutSidebar.js";
 import * as React from "react";
 import * as _$react_jsx_runtime0 from "react/jsx-runtime";
 
@@ -47,6 +48,20 @@ declare const CamoxPreview: ({
 }: {
   children: React.ReactNode;
 }) => _$react_jsx_runtime0.JSX.Element;
+/** Studio chrome is shared; only curated previews require a Camox page record. */
+declare const PreviewShell: ({
+  children,
+  pageData,
+  hasLiveVersion,
+  derivedLayoutId,
+  derivedLayout
+}: {
+  children: React.ReactNode;
+  pageData?: ReturnType<typeof usePreviewedPage>;
+  hasLiveVersion?: boolean;
+  derivedLayoutId?: string;
+  derivedLayout?: DerivedLayoutStructure;
+}) => _$react_jsx_runtime0.JSX.Element;
 declare function usePreviewPagesActions(): void;
 //#endregion
-export { CamoxPreview, PageContent, usePreviewPagesActions, usePreviewedPage };
+export { CamoxPreview, PageContent, PreviewShell, usePreviewPagesActions, usePreviewedPage };