camox 0.45.0 → 0.46.0

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

@@ -50,13 +50,13 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 		const blockIndex = pageBlocks.findIndex((b) => b.id === block.id);
 		const afterPosition = blockIndex > 0 ? pageBlocks[blockIndex - 1].position : "";
 		previewStore.send({
-			type: "openAddBlockDialog",
+			type: "openAddBlockSheet",
 			afterPosition
 		});
 	};
 	const handleAddBlockBelow = (block) => {
 		previewStore.send({
-			type: "openAddBlockDialog",
+			type: "openAddBlockSheet",
 			afterPosition: block.position
 		});
 	};
@@ -104,7 +104,7 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 					isLayoutBlock && layoutSlot === "before" && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(CommandGroup, { children: /* @__PURE__ */ jsx(CommandItem, {
 						onSelect: () => {
 							previewStore.send({
-								type: "openAddBlockDialog",
+								type: "openAddBlockSheet",
 								afterPosition: ""
 							});
 							onOpenChange(false);
@@ -118,7 +118,7 @@ const BlockActionsPopover = ({ block, children, open, onOpenChange, align = "sta
 						onSelect: () => {
 							const lastPageBlock = pageBlocks[pageBlocks.length - 1];
 							previewStore.send({
-								type: "openAddBlockDialog",
+								type: "openAddBlockSheet",
 								afterPosition: lastPageBlock?.position
 							});
 							onOpenChange(false);
@@ -419,7 +419,7 @@ function useBlockActionsShortcuts() {
 						const block_2 = pageBlocks.find((b_6) => b_6.id === sel_7.blockId);
 						if (!block_2) return;
 						previewStore.send({
-							type: "openAddBlockDialog",
+							type: "openAddBlockSheet",
 							afterPosition: block_2.position
 						});
 					}
@@ -444,7 +444,7 @@ function useBlockActionsShortcuts() {
 						if (blockIndex === -1) return;
 						const afterPosition_1 = blockIndex > 0 ? pageBlocks[blockIndex - 1].position : "";
 						previewStore.send({
-							type: "openAddBlockDialog",
+							type: "openAddBlockSheet",
 							afterPosition: afterPosition_1
 						});
 					}

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

@@ -27,6 +27,7 @@ const ThumbnailFrame = (t0) => {
 		$[1] = t1;
 	} else t1 = $[1];
 	const bundle = t1;
+	const initialization = React.useRef(0);
 	let t2;
 	if ($[2] !== frame?.contentDocument || $[3] !== sourceDocument) {
 		t2 = () => {
@@ -38,8 +39,15 @@ const ThumbnailFrame = (t0) => {
 			const base = doc.createElement("base");
 			base.href = source.baseURI;
 			doc.head.appendChild(base);
+			const stylesheetsLoaded = [];
 			source.querySelectorAll("style, link[rel=\"stylesheet\"]").forEach((style) => {
-				if (isSiteStyle(style)) doc.head.appendChild(style.cloneNode(true));
+				if (!isSiteStyle(style)) return;
+				const clone = style.cloneNode(true);
+				if (clone.localName === "link") stylesheetsLoaded.push(new Promise((resolve) => {
+					clone.addEventListener("load", resolve, { once: true });
+					clone.addEventListener("error", resolve, { once: true });
+				}));
+				doc.head.appendChild(clone);
 			});
 			if (source !== document) for (const [from, to] of [
 				[source.documentElement, doc.documentElement],
@@ -53,7 +61,10 @@ const ThumbnailFrame = (t0) => {
 			reset.textContent = "\n      html, body { margin: 0 !important; overflow: hidden !important; }\n      *, *::before, *::after {\n        animation: none !important;\n        transition: none !important;\n        caret-color: transparent !important;\n      }\n    ";
 			doc.head.appendChild(reset);
 			doc.body.setAttribute("inert", "");
-			setRoot(mount);
+			const generation = initialization.current = initialization.current + 1;
+			Promise.all(stylesheetsLoaded).then(() => {
+				if (initialization.current === generation) setRoot(mount);
+			});
 		};
 		$[2] = frame?.contentDocument;
 		$[3] = sourceDocument;
@@ -185,12 +196,11 @@ const ThumbnailFrame = (t0) => {
 	return t14;
 };
 const BlockThumbnail = (t0) => {
-	const $ = c(15);
+	const $ = c(11);
 	const { block, className } = t0;
 	const ref = React.useRef(null);
 	const [isVisible, setIsVisible] = React.useState(false);
 	const [width, setWidth] = React.useState(0);
-	const checkerSize = 8 * (1 + width / VIEWPORT_WIDTH);
 	let t1;
 	let t2;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
@@ -222,46 +232,34 @@ const BlockThumbnail = (t0) => {
 	React.useEffect(t1, t2);
 	let t3;
 	if ($[2] !== className) {
-		t3 = cn("checkered pointer-events-none relative flex h-28 w-full items-center overflow-hidden", className);
+		t3 = cn("bg-muted pointer-events-none relative flex h-28 w-full items-center overflow-hidden", className);
 		$[2] = className;
 		$[3] = t3;
 	} else t3 = $[3];
 	let t4;
-	if ($[4] !== checkerSize || $[5] !== width) {
-		t4 = width > 0 ? {
-			backgroundSize: `${checkerSize * 2}px ${checkerSize * 2}px`,
-			backgroundPosition: `0 0, 0 ${checkerSize}px, ${checkerSize}px ${-checkerSize}px, ${-checkerSize}px 0`
-		} : void 0;
-		$[4] = checkerSize;
-		$[5] = width;
-		$[6] = t4;
-	} else t4 = $[6];
-	let t5;
-	if ($[7] !== block || $[8] !== isVisible || $[9] !== width) {
-		t5 = isVisible && width > 0 && /* @__PURE__ */ jsx(ThumbnailFrame, {
+	if ($[4] !== block || $[5] !== isVisible || $[6] !== width) {
+		t4 = isVisible && width > 0 && /* @__PURE__ */ jsx(ThumbnailFrame, {
 			block,
 			width
 		});
-		$[7] = block;
-		$[8] = isVisible;
-		$[9] = width;
-		$[10] = t5;
-	} else t5 = $[10];
-	let t6;
-	if ($[11] !== t3 || $[12] !== t4 || $[13] !== t5) {
-		t6 = /* @__PURE__ */ jsx("div", {
+		$[4] = block;
+		$[5] = isVisible;
+		$[6] = width;
+		$[7] = t4;
+	} else t4 = $[7];
+	let t5;
+	if ($[8] !== t3 || $[9] !== t4) {
+		t5 = /* @__PURE__ */ jsx("div", {
 			ref,
 			className: t3,
-			style: t4,
 			"aria-hidden": "true",
-			children: t5
+			children: t4
 		});
-		$[11] = t3;
-		$[12] = t4;
-		$[13] = t5;
-		$[14] = t6;
-	} else t6 = $[14];
-	return t6;
+		$[8] = t3;
+		$[9] = t4;
+		$[10] = t5;
+	} else t5 = $[10];
+	return t5;
 };
 
 //#endregion

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

@@ -39,7 +39,7 @@ function CuratedAddBlockListener(t0) {
 						else if (blockIndex === 0) afterPosition = "";
 					}
 					previewStore.send({
-						type: "openAddBlockDialog",
+						type: "openAddBlockSheet",
 						afterPosition
 					});
 				}

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

@@ -835,7 +835,7 @@ function _temp3(block_3) {
 	return /* @__PURE__ */ jsx(SortableBlock, { block: block_3 }, block_3.id);
 }
 function _temp4() {
-	previewStore.send({ type: "openAddBlockDialog" });
+	previewStore.send({ type: "openAddBlockSheet" });
 }
 
 //#endregion

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

@@ -478,7 +478,7 @@ const PreviewPanel = (t0) => {
 		$[43] = t19;
 	} else t19 = $[43];
 	const t20 = !placed && "inset-0";
-	const t21 = underCanvas && (!placed || placed.hidden) && "invisible";
+	const t21 = underCanvas && !placed && "invisible";
 	const t22 = device && "checkered flex items-center justify-center";
 	let t23;
 	if ($[44] !== t20 || $[45] !== t21 || $[46] !== t22) {

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/CoreCamoxProvider.js

@@ -42,23 +42,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"));

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/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",

package/dist/features/studio/FollowAgentProvider.js

@@ -4,8 +4,6 @@ import { useViewLocale } from "../../lib/view-locale-context.js";
 import { useLocation, useNavigate } from "../navigation/navigation.js";
 import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
 import { reads, useReadQueries, useReadQuery } from "../../lib/studio-reads.js";
-import { useLocalizedPath } from "../../lib/view-locale.js";
-import { blockCatalogPath } from "./routes.js";
 import { FollowAgentContext } from "./followAgentContext.js";
 import { canvasPageId, getCanvasPages } from "../canvas/canvasPages.js";
 import { selectedCanvasPage } from "../canvas/canvasSelection.js";
@@ -103,12 +101,11 @@ function _temp(id) {
 }
 /** Where the editor is, and the Studio content following locates the agent's touches with. */
 function useFollowWhere(runtimeBasePath) {
-	const $ = c(38);
+	const $ = c(35);
 	const app = useCamoxApp();
 	const projectUuid = useProjectUuid();
 	const location = useLocation();
 	const { locale, locales } = useViewLocale();
-	const localized = useLocalizedPath();
 	let t0;
 	if ($[0] !== projectUuid) {
 		t0 = reads.project({ projectUuid });
@@ -211,28 +208,20 @@ function useFollowWhere(runtimeBasePath) {
 	} else t9 = $[29];
 	const t10 = current?.key ?? null;
 	let t11;
-	if ($[30] !== localized) {
-		t11 = (type) => localized(blockCatalogPath(type));
-		$[30] = localized;
-		$[31] = t11;
-	} else t11 = $[31];
-	let t12;
-	if ($[32] !== locale.tag || $[33] !== pages || $[34] !== t10 || $[35] !== t11 || $[36] !== t9) {
-		t12 = {
+	if ($[30] !== locale.tag || $[31] !== pages || $[32] !== t10 || $[33] !== t9) {
+		t11 = {
 			pages,
 			locale: locale.tag,
 			location: t9,
-			pageKey: t10,
-			blockCatalogPath: t11
+			pageKey: t10
 		};
-		$[32] = locale.tag;
-		$[33] = pages;
-		$[34] = t10;
-		$[35] = t11;
-		$[36] = t9;
-		$[37] = t12;
-	} else t12 = $[37];
-	return t12;
+		$[30] = locale.tag;
+		$[31] = pages;
+		$[32] = t10;
+		$[33] = t9;
+		$[34] = t11;
+	} else t11 = $[34];
+	return t11;
 }
 function _temp2(page) {
 	return [page.id, page.layoutId];

package/dist/features/studio/components/FaviconDialog.js

@@ -1,7 +1,7 @@
 import { getApiUrl } from "../../../lib/api-client.js";
 import { reads, useStudioCache } from "../../../lib/studio-reads.js";
 import { projectMutations } from "../../../lib/queries.js";
-import { buildFaviconPlaceholderUrl, buildFaviconUrl } from "../../routes/pageRuntime.js";
+import { buildDefaultFaviconUrl, buildFaviconUrl } from "../../routes/pageRuntime.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -63,7 +63,7 @@ function FaviconForm(t0) {
 	const [hasCurrent, setHasCurrent] = React.useState(false);
 	let t1;
 	if ($[0] !== project) {
-		t1 = buildFaviconUrl(getApiUrl(), project, { placeholder: false });
+		t1 = buildFaviconUrl(getApiUrl(), project, { withDefault: false });
 		$[0] = project;
 		$[1] = t1;
 	} else t1 = $[1];
@@ -202,7 +202,7 @@ function FaviconForm(t0) {
 	const showsFavicon = pending ? pending.type === "upload" : hasCurrent;
 	let t14;
 	if ($[27] !== currentUrl || $[28] !== pendingUrl || $[29] !== showsFavicon) {
-		t14 = pendingUrl ?? (showsFavicon ? currentUrl : buildFaviconPlaceholderUrl(getApiUrl()));
+		t14 = pendingUrl ?? (showsFavicon ? currentUrl : buildDefaultFaviconUrl(getApiUrl()));
 		$[27] = currentUrl;
 		$[28] = pendingUrl;
 		$[29] = showsFavicon;

package/dist/features/studio/followAgent.js

@@ -34,8 +34,7 @@ function locate(where, here, touch) {
 		return page ? at({ key: page.key }, touch.blockId) : null;
 	}
 	const placement = here?.blocks?.find((block) => block.type === touch.blockType);
-	if (here && placement) return at({ key: here.key }, placement.id);
-	return elsewhere ? null : { catalog: touch.blockType };
+	return here && placement ? at({ key: here.key }, placement.id) : null;
 }
 function destinationOf(where, batch) {
 	const here = currentPage(where);
@@ -50,7 +49,6 @@ function destinationOf(where, batch) {
 		return page ? `key:${page.key}` : refKey(ref);
 	};
 	for (const at of located) {
-		if ("catalog" in at) continue;
 		const key = identity(at.page);
 		const entry = touched.get(key) ?? {
 			page: at.page,
@@ -61,13 +59,7 @@ function destinationOf(where, batch) {
 		if (at.blockId && !entry.blockIds.includes(at.blockId)) entry.blockIds.push(at.blockId);
 		touched.set(key, entry);
 	}
-	if (touched.size === 0) {
-		const catalog = located.find((at) => "catalog" in at);
-		return catalog && "catalog" in catalog ? {
-			kind: "catalog",
-			blockType: catalog.catalog
-		} : null;
-	}
+	if (touched.size === 0) return null;
 	const order = (ref) => {
 		const page = findPage(where, ref);
 		return page ? where.pages.indexOf(page) : where.pages.length;
@@ -75,7 +67,6 @@ function destinationOf(where, batch) {
 	const entries = [...touched.values()];
 	const chosen = (here && touched.get(`key:${here.key}`)) ?? entries.reduce((best, entry) => entry.count > best.count || entry.count === best.count && order(entry.page) < order(best.page) ? entry : best);
 	return {
-		kind: "page",
 		page: chosen.page,
 		blockIds: chosen.blockIds
 	};
@@ -169,11 +160,11 @@ function createFollowAgent({ navigate, where: initial }) {
 			return;
 		}
 		const destination = pendingNavigation;
-		const pathname = destination.kind === "catalog" ? where.blockCatalogPath(destination.blockType) : findPage(where, destination.page)?.pathname;
+		const pathname = findPage(where, destination.page)?.pathname;
 		if (!pathname) return;
 		pendingNavigation = null;
 		arrivedAt = Date.now();
-		blocksToSelect = destination.kind === "page" && destination.blockIds.length ? destination : null;
+		blocksToSelect = destination.blockIds.length ? destination : null;
 		selected = null;
 		navigate({
 			to: `${pathname}${where.location.search}`,
@@ -208,7 +199,7 @@ function createFollowAgent({ navigate, where: initial }) {
 			const destination = destinationOf(where, batch);
 			if (!destination) return;
 			const here = currentPage(where);
-			if (destination.kind === "page" && here && findPage(where, destination.page) === here) {
+			if (here && findPage(where, destination.page) === here) {
 				pendingNavigation = null;
 				clearTimer();
 				if (!destination.blockIds.length) return;

package/dist/features/studio/routes.js

@@ -27,28 +27,6 @@ function matchCollectionContentPath(pathname) {
 }
 /** The Studio URL of the Canvas with nothing selected. */
 const STUDIO_CANVAS_PATH = `${STUDIO_BASE_PATH}/canvas`;
-const STUDIO_BLOCKS_PATH = `${STUDIO_BASE_PATH}/blocks`;
-/** The Studio URL of a block of the Block Catalog. */
-const blockCatalogPath = (blockId) => `${STUDIO_BLOCKS_PATH}/${encodeURIComponent(blockId)}`;
-/** The id of the Block Catalog block a pathname selects, if any. */
-function matchBlockCatalogPath(pathname) {
-	const match = /^\/camox\/blocks\/([^/]+)$/.exec(pathname);
-	if (!match) return null;
-	try {
-		return decodeURIComponent(match[1]) || null;
-	} catch {
-		return null;
-	}
-}
-/**
-* A location that only exists on the Canvas: the Canvas with
-* nothing selected, or a block of the Block Catalog.
-*/
-function matchCanvasOnlyPath(pathname) {
-	if (pathname === "/camox/canvas") return {};
-	const blockId = matchBlockCatalogPath(pathname);
-	return blockId ? { blockId } : null;
-}
 
 //#endregion
-export { STUDIO_ASSETS_PATH, STUDIO_BASE_PATH, STUDIO_BLOCKS_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_ROUTE_SEGMENT, blockCatalogPath, collectionContentPath, matchBlockCatalogPath, matchCanvasOnlyPath, matchCollectionContentPath };
+export { STUDIO_ASSETS_PATH, STUDIO_BASE_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_ROUTE_SEGMENT, collectionContentPath, matchCollectionContentPath };