camox 0.45.0 → 0.47.0

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

@@ -14,130 +14,116 @@ import * as Tooltip$1 from "@camox/ui/tooltip";
 import { FloatingToolbar } from "@camox/ui/floating-toolbar";
 
 //#region src/features/preview/components/PreviewToolbar.tsx
-const PreviewToolbar = (t0) => {
-	const $ = c(24);
-	const { onCanvasShownChange } = t0;
+const PreviewToolbar = () => {
+	const $ = c(21);
 	const isCanvasShown = useSelector(previewStore, selectIsCanvasShown);
 	const isToolbarHidden = useSelector(previewStore, _temp);
 	const viewportMode = useSelector(previewStore, _temp2);
 	if (isToolbarHidden) return null;
-	let t1;
-	if ($[0] !== onCanvasShownChange) {
-		t1 = (checked) => {
-			if (onCanvasShownChange) {
-				onCanvasShownChange(checked);
-				return;
-			}
-			previewStore.send({ type: checked ? "showCanvas" : "hideCanvas" });
-		};
-		$[0] = onCanvasShownChange;
-		$[1] = t1;
-	} else t1 = $[1];
-	let t2;
-	if ($[2] !== isCanvasShown || $[3] !== t1) {
-		t2 = /* @__PURE__ */ jsx(Switch, {
+	let t0;
+	if ($[0] !== isCanvasShown) {
+		t0 = /* @__PURE__ */ jsx(Switch, {
 			id: "show-canvas",
 			checked: isCanvasShown,
-			onCheckedChange: t1
+			onCheckedChange: _temp3
 		});
-		$[2] = isCanvasShown;
-		$[3] = t1;
-		$[4] = t2;
-	} else t2 = $[4];
-	let t3;
-	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = /* @__PURE__ */ jsxs(Label, {
+		$[0] = isCanvasShown;
+		$[1] = t0;
+	} else t0 = $[1];
+	let t1;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = /* @__PURE__ */ jsxs(Label, {
 			htmlFor: "show-canvas",
 			className: "flex items-center gap-2",
 			children: ["Show canvas ", formatShortcut(TOGGLE_CANVAS_SHORTCUT)]
 		});
-		$[5] = t3;
-	} else t3 = $[5];
-	let t4;
-	if ($[6] !== t2) {
-		t4 = /* @__PURE__ */ jsxs("div", {
+		$[2] = t1;
+	} else t1 = $[2];
+	let t2;
+	if ($[3] !== t0) {
+		t2 = /* @__PURE__ */ jsxs("div", {
 			className: "flex shrink-0 items-center gap-2 px-2",
 			onPointerEnter: prefetchCanvas,
 			onFocus: prefetchCanvas,
-			children: [t2, t3]
+			children: [t0, t1]
 		});
-		$[6] = t2;
-		$[7] = t4;
-	} else t4 = $[7];
-	const t5 = viewportMode === "full" ? "desktop" : viewportMode;
-	let t6;
-	if ($[8] !== t5) {
-		t6 = /* @__PURE__ */ jsx(DeviceSelector, {
-			value: t5,
+		$[3] = t0;
+		$[4] = t2;
+	} else t2 = $[4];
+	const t3 = viewportMode === "full" ? "desktop" : viewportMode;
+	let t4;
+	if ($[5] !== t3) {
+		t4 = /* @__PURE__ */ jsx(DeviceSelector, {
+			value: t3,
 			desktopLabel: "Full view",
-			onValueChange: _temp3
+			onValueChange: _temp4
 		});
-		$[8] = t5;
-		$[9] = t6;
-	} else t6 = $[9];
-	let t7;
-	if ($[10] !== isCanvasShown) {
-		t7 = /* @__PURE__ */ jsx(Button, {
+		$[5] = t3;
+		$[6] = t4;
+	} else t4 = $[6];
+	let t5;
+	if ($[7] !== isCanvasShown) {
+		t5 = /* @__PURE__ */ jsx(Button, {
 			type: "button",
 			variant: "ghost",
 			size: "icon",
 			disabled: isCanvasShown,
-			onClick: _temp4,
+			onClick: _temp5,
 			"aria-label": "Hide toolbar",
 			className: "text-muted-foreground"
 		});
-		$[10] = isCanvasShown;
+		$[7] = isCanvasShown;
+		$[8] = t5;
+	} else t5 = $[8];
+	let t6;
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+		t6 = /* @__PURE__ */ jsx(X, {});
+		$[9] = t6;
+	} else t6 = $[9];
+	let t7;
+	if ($[10] !== t5) {
+		t7 = /* @__PURE__ */ jsx(Tooltip$1.TooltipTrigger, {
+			render: t5,
+			children: t6
+		});
+		$[10] = t5;
 		$[11] = t7;
 	} else t7 = $[11];
 	let t8;
 	if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
-		t8 = /* @__PURE__ */ jsx(X, {});
+		t8 = /* @__PURE__ */ jsx(Tooltip$1.TooltipContent, { children: "Hide toolbar" });
 		$[12] = t8;
 	} else t8 = $[12];
 	let t9;
 	if ($[13] !== t7) {
-		t9 = /* @__PURE__ */ jsx(Tooltip$1.TooltipTrigger, {
-			render: t7,
-			children: t8
+		t9 = /* @__PURE__ */ jsx("div", {
+			className: "-ml-2 flex items-center gap-2",
+			children: /* @__PURE__ */ jsxs(Tooltip$1.Tooltip, { children: [t7, t8] })
 		});
 		$[13] = t7;
 		$[14] = t9;
 	} else t9 = $[14];
 	let t10;
-	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
-		t10 = /* @__PURE__ */ jsx(Tooltip$1.TooltipContent, { children: "Hide toolbar" });
-		$[15] = t10;
-	} else t10 = $[15];
-	let t11;
-	if ($[16] !== t9) {
-		t11 = /* @__PURE__ */ jsx("div", {
-			className: "-ml-2 flex items-center gap-2",
-			children: /* @__PURE__ */ jsxs(Tooltip$1.Tooltip, { children: [t9, t10] })
-		});
-		$[16] = t9;
-		$[17] = t11;
-	} else t11 = $[17];
-	let t12;
-	if ($[18] !== t11 || $[19] !== t6) {
-		t12 = /* @__PURE__ */ jsxs("div", {
+	if ($[15] !== t4 || $[16] !== t9) {
+		t10 = /* @__PURE__ */ jsxs("div", {
 			className: "flex shrink-0 items-center gap-6 self-stretch",
-			children: [t6, t11]
+			children: [t4, t9]
 		});
-		$[18] = t11;
-		$[19] = t6;
-		$[20] = t12;
-	} else t12 = $[20];
-	let t13;
-	if ($[21] !== t12 || $[22] !== t4) {
-		t13 = /* @__PURE__ */ jsxs(FloatingToolbar, {
+		$[15] = t4;
+		$[16] = t9;
+		$[17] = t10;
+	} else t10 = $[17];
+	let t11;
+	if ($[18] !== t10 || $[19] !== t2) {
+		t11 = /* @__PURE__ */ jsxs(FloatingToolbar, {
 			className: "fixed bottom-2 w-max justify-between gap-6 transition-none",
-			children: [t4, t12]
+			children: [t2, t10]
 		});
-		$[21] = t12;
-		$[22] = t4;
-		$[23] = t13;
-	} else t13 = $[23];
-	return t13;
+		$[18] = t10;
+		$[19] = t2;
+		$[20] = t11;
+	} else t11 = $[20];
+	return t11;
 };
 function _temp(state) {
 	return state.context.isToolbarHidden;
@@ -145,13 +131,16 @@ function _temp(state) {
 function _temp2(state_0) {
 	return state_0.context.viewportMode;
 }
-function _temp3(device) {
+function _temp3(checked) {
+	return previewStore.send({ type: checked ? "showCanvas" : "hideCanvas" });
+}
+function _temp4(device) {
 	return previewStore.send({
 		type: "setViewportMode",
 		mode: device === "desktop" ? "full" : device
 	});
 }
-function _temp4() {
+function _temp5() {
 	return previewStore.send({ type: "hideToolbar" });
 }
 

package/dist/features/preview/previewStore.js

@@ -97,7 +97,7 @@ const selectIsCanvasShown = (state) => state.context.view === "canvas";
 const initialPreviewContext = {
 	view: "preview",
 	isToolbarHidden: false,
-	addBlockDialog: null,
+	addBlockSheet: null,
 	isCreatePageModalOpen: false,
 	editingPageId: null,
 	viewportMode: "full",
@@ -150,7 +150,7 @@ const previewStore = createStore({
 			return {
 				...context,
 				editingContext: owner ? targetContext(owner, null) : null,
-				addBlockDialog: null
+				addBlockSheet: null
 			};
 		},
 		activateLayout: (context, event) => {
@@ -162,7 +162,7 @@ const previewStore = createStore({
 			return {
 				...context,
 				editingContext: targetContext(owner, null),
-				addBlockDialog: null
+				addBlockSheet: null
 			};
 		},
 		selectTarget: (context, event) => ({
@@ -175,7 +175,7 @@ const previewStore = createStore({
 				type: "block",
 				blockId: event.blockId
 			}),
-			addBlockDialog: null
+			addBlockSheet: null
 		}),
 		selectItem: (context, event) => ({
 			...context,
@@ -312,13 +312,13 @@ const previewStore = createStore({
 				selection: null
 			} : null
 		}),
-		openAddBlockDialog: (context, event) => ({
+		openAddBlockSheet: (context, event) => ({
 			...context,
-			addBlockDialog: { afterPosition: event.afterPosition }
+			addBlockSheet: { afterPosition: event.afterPosition }
 		}),
-		closeAddBlockDialog: (context) => ({
+		closeAddBlockSheet: (context) => ({
 			...context,
-			addBlockDialog: null
+			addBlockSheet: null
 		}),
 		focusCreatedBlock: (context, event) => ({
 			...context,
@@ -326,7 +326,7 @@ const previewStore = createStore({
 				type: "block",
 				blockId: event.blockId
 			}),
-			addBlockDialog: null
+			addBlockSheet: null
 		}),
 		openCreatePageModal: (context) => ({
 			...context,

package/dist/features/provider/CamoxProvider.js

@@ -1,17 +1,17 @@
 import { useSignInRedirect } from "../../lib/auth.js";
 import { useLocation } from "../navigation/navigation.js";
+import { useSignInShortcut } from "./signInShortcut.js";
 import { STUDIO_BASE_PATH } from "../studio/routes.js";
 import { AuthGate } from "../../components/AuthGate.js";
 import { AuthenticatedCamoxProvider } from "./AuthenticatedCamoxProvider.js";
-import { CoreCamoxProvider, isLocalhostPreview } from "./CoreCamoxProvider.js";
-import { LocalhostPreviewProvider } from "./LocalhostPreviewProvider.js";
+import { CoreCamoxProvider } from "./CoreCamoxProvider.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/features/provider/CamoxProvider.tsx
 function UnauthenticatedExperience(t0) {
-	const $ = c(12);
+	const $ = c(10);
 	const { children } = t0;
 	const { pathname } = useLocation();
 	let t1;
@@ -48,25 +48,17 @@ function UnauthenticatedExperience(t0) {
 		t4 = $[7];
 	}
 	React.useEffect(t3, t4);
+	useSignInShortcut(!isStudio);
 	if (isStudio) return null;
-	if (isLocalhostPreview()) {
-		let t5;
-		if ($[8] !== children) {
-			t5 = /* @__PURE__ */ jsx(LocalhostPreviewProvider, { children });
-			$[8] = children;
-			$[9] = t5;
-		} else t5 = $[9];
-		return t5;
-	}
 	let t5;
-	if ($[10] !== children) {
+	if ($[8] !== children) {
 		t5 = /* @__PURE__ */ jsx("div", {
 			className: "bg-background min-h-screen",
 			children
 		});
-		$[10] = children;
-		$[11] = t5;
-	} else t5 = $[11];
+		$[8] = children;
+		$[9] = t5;
+	} else t5 = $[9];
 	return t5;
 }
 function CamoxProvider(props) {

package/dist/features/provider/CoreCamoxProvider.js

@@ -9,11 +9,6 @@ import { jsx } from "react/jsx-runtime";
 import { replaceEqualDeep, useQueryClient } from "@tanstack/react-query";
 
 //#region src/features/provider/CoreCamoxProvider.tsx
-function isLocalhostPreview() {
-	if (typeof window === "undefined") return false;
-	const { hostname } = window.location;
-	return hostname === "localhost" || hostname.endsWith(".localhost") || hostname === "127.0.0.1" || hostname === "[::1]" || hostname === "::1";
-}
 function CoreCamoxProvider({ apiUrl, authenticationUrl, camoxApp, children, projectUuid, initialAuthenticated = false, initialProject }) {
 	const queryClient = useQueryClient();
 	const authClient = React.useMemo(() => createCamoxAuthClient(apiUrl), [apiUrl]);
@@ -42,23 +37,26 @@ function CoreCamoxProvider({ apiUrl, authenticationUrl, camoxApp, children, proj
 		if (!cached || replaceEqualDeep(cached, initialProject) !== cached) studioCache.set(read, initialProject);
 		seededProject.current = initialProject;
 	}
+	const { ready, error } = useProcessOtt(authClient, {
+		projectUuid,
+		apiUrl
+	}, initialAuthenticated);
+	const exchangingToken = !ready;
 	const authContext = React.useMemo(() => ({
 		authClient,
 		authenticationUrl,
 		apiUrl,
 		projectUuid,
-		initialAuthenticated
+		initialAuthenticated,
+		exchangingToken
 	}), [
 		authClient,
 		authenticationUrl,
 		apiUrl,
 		projectUuid,
-		initialAuthenticated
+		initialAuthenticated,
+		exchangingToken
 	]);
-	const { ready, error } = useProcessOtt(authClient, {
-		projectUuid,
-		apiUrl
-	}, initialAuthenticated);
 	const [isPreviewHandoff, setIsPreviewHandoff] = React.useState(false);
 	React.useEffect(() => {
 		setIsPreviewHandoff(new URL(window.location.href).searchParams.has("camox-preview"));
@@ -91,4 +89,4 @@ function createWindowDraftScope(queryClient) {
 }
 
 //#endregion
-export { CoreCamoxProvider, isLocalhostPreview };
+export { CoreCamoxProvider };

package/dist/features/provider/signInShortcut.js

@@ -0,0 +1,60 @@
+import { useSignInRedirect } from "../../lib/auth.js";
+import { TOGGLE_CANVAS_SHORTCUT } from "../preview/previewConstants.js";
+import { c } from "react/compiler-runtime";
+import * as React from "react";
+
+//#region src/features/provider/signInShortcut.ts
+/** Marks the URL a sign-in returns to, so the Studio opens on the Canvas there. */
+const SHOW_CANVAS_PARAM = "camox-show-canvas";
+function showCanvasCallbackHref() {
+	const url = new URL(window.location.href);
+	url.searchParams.set(SHOW_CANVAS_PARAM, "");
+	return url.href;
+}
+function isTyping() {
+	const element = document.activeElement;
+	return element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement || element instanceof HTMLElement && element.isContentEditable;
+}
+/**
+* While signed out, the shortcut that shows the Canvas signs in instead, then shows the Canvas
+* on the page it was pressed on. Fields keep it, since sites often submit forms with it.
+*/
+function useSignInShortcut(enabled) {
+	const $ = c(4);
+	const signIn = useSignInRedirect(showCanvasCallbackHref);
+	let t0;
+	let t1;
+	if ($[0] !== enabled || $[1] !== signIn) {
+		t0 = () => {
+			if (!enabled) return;
+			const handleKeyDown = (event) => {
+				if (event.key !== TOGGLE_CANVAS_SHORTCUT.key || !(event.metaKey || event.ctrlKey)) return;
+				if (event.altKey || event.shiftKey || event.defaultPrevented || isTyping()) return;
+				event.preventDefault();
+				signIn();
+			};
+			window.addEventListener("keydown", handleKeyDown);
+			return () => window.removeEventListener("keydown", handleKeyDown);
+		};
+		t1 = [enabled, signIn];
+		$[0] = enabled;
+		$[1] = signIn;
+		$[2] = t0;
+		$[3] = t1;
+	} else {
+		t0 = $[2];
+		t1 = $[3];
+	}
+	React.useEffect(t0, t1);
+}
+/** Whether a sign-in from the shortcut led here. Removes the mark, so it shows the Canvas once. */
+function takeShowCanvasRequest() {
+	const url = new URL(window.location.href);
+	if (!url.searchParams.has(SHOW_CANVAS_PARAM)) return false;
+	url.searchParams.delete(SHOW_CANVAS_PARAM);
+	window.history.replaceState(window.history.state, "", url);
+	return true;
+}
+
+//#endregion
+export { takeShowCanvasRequest, useSignInShortcut };

package/dist/features/routes/pageRuntime.js

@@ -174,16 +174,16 @@ async function resolveMemberProject({ apiUrl, authCookieHeader, projectUuid }) {
 	}
 }
 /**
-* The project's favicon, which falls back to the Camox mark when none was uploaded. Pass
-* `placeholder: false` to get a 404 instead, to learn whether there is one.
+* The project's favicon, which falls back to the default favicon when none was uploaded.
+* Pass `withDefault: false` to get a 404 instead, to learn whether there is one.
 */
-function buildFaviconUrl(apiUrl, project, { placeholder = true } = {}) {
+function buildFaviconUrl(apiUrl, project, { withDefault = true } = {}) {
 	const url = `${apiUrl}/favicons/${project.id}?v=${project.updatedAt}`;
-	return placeholder ? `${url}&placeholder=camox` : url;
+	return withDefault ? `${url}&default=camox` : url;
 }
-/** The Camox mark a project without a favicon shows. */
-function buildFaviconPlaceholderUrl(apiUrl) {
-	return `${apiUrl}/favicons/placeholder`;
+/** The default favicon, shown by a project without its own. */
+function buildDefaultFaviconUrl(apiUrl) {
+	return `${apiUrl}/favicons/default`;
 }
 function buildCamoxPageLoaderData(apiUrl, page, origin) {
 	return {
@@ -340,4 +340,4 @@ function buildCamoxPageHead(camoxApp, loaderData, locale) {
 }
 
 //#endregion
-export { buildCamoxPageHead, buildCamoxPageLoaderData, buildFaviconPlaceholderUrl, buildFaviconUrl, buildPageHead, buildPageMeta, createMarkdownResponse, createServerApiClient, createServerStudioCache, getMarkdownPath, isAuthSessionError, isNotFoundError, loadCamoxPage, loadCamoxPageForRequest, parseMarkdownPath, parseQuality, prefersMarkdown, readDraftOrLive, readScopeLocales, renderedHref, resolveMemberProject, withFrontMatter };
+export { buildCamoxPageHead, buildCamoxPageLoaderData, buildDefaultFaviconUrl, buildFaviconUrl, buildPageHead, buildPageMeta, createMarkdownResponse, createServerApiClient, createServerStudioCache, getMarkdownPath, isAuthSessionError, isNotFoundError, loadCamoxPage, loadCamoxPageForRequest, parseMarkdownPath, parseQuality, prefersMarkdown, readDraftOrLive, readScopeLocales, renderedHref, resolveMemberProject, withFrontMatter };

package/dist/features/runtime/RuntimeChrome.js

@@ -1,8 +1,8 @@
 import { previewStore, selectIsCanvasShown } from "../preview/previewStore.js";
 import { shownRecordPage } from "../preview/pageRecord.js";
 import { Navbar } from "../studio/components/Navbar.js";
-import { PreviewToolbar } from "../preview/components/PreviewToolbar.js";
 import { EditingFallbackContext } from "./editingFallback.js";
+import { PreviewToolbar } from "../preview/components/PreviewToolbar.js";
 import { StudioEditingFallback } from "../preview/components/StudioEditingFallback.js";
 import { ChatSidebar } from "../studio/components/ChatSidebar.js";
 import { FollowAgentProvider } from "../studio/FollowAgentProvider.js";

package/dist/features/runtime/pageApp.js

@@ -1,11 +1,12 @@
 import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
 import { DraftScopeContext } from "../../lib/draft-scope.js";
 import { DerivedPageContent } from "../page/DerivedPageContent.js";
+import { useSignInShortcut } from "../provider/signInShortcut.js";
 import { PreviewDocumentContext } from "./PreviewDocumentContext.js";
 import { PreviewActivation } from "../preview/components/PreviewActivation.js";
 import { Frame } from "../preview/components/Frame.js";
 import { PreviewSignInPage } from "../provider/PreviewSignInPage.js";
-import { CoreCamoxProvider, isLocalhostPreview } from "../provider/CoreCamoxProvider.js";
+import { CoreCamoxProvider } from "../provider/CoreCamoxProvider.js";
 import { CuratedPageContent } from "../page/CuratedPageContent.js";
 import { EditingFallbackSlot } from "./editingFallback.js";
 import { PageNavigationProvider } from "./pageNavigation.js";
@@ -96,7 +97,6 @@ function PageApp(t0) {
 	return t6;
 }
 const LazyEditablePageExperience = React.lazy(() => import("../preview/EditablePageExperience.js").then((module) => ({ default: module.EditablePageExperience })));
-const LazyLocalhostPreviewProvider = React.lazy(() => import("../provider/LocalhostPreviewProvider.js").then((module) => ({ default: module.LocalhostPreviewProvider })));
 /** Editing lists and adds any block, so it waits for every definition, not only the page's. */
 function AllBlocks({ camoxApp, children }) {
 	React.use(camoxApp.loadAllBlocks());
@@ -116,7 +116,7 @@ var EditingActivationBoundary = class extends React.Component {
 };
 const subscribeToHydration = () => () => {};
 function PageExperience(t0) {
-	const $ = c(46);
+	const $ = c(38);
 	const { camoxApp, input, queryClient, studioDocument } = t0;
 	const { isAuthenticated, isLoading } = useAuthState();
 	const hasHydrated = React.useSyncExternalStore(subscribeToHydration, _temp, _temp2);
@@ -145,6 +145,7 @@ function PageExperience(t0) {
 		t2 = $[5];
 	}
 	React.useEffect(t1, t2);
+	useSignInShortcut(hasHydrated && !studioOnly && !isAuthenticated && !isLoading);
 	let t3;
 	if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
 		t3 = /* @__PURE__ */ jsx("div", {
@@ -248,50 +249,21 @@ function PageExperience(t0) {
 		return t11;
 	}
 	if (studioOnly) return null;
-	if (hasHydrated && isLocalhostPreview()) {
-		let t7;
-		if ($[35] !== readOnlyPage) {
-			t7 = /* @__PURE__ */ jsx(LazyLocalhostPreviewProvider, { children: readOnlyPage });
-			$[35] = readOnlyPage;
-			$[36] = t7;
-		} else t7 = $[36];
-		let t8;
-		if ($[37] !== camoxApp || $[38] !== t7) {
-			t8 = /* @__PURE__ */ jsx(AllBlocks, {
-				camoxApp,
-				children: t7
-			});
-			$[37] = camoxApp;
-			$[38] = t7;
-			$[39] = t8;
-		} else t8 = $[39];
-		let t9;
-		if ($[40] !== readOnlyPage || $[41] !== t8) {
-			t9 = /* @__PURE__ */ jsx(React.Suspense, {
-				fallback: readOnlyPage,
-				children: t8
-			});
-			$[40] = readOnlyPage;
-			$[41] = t8;
-			$[42] = t9;
-		} else t9 = $[42];
-		return t9;
-	}
 	if (studioDocument) {
 		let t7;
-		if ($[43] === Symbol.for("react.memo_cache_sentinel")) {
+		if ($[35] === Symbol.for("react.memo_cache_sentinel")) {
 			t7 = { height: "100vh" };
-			$[43] = t7;
-		} else t7 = $[43];
+			$[35] = t7;
+		} else t7 = $[35];
 		let t8;
-		if ($[44] !== isolatedPage) {
+		if ($[36] !== isolatedPage) {
 			t8 = /* @__PURE__ */ jsx("div", {
 				style: t7,
 				children: isolatedPage
 			});
-			$[44] = isolatedPage;
-			$[45] = t8;
-		} else t8 = $[45];
+			$[36] = isolatedPage;
+			$[37] = t8;
+		} else t8 = $[37];
 		return t8;
 	}
 	return readOnlyPage;

package/dist/features/runtime/runtime.d.ts

@@ -33,13 +33,8 @@ export interface PageRenderInput extends DraftRead {
   previewHandoff?: boolean;
   previewDocument?: string;
   routeKind?: "studio" | "studio-content" | "studio-nested";
-  /**
-   * A location only the Canvas shows, instead of a Page: the Canvas
-   * with nothing selected, or with a block of the Block Catalog selected.
-   */
-  canvasOnly?: {
-    blockId?: string;
-  };
+  /** Whether the location is the Canvas with nothing selected, which only the Canvas shows. */
+  canvasOnly?: boolean;
   project?: MemberProject;
   presentation?: "public" | "studio";
   derived?: {

package/dist/features/runtime/runtime.js

@@ -7,7 +7,7 @@ import { RUNTIME_ROUTE_PATHS, matchRuntimeOwnedRoute } from "./runtimeRoutes.js"
 import { reads } from "../../lib/studio-reads.js";
 import { asCollectionItem, recordMarkdownTemplate, recordPlainText } from "../../core/recordItem.js";
 import { PLATFORM_SCRIPT } from "../../lib/platform.js";
-import { STUDIO_ASSETS_PATH, STUDIO_CONTENT_PATH, matchCanvasOnlyPath, matchCollectionContentPath } from "../studio/routes.js";
+import { STUDIO_ASSETS_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, matchCollectionContentPath } from "../studio/routes.js";
 import { STUDIO_THEME_SCRIPT } from "../studio/studioTheme.js";
 import { discoverLayoutPages, matchDerivedLayout } from "../../core/derivedRoutes.js";
 import { buildCamoxPageHead, buildFaviconUrl, buildPageHead, buildPageMeta, createMarkdownResponse, createServerApiClient, createServerStudioCache, isNotFoundError, loadCamoxPageForRequest, parseMarkdownPath, prefersMarkdown, readDraftOrLive, readScopeLocales, renderedHref, resolveMemberProject, withFrontMatter } from "../routes/pageRuntime.js";
@@ -76,7 +76,7 @@ function matchRuntimeRoute(pathname) {
 		kind: "studio",
 		pathname
 	};
-	if (matchCanvasOnlyPath(pathname)) return {
+	if (pathname === "/camox/canvas") return {
 		kind: "canvas",
 		pathname
 	};
@@ -872,22 +872,10 @@ ${renderClientEntryScript(options.studioClientEntryUrl)}
 	} });
 }
 /**
-* The Canvas with nothing selected, or a block of the Block Catalog, renders the
-* page app, like a Page, so selecting it keeps the Canvas mounted. A block path
-* without a page-content block of that id redirects home.
+* The Canvas with nothing selected renders the page app, like a Page, so
+* selecting it keeps the Canvas mounted.
 */
 async function createCanvasOnlyResponse({ options, pathname, located, request, dataOnly = false }) {
-	const { blockId } = matchCanvasOnlyPath(located.path);
-	const app = blockId ? await options.getCamoxApp?.() : void 0;
-	const block = blockId ? app?.getBlockById(blockId) : void 0;
-	if (blockId && (!block || block._internal.layoutOnly)) {
-		if (dataOnly) return Response.json({
-			kind: "canvas",
-			message: "No block of the Block Catalog on this path",
-			pathname
-		}, { status: 404 });
-		return Response.redirect(new URL(withRuntimeBasePath(localizedPath("/", located.locale), options.runtimeBasePath), request.url), 302);
-	}
 	if (!options.apiUrl || !options.authenticationUrl || !options.projectUuid || !dataOnly && !options.renderPage) return Response.json({
 		message: "Camox page renderer is not configured.",
 		kind: "canvas",
@@ -895,7 +883,7 @@ async function createCanvasOnlyResponse({ options, pathname, located, request, d
 	}, { status: 500 });
 	const { project, clearAuthCookie } = await resolveRequestMember(request, options);
 	const studio = project !== void 0;
-	const title = block?._internal.title ?? "Canvas";
+	const title = "Canvas";
 	const input = {
 		project,
 		presentation: studio ? "studio" : "public",
@@ -911,10 +899,9 @@ async function createCanvasOnlyResponse({ options, pathname, located, request, d
 		layoutIdentity: null,
 		loaderData: null,
 		dehydratedState: dehydrate(new QueryClient()),
-		canvasOnly: blockId ? { blockId } : {},
+		canvasOnly: true,
 		draftId: studio ? getRequestDraftId(request, options) : void 0
 	};
-	await preparePreviewDocument(input, options, await options.getDocument?.() ?? {}, "");
 	const headers = {
 		"Cache-Control": "private, no-store",
 		Vary: "Cookie",