camox 0.48.0 → 0.52.1

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

@@ -2,9 +2,7 @@ import { useProjectUuid } from "../../../lib/auth.js";
 import { useOptionalDraftScope } from "../../../lib/draft-scope.js";
 import { useViewLocale } from "../../../lib/view-locale-context.js";
 import { useNavigate } from "../../navigation/navigation.js";
-import { useCamoxApp } from "../../provider/components/CamoxAppContext.js";
 import { reads, useReadQuery, useStudioCache } from "../../../lib/studio-reads.js";
-import { curatedLayoutContext } from "../../../core/layoutContext.js";
 import { cn } from "../../../lib/utils.js";
 import { UploadDropZone } from "../../content/components/UploadDropZone.js";
 import { pageMutations } from "../../../lib/queries.js";
@@ -14,6 +12,7 @@ import { Metadata, MetadataRow, formatRelativeTime } from "./Metadata.js";
 import { useLocalizedPath } from "../../../lib/view-locale.js";
 import { PageNicknameField } from "./PageNicknameField.js";
 import { PageInfoSkeleton } from "./PageInfoSkeleton.js";
+import { useRendererAnswer } from "../../renderer/RendererFrames.js";
 import { PageLocationFieldset } from "./PageLocationFieldset.js";
 import { pageImageUrl } from "../../og/pageImage.js";
 import { ShikiMarkdown } from "./ShikiMarkdown.js";
@@ -41,9 +40,8 @@ import { Checkbox } from "@camox/ui/checkbox";
 
 //#region src/features/preview/components/PageInfo.tsx
 const usePageMetadataData = (pageId) => {
-	const $ = c(23);
+	const $ = c(31);
 	const projectUuid = useProjectUuid();
-	const camoxApp = useCamoxApp();
 	let t0;
 	if ($[0] !== pageId) {
 		t0 = reads.page({ id: pageId });
@@ -87,48 +85,79 @@ const usePageMetadataData = (pageId) => {
 	} else t7 = $[11];
 	const { data: allLayouts } = useReadQuery(t5, t7);
 	let t8;
-	if ($[12] !== allLayouts || $[13] !== camoxApp) {
-		t8 = allLayouts?.filter((layout) => camoxApp.getLayoutById(layout.layoutId)?._internal.kind === "curated");
+	if ($[12] !== allLayouts) {
+		t8 = allLayouts?.filter(_temp).map(_temp2);
 		$[12] = allLayouts;
-		$[13] = camoxApp;
-		$[14] = t8;
-	} else t8 = $[14];
+		$[13] = t8;
+	} else t8 = $[13];
 	const layouts = t8;
-	const pageLayoutRecord = allLayouts?.find((l) => l.layoutId === page?.layoutId);
-	const layoutDef = pageLayoutRecord ? camoxApp.getLayoutById(pageLayoutRecord.layoutId) : void 0;
-	const { locale } = useViewLocale();
-	const metaTitle = layoutDef && page ? layoutDef._internal.toTitle(curatedLayoutContext({
-		page,
-		projectName: project?.name ?? ""
-	}, locale)) : page?.metaTitle ?? "";
 	let t9;
-	if ($[15] !== camoxApp || $[16] !== layouts || $[17] !== metaTitle || $[18] !== page || $[19] !== pageLayoutRecord || $[20] !== pages || $[21] !== project) {
-		t9 = {
+	if ($[14] !== allLayouts || $[15] !== page?.layoutId) {
+		t9 = allLayouts?.find((l) => l.layoutId === page?.layoutId);
+		$[14] = allLayouts;
+		$[15] = page?.layoutId;
+		$[16] = t9;
+	} else t9 = $[16];
+	const pageLayoutRecord = t9;
+	const { locale } = useViewLocale();
+	let t10;
+	if ($[17] !== locale || $[18] !== page || $[19] !== pageLayoutRecord || $[20] !== project?.name) {
+		t10 = pageLayoutRecord && page ? {
+			layoutId: pageLayoutRecord.layoutId,
+			page: {
+				fullPath: page.fullPath,
+				nickname: page.nickname,
+				metaTitle: page.metaTitle,
+				metaDescription: page.metaDescription,
+				firstPublishedAt: page.firstPublishedAt,
+				publishedAt: page.publishedAt
+			},
+			projectName: project?.name ?? "",
+			locale
+		} : null;
+		$[17] = locale;
+		$[18] = page;
+		$[19] = pageLayoutRecord;
+		$[20] = project?.name;
+		$[21] = t10;
+	} else t10 = $[21];
+	const titled = t10;
+	let t11;
+	if ($[22] !== titled) {
+		t11 = titled ? {
+			type: "pageTitle",
+			...titled
+		} : null;
+		$[22] = titled;
+		$[23] = t11;
+	} else t11 = $[23];
+	const metaTitle = useRendererAnswer(t11) ?? page?.metaTitle ?? "";
+	let t12;
+	if ($[24] !== layouts || $[25] !== metaTitle || $[26] !== page || $[27] !== pageLayoutRecord || $[28] !== pages || $[29] !== project) {
+		t12 = {
 			page,
 			project,
 			pages,
 			layouts,
 			pageLayoutRecord,
-			metaTitle,
-			camoxApp
+			metaTitle
 		};
-		$[15] = camoxApp;
-		$[16] = layouts;
-		$[17] = metaTitle;
-		$[18] = page;
-		$[19] = pageLayoutRecord;
-		$[20] = pages;
-		$[21] = project;
-		$[22] = t9;
-	} else t9 = $[22];
-	return t9;
+		$[24] = layouts;
+		$[25] = metaTitle;
+		$[26] = page;
+		$[27] = pageLayoutRecord;
+		$[28] = pages;
+		$[29] = project;
+		$[30] = t12;
+	} else t12 = $[30];
+	return t12;
 };
 const PAGE_SETTINGS_ITEM = "page-settings";
 const SHOW_PAGE_SETTINGS_STORAGE_KEY = "camox:studio:showPageSettings";
 /** Whether the page info shows its settings, remembered across pages and sessions. */
 const useShowPageSettings = () => {
 	const $ = c(3);
-	const [show, setShow] = React.useState(_temp);
+	const [show, setShow] = React.useState(_temp3);
 	let t0;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
 		t0 = (next) => {
@@ -515,7 +544,7 @@ const PageNicknameEditor = (t0) => {
 				nickname,
 				pathSegment: page.pathSegment,
 				parentPageId: page.parentPageId
-			}, { onError: _temp2 });
+			}, { onError: _temp4 });
 		};
 		$[1] = page;
 		$[2] = updatePage;
@@ -584,9 +613,9 @@ const PageNicknameEditor = (t0) => {
 	return t8;
 };
 const PageLayoutSelect = (t0) => {
-	const $ = c(28);
+	const $ = c(22);
 	const { data } = t0;
-	const { page, layouts, camoxApp } = data;
+	const { page, layouts } = data;
 	let t1;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
 		t1 = pageMutations.setLayout();
@@ -618,7 +647,7 @@ const PageLayoutSelect = (t0) => {
 			setLayout.mutate({
 				id: page.id,
 				layoutId
-			}, { onError: _temp3 });
+			}, { onError: _temp5 });
 		};
 		$[3] = page.id;
 		$[4] = page.layoutId;
@@ -626,60 +655,40 @@ const PageLayoutSelect = (t0) => {
 		$[6] = t5;
 	} else t5 = $[6];
 	let t6;
-	if ($[7] !== camoxApp || $[8] !== layouts) {
-		let t7;
-		if ($[10] !== camoxApp) {
-			t7 = (t) => ({
-				value: t.layoutId,
-				label: camoxApp.getLayoutById(t.layoutId)?._internal.title ?? t.layoutId
-			});
-			$[10] = camoxApp;
-			$[11] = t7;
-		} else t7 = $[11];
-		t6 = layouts.map(t7);
-		$[7] = camoxApp;
-		$[8] = layouts;
-		$[9] = t6;
-	} else t6 = $[9];
+	if ($[7] !== layouts) {
+		t6 = layouts.map(_temp6);
+		$[7] = layouts;
+		$[8] = t6;
+	} else t6 = $[8];
 	let t7;
-	if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
 		t7 = /* @__PURE__ */ jsx(SelectValue, { placeholder: "Select a layout" });
-		$[12] = t7;
-	} else t7 = $[12];
+		$[9] = t7;
+	} else t7 = $[9];
 	let t8;
-	if ($[13] !== setLayout.isPending) {
+	if ($[10] !== setLayout.isPending) {
 		t8 = /* @__PURE__ */ jsx(SelectTrigger, {
 			disabled: setLayout.isPending,
 			className: "w-full",
 			children: t7
 		});
-		$[13] = setLayout.isPending;
-		$[14] = t8;
-	} else t8 = $[14];
+		$[10] = setLayout.isPending;
+		$[11] = t8;
+	} else t8 = $[11];
 	let t9;
-	if ($[15] !== camoxApp || $[16] !== layouts) {
-		let t10;
-		if ($[18] !== camoxApp) {
-			t10 = (t_0) => /* @__PURE__ */ jsx(SelectItem, {
-				value: t_0.layoutId,
-				children: camoxApp.getLayoutById(t_0.layoutId)?._internal.title ?? t_0.layoutId
-			}, t_0.layoutId);
-			$[18] = camoxApp;
-			$[19] = t10;
-		} else t10 = $[19];
-		t9 = layouts.map(t10);
-		$[15] = camoxApp;
-		$[16] = layouts;
-		$[17] = t9;
-	} else t9 = $[17];
+	if ($[12] !== layouts) {
+		t9 = layouts.map(_temp7);
+		$[12] = layouts;
+		$[13] = t9;
+	} else t9 = $[13];
 	let t10;
-	if ($[20] !== t9) {
+	if ($[14] !== t9) {
 		t10 = /* @__PURE__ */ jsx(SelectContent, { children: t9 });
-		$[20] = t9;
-		$[21] = t10;
-	} else t10 = $[21];
+		$[14] = t9;
+		$[15] = t10;
+	} else t10 = $[15];
 	let t11;
-	if ($[22] !== page.layoutId || $[23] !== t10 || $[24] !== t5 || $[25] !== t6 || $[26] !== t8) {
+	if ($[16] !== page.layoutId || $[17] !== t10 || $[18] !== t5 || $[19] !== t6 || $[20] !== t8) {
 		t11 = /* @__PURE__ */ jsxs("div", {
 			className: "space-y-2",
 			children: [t3, /* @__PURE__ */ jsxs(Select, {
@@ -689,13 +698,13 @@ const PageLayoutSelect = (t0) => {
 				children: [t8, t10]
 			})]
 		});
-		$[22] = page.layoutId;
-		$[23] = t10;
-		$[24] = t5;
-		$[25] = t6;
-		$[26] = t8;
-		$[27] = t11;
-	} else t11 = $[27];
+		$[16] = page.layoutId;
+		$[17] = t10;
+		$[18] = t5;
+		$[19] = t6;
+		$[20] = t8;
+		$[21] = t11;
+	} else t11 = $[21];
 	return t11;
 };
 const PageStructureModal = (t0) => {
@@ -765,11 +774,11 @@ const PageStructureModal = (t0) => {
 	return t7;
 };
 const PageStructureEditor = (t0) => {
-	const $ = c(37);
+	const $ = c(36);
 	const { data, includeNickname: t1, includeLayout: t2, onSaved } = t0;
 	const includeNickname = t1 === void 0 ? true : t1;
 	const includeLayout = t2 === void 0 ? true : t2;
-	const { page, project, pages, layouts, camoxApp } = data;
+	const { page, project, pages, layouts } = data;
 	let t3;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
 		t3 = pageMutations.update();
@@ -880,7 +889,7 @@ const PageStructureEditor = (t0) => {
 	if ($[16] !== form.Field || $[17] !== includeNickname) {
 		t15 = includeNickname && /* @__PURE__ */ jsx(form.Field, {
 			name: "nickname",
-			children: _temp4
+			children: _temp8
 		});
 		$[16] = form.Field;
 		$[17] = includeNickname;
@@ -913,7 +922,7 @@ const PageStructureEditor = (t0) => {
 		$[23] = t16;
 	} else t16 = $[23];
 	let t17;
-	if ($[24] !== camoxApp || $[25] !== form.Field || $[26] !== includeLayout || $[27] !== layouts) {
+	if ($[24] !== form.Field || $[25] !== includeLayout || $[26] !== layouts) {
 		t17 = includeLayout && layouts && layouts.length > 0 && /* @__PURE__ */ jsx(form.Field, {
 			name: "layoutId",
 			children: (field_0) => /* @__PURE__ */ jsxs("div", {
@@ -923,34 +932,27 @@ const PageStructureEditor = (t0) => {
 					onValueChange: (value) => {
 						if (value != null) field_0.handleChange(value);
 					},
-					items: layouts.map((t) => ({
-						value: t.layoutId,
-						label: camoxApp.getLayoutById(t.layoutId)?._internal.title ?? t.layoutId
-					})),
-					children: [/* @__PURE__ */ jsx(SelectTrigger, { children: /* @__PURE__ */ jsx(SelectValue, { placeholder: "Select a layout" }) }), /* @__PURE__ */ jsx(SelectContent, { children: layouts.map((t_0) => /* @__PURE__ */ jsx(SelectItem, {
-						value: t_0.layoutId,
-						children: camoxApp.getLayoutById(t_0.layoutId)?._internal.title ?? t_0.layoutId
-					}, t_0.layoutId)) })]
+					items: layouts.map(_temp9),
+					children: [/* @__PURE__ */ jsx(SelectTrigger, { children: /* @__PURE__ */ jsx(SelectValue, { placeholder: "Select a layout" }) }), /* @__PURE__ */ jsx(SelectContent, { children: layouts.map(_temp10) })]
 				})]
 			})
 		});
-		$[24] = camoxApp;
-		$[25] = form.Field;
-		$[26] = includeLayout;
-		$[27] = layouts;
-		$[28] = t17;
-	} else t17 = $[28];
+		$[24] = form.Field;
+		$[25] = includeLayout;
+		$[26] = layouts;
+		$[27] = t17;
+	} else t17 = $[27];
 	let t18;
-	if ($[29] !== form.Subscribe) {
+	if ($[28] !== form.Subscribe) {
 		t18 = /* @__PURE__ */ jsx(form.Subscribe, {
-			selector: _temp5,
-			children: _temp6
+			selector: _temp11,
+			children: _temp12
 		});
-		$[29] = form.Subscribe;
-		$[30] = t18;
-	} else t18 = $[30];
+		$[28] = form.Subscribe;
+		$[29] = t18;
+	} else t18 = $[29];
 	let t19;
-	if ($[31] !== t14 || $[32] !== t15 || $[33] !== t16 || $[34] !== t17 || $[35] !== t18) {
+	if ($[30] !== t14 || $[31] !== t15 || $[32] !== t16 || $[33] !== t17 || $[34] !== t18) {
 		t19 = /* @__PURE__ */ jsxs("form", {
 			onSubmit: t14,
 			className: "space-y-4",
@@ -961,13 +963,13 @@ const PageStructureEditor = (t0) => {
 				t18
 			]
 		});
-		$[31] = t14;
-		$[32] = t15;
-		$[33] = t16;
-		$[34] = t17;
-		$[35] = t18;
-		$[36] = t19;
-	} else t19 = $[36];
+		$[30] = t14;
+		$[31] = t15;
+		$[32] = t16;
+		$[33] = t17;
+		$[34] = t18;
+		$[35] = t19;
+	} else t19 = $[35];
 	return t19;
 };
 const PageSeoSheet = (t0) => {
@@ -1401,7 +1403,7 @@ const SocialPreviewSection = (t0) => {
 			onSuccess: () => {
 				studioCache.invalidate(reads.page({ id: page.id }));
 			},
-			onError: _temp7
+			onError: _temp13
 		};
 		$[17] = page.id;
 		$[18] = studioCache;
@@ -1420,7 +1422,7 @@ const SocialPreviewSection = (t0) => {
 			onSuccess: () => {
 				studioCache.invalidate(reads.page({ id: page.id }));
 			},
-			onError: _temp8
+			onError: _temp14
 		};
 		$[21] = page.id;
 		$[22] = studioCache;
@@ -1680,32 +1682,65 @@ const PageMarkdownPreview = (t0) => {
 	} else t4 = $[7];
 	return t4;
 };
-function _temp() {
+function _temp(layout) {
+	return layout.kind === "curated";
+}
+function _temp2(layout_0) {
+	return {
+		...layout_0,
+		title: layout_0.title ?? layout_0.layoutId
+	};
+}
+function _temp3() {
 	try {
 		return localStorage.getItem(SHOW_PAGE_SETTINGS_STORAGE_KEY) === "true";
 	} catch {
 		return false;
 	}
 }
-function _temp2() {
+function _temp4() {
 	toast.error("Could not update page");
 }
-function _temp3() {
+function _temp5() {
 	toast.error("Could not update page layout");
 }
-function _temp4(field) {
+function _temp6(t) {
+	return {
+		value: t.layoutId,
+		label: t.title
+	};
+}
+function _temp7(t_0) {
+	return /* @__PURE__ */ jsx(SelectItem, {
+		value: t_0.layoutId,
+		children: t_0.title
+	}, t_0.layoutId);
+}
+function _temp8(field) {
 	return /* @__PURE__ */ jsx(PageNicknameField, {
 		value: field.state.value,
 		onChange: field.handleChange
 	});
 }
-function _temp5(s) {
+function _temp9(t) {
+	return {
+		value: t.layoutId,
+		label: t.title
+	};
+}
+function _temp10(t_0) {
+	return /* @__PURE__ */ jsx(SelectItem, {
+		value: t_0.layoutId,
+		children: t_0.title
+	}, t_0.layoutId);
+}
+function _temp11(s) {
 	return {
 		isSubmitting: s.isSubmitting,
 		isPristine: s.isPristine
 	};
 }
-function _temp6(t0) {
+function _temp12(t0) {
 	const { isSubmitting, isPristine } = t0;
 	return /* @__PURE__ */ jsxs(Button, {
 		type: "submit",
@@ -1717,10 +1752,10 @@ function _temp6(t0) {
 		]
 	});
 }
-function _temp7(error) {
+function _temp13(error) {
 	toast.error(error.message || "Could not upload image");
 }
-function _temp8() {
+function _temp14() {
 	toast.error("Could not remove image");
 }
 

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

@@ -1,9 +1,9 @@
 import { useProjectUuid } from "../../../lib/auth.js";
 import { useNavigate } from "../../navigation/navigation.js";
-import { useCamoxApp } from "../../provider/components/CamoxAppContext.js";
 import { reads, useReadQuery } from "../../../lib/studio-reads.js";
 import { cn } from "../../../lib/utils.js";
 import { pageMutations } from "../../../lib/queries.js";
+import { useRoutableLayouts } from "../../../lib/studio-definitions.js";
 import { useLocalePath, useLocalizedPath } from "../../../lib/view-locale.js";
 import { previewStore } from "../previewStore.js";
 import { matchDerivedLayout, routeSegments } from "../../../core/derivedRoutes.js";
@@ -24,7 +24,7 @@ const CREATE_PAGE_VALUE = "__create_page__";
 const DERIVED_LAYOUT_PREFIX = "__derived_layout__:";
 const PagePicker = () => {
 	const [open, setOpen] = React.useState(false);
-	const derivedLayouts = useCamoxApp().getLayouts().filter((layout) => layout._internal.kind !== "curated");
+	const derivedLayouts = useRoutableLayouts().filter((layout) => layout._internal.kind !== "curated");
 	const [layoutToPreview, setLayoutToPreview] = React.useState(null);
 	const [pageToDelete, setPageToDelete] = React.useState(null);
 	const projectUuid = useProjectUuid();