camox 0.63.0 → 0.66.0

package/dist/features/canvas/sidebar/PageInspector.js

@@ -5,8 +5,7 @@ import { CanvasInspectorBody, CanvasInspectorTitle } from "./CanvasInspector.js"
 import { PageInspectorSkeleton } from "./PageInspectorSkeleton.js";
 import { PreviewEditingOwnerContext } from "../../preview/previewSelection.js";
 import { CuratedPageInspector } from "./CuratedPageInspector.js";
-import { DerivedPageInspector } from "./DerivedPageInspector.js";
-import { SingletonPageInspector } from "./SingletonPageInspector.js";
+import { LayoutPageOverview } from "./LayoutPageOverview.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -38,8 +37,8 @@ var PageInspectorBoundary = class extends React.Component {
 	}
 };
 function PageInspectorContent(t0) {
-	const $ = c(8);
-	const { page, pageRecord, runtimeBasePath } = t0;
+	const $ = c(12);
+	const { page, runtimeBasePath } = t0;
 	switch (page.kind) {
 		case "curated": {
 			let t1;
@@ -51,31 +50,45 @@ function PageInspectorContent(t0) {
 		}
 		case "singleton": {
 			let t1;
-			if ($[1] !== page.layoutId || $[2] !== runtimeBasePath) {
-				t1 = /* @__PURE__ */ jsx(SingletonPageInspector, {
+			if ($[1] !== runtimeBasePath) {
+				t1 = { runtimeBasePath };
+				$[1] = runtimeBasePath;
+				$[2] = t1;
+			} else t1 = $[2];
+			let t2;
+			if ($[3] !== page.layoutId || $[4] !== t1) {
+				t2 = /* @__PURE__ */ jsx(LayoutPageOverview, {
 					layoutId: page.layoutId,
-					runtimeBasePath
+					target: t1
 				});
-				$[1] = page.layoutId;
-				$[2] = runtimeBasePath;
-				$[3] = t1;
-			} else t1 = $[3];
-			return t1;
+				$[3] = page.layoutId;
+				$[4] = t1;
+				$[5] = t2;
+			} else t2 = $[5];
+			return t2;
 		}
 		case "derived": {
 			let t1;
-			if ($[4] !== page.layoutId || $[5] !== pageRecord || $[6] !== runtimeBasePath) {
-				t1 = /* @__PURE__ */ jsx(DerivedPageInspector, {
+			if ($[6] !== page.layoutId || $[7] !== runtimeBasePath) {
+				t1 = {
+					runtimeBasePath,
+					derivedLayoutId: page.layoutId
+				};
+				$[6] = page.layoutId;
+				$[7] = runtimeBasePath;
+				$[8] = t1;
+			} else t1 = $[8];
+			let t2;
+			if ($[9] !== page.layoutId || $[10] !== t1) {
+				t2 = /* @__PURE__ */ jsx(LayoutPageOverview, {
 					layoutId: page.layoutId,
-					pageRecord,
-					runtimeBasePath
+					target: t1
 				});
-				$[4] = page.layoutId;
-				$[5] = pageRecord;
-				$[6] = runtimeBasePath;
-				$[7] = t1;
-			} else t1 = $[7];
-			return t1;
+				$[9] = page.layoutId;
+				$[10] = t1;
+				$[11] = t2;
+			} else t2 = $[11];
+			return t2;
 		}
 	}
 }
@@ -85,8 +98,8 @@ function PageInspectorContent(t0) {
 * overview, and the name's header goes back to it.
 */
 function PageInspector(t0) {
-	const $ = c(27);
-	const { page, owner, pageRecord, runtimeBasePath } = t0;
+	const $ = c(26);
+	const { page, owner, runtimeBasePath } = t0;
 	const { pathname } = useLocation();
 	let t1;
 	if ($[0] !== owner) {
@@ -140,51 +153,49 @@ function PageInspector(t0) {
 		$[10] = t6;
 	} else t6 = $[10];
 	let t7;
-	if ($[11] !== page || $[12] !== pageRecord || $[13] !== runtimeBasePath) {
+	if ($[11] !== page || $[12] !== runtimeBasePath) {
 		t7 = /* @__PURE__ */ jsx(PageInspectorContent, {
 			page,
-			pageRecord,
 			runtimeBasePath
 		});
 		$[11] = page;
-		$[12] = pageRecord;
-		$[13] = runtimeBasePath;
-		$[14] = t7;
-	} else t7 = $[14];
+		$[12] = runtimeBasePath;
+		$[13] = t7;
+	} else t7 = $[13];
 	let t8;
-	if ($[15] !== t6 || $[16] !== t7) {
+	if ($[14] !== t6 || $[15] !== t7) {
 		t8 = /* @__PURE__ */ jsx(React.Suspense, {
 			fallback: t6,
 			children: t7
 		});
-		$[15] = t6;
-		$[16] = t7;
-		$[17] = t8;
-	} else t8 = $[17];
+		$[14] = t6;
+		$[15] = t7;
+		$[16] = t8;
+	} else t8 = $[16];
 	let t9;
-	if ($[18] !== t5 || $[19] !== t8) {
+	if ($[17] !== t5 || $[18] !== t8) {
 		t9 = /* @__PURE__ */ jsx(PageInspectorBoundary, { children: t8 }, t5);
-		$[18] = t5;
-		$[19] = t8;
-		$[20] = t9;
-	} else t9 = $[20];
+		$[17] = t5;
+		$[18] = t8;
+		$[19] = t9;
+	} else t9 = $[19];
 	let t10;
-	if ($[21] !== owner || $[22] !== t9) {
+	if ($[20] !== owner || $[21] !== t9) {
 		t10 = /* @__PURE__ */ jsx(CanvasInspectorBody, { children: /* @__PURE__ */ jsx(PreviewEditingOwnerContext, {
 			value: owner,
 			children: t9
 		}) });
-		$[21] = owner;
-		$[22] = t9;
-		$[23] = t10;
-	} else t10 = $[23];
+		$[20] = owner;
+		$[21] = t9;
+		$[22] = t10;
+	} else t10 = $[22];
 	let t11;
-	if ($[24] !== t10 || $[25] !== t4) {
+	if ($[23] !== t10 || $[24] !== t4) {
 		t11 = /* @__PURE__ */ jsxs(Fragment, { children: [t4, t10] });
-		$[24] = t10;
-		$[25] = t4;
-		$[26] = t11;
-	} else t11 = $[26];
+		$[23] = t10;
+		$[24] = t4;
+		$[25] = t11;
+	} else t11 = $[25];
 	return t11;
 }
 function _temp() {

package/dist/features/canvas/sidebar/PageInspectorSkeleton.js

@@ -61,14 +61,14 @@ function CuratedPageSkeleton() {
 	} else t0 = $[0];
 	return t0;
 }
-/** A layout page's blocks and notice. */
+/** A layout page's blocks. */
 function LayoutPageSkeleton() {
 	const $ = c(1);
 	let t0;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = /* @__PURE__ */ jsx(LoadingPage, { children: /* @__PURE__ */ jsxs("div", {
-			className: "flex flex-col gap-4 px-2 pt-4",
-			children: [/* @__PURE__ */ jsx(BlocksGroupSkeleton, {}), /* @__PURE__ */ jsx(Skeleton, { className: "h-20 w-full rounded-lg" })]
+		t0 = /* @__PURE__ */ jsx(LoadingPage, { children: /* @__PURE__ */ jsx("div", {
+			className: "px-2 pt-4",
+			children: /* @__PURE__ */ jsx(BlocksGroupSkeleton, {})
 		}) });
 		$[0] = t0;
 	} else t0 = $[0];

package/dist/features/canvas/useCanvasCamera.js

@@ -1,7 +1,7 @@
 import { canvasStore } from "./canvasStore.js";
 import { ViewportContinuityContext, captureViewportAnchor, resolveViewportAnchor } from "../preview/viewportContinuity.js";
 import { canvasPageIframe } from "../preview/previewPageFrame.js";
-import { canvasBlockOverlap } from "./canvasFrameDocument.js";
+import { canvasSeamCover } from "./canvasFrameDocument.js";
 import { revealScrollDelta } from "../preview/selectionReveal.js";
 import { CANVAS_WHEEL_ZOOM_RATE, ZOOM_STRETCH, canvasMaximumScale, canvasMinimumScale, canvasOverview, canvasVerticalRail, canvasWheelDelta, constrainCanvasCamera, findCanvasSnapTarget, fitCanvasPage, isCanvasCameraSnapped, isCanvasPageScale, isInCanvasSnapWindow, placeCanvasPageAnchor, snapCanvasZoom, stretchCanvasZoom, unstretchCanvasZoom, zoomCanvasAt } from "./canvasCamera.js";
 import { createCanvasFlight, createCanvasPan } from "./canvasFlight.js";
@@ -73,7 +73,7 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			for (const name of CAMERA_PROPERTIES) element.style.removeProperty(name);
 			delete element.dataset.canvasPan;
 			delete element.dataset.canvasPromoted;
-			delete element.dataset.canvasBlockOverlap;
+			delete element.dataset.canvasSeamCover;
 		};
 	}, []);
 	/**
@@ -117,10 +117,19 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			};
 		};
 		let viewportSize = measureViewport();
-		const measureContent = () => ({
-			width: rowRef.current?.width ?? content.offsetWidth,
-			height: content.offsetHeight
-		});
+		const page = initialTargetRef.current;
+		const targets = () => rowRef.current?.targets ?? (page ? [{
+			...page,
+			key: "initial"
+		}] : []);
+		const measureContent = () => {
+			const widths = targets().map((target) => target.width);
+			return {
+				width: rowRef.current?.width ?? content.offsetWidth,
+				height: content.offsetHeight,
+				pageWidth: widths.length ? Math.min(...widths) : void 0
+			};
+		};
 		let contentSize = measureContent();
 		let minimumScale = canvasMinimumScale(viewportSize, contentSize);
 		const updateGeometry = (nextViewport = measureViewport(), nextContent = measureContent()) => {
@@ -128,11 +137,6 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			contentSize = nextContent;
 			minimumScale = canvasMinimumScale(viewportSize, contentSize);
 		};
-		const page = initialTargetRef.current;
-		const targets = () => rowRef.current?.targets ?? (page ? [{
-			...page,
-			key: "initial"
-		}] : []);
 		const targetOf = (key) => key == null ? void 0 : targets().find((candidate) => candidate.key === key);
 		let stretch;
 		let zoomEnd = 0;
@@ -285,10 +289,10 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 		};
 		const paintAtRest = () => {
 			if (settle) return;
-			const overlap = String(canvasBlockOverlap(camera.scale, ownerWindow.devicePixelRatio));
+			const seamCover = String(canvasSeamCover(camera.scale, ownerWindow.devicePixelRatio));
 			const zoom = String(camera.scale);
 			for (const element of [viewport, ...mirrors.current]) {
-				if (element.dataset.canvasBlockOverlap !== overlap) element.dataset.canvasBlockOverlap = overlap;
+				if (element.dataset.canvasSeamCover !== seamCover) element.dataset.canvasSeamCover = seamCover;
 				if (element.style.getPropertyValue("--canvas-rest-zoom") !== zoom) element.style.setProperty("--canvas-rest-zoom", zoom);
 			}
 		};
@@ -422,6 +426,7 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			};
 			animation = requestAnimationFrame(animate);
 		};
+		let syncedTargets = targets();
 		flightControls.current = {
 			flyTo: startFlight,
 			reveal: (element, immediate) => {
@@ -447,6 +452,8 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			syncRow: () => {
 				const key = rowRef.current?.selected ?? null;
 				const destination = targetOf(key);
+				const previousTargets = syncedTargets;
+				syncedTargets = targets();
 				if (key !== requested) {
 					requested = key;
 					selection = key;
@@ -459,6 +466,20 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 					else if (page.left !== flight.page.left || page.width !== flight.page.width) startFlight(page.key);
 					return;
 				}
+				const previous = previousTargets[syncedTargets.findIndex((candidate) => candidate.key === key)];
+				if (destination && previous?.key === key && previous.left !== destination.left && previous.width === destination.width && selection === key && !flight && isCanvasCameraSnapped(rest(target), viewportSize, previous)) {
+					updateGeometry();
+					const fit = fitCanvasPage(viewportSize, destination);
+					const next = {
+						...fit,
+						y: rescaleY(restoredCamera ?? target, fit.scale)
+					};
+					if (restoredCamera || fittingInitialPage) restoredCamera = next;
+					fittingInitialPage = false;
+					camera = constrain(camera, true);
+					applyCamera(next, true);
+					return;
+				}
 				if (destination && selection === key && !flight && !fittingInitialPage && !isCanvasCameraSnapped(rest(target), viewportSize, destination)) startFlight(destination.key);
 			},
 			fitAll: startOverviewFlight
@@ -511,7 +532,7 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			const previousInsets = insets;
 			const nextViewport = measureViewport();
 			const nextContent = measureContent();
-			if (insets.left === previousInsets.left && insets.top === previousInsets.top && nextViewport.width === viewportSize.width && nextViewport.height === viewportSize.height && nextContent.width === contentSize.width && nextContent.height === contentSize.height) return;
+			if (insets.left === previousInsets.left && insets.top === previousInsets.top && nextViewport.width === viewportSize.width && nextViewport.height === viewportSize.height && nextContent.width === contentSize.width && nextContent.height === contentSize.height && nextContent.pageWidth === contentSize.pageWidth) return;
 			const wasFitted = isOverview(target);
 			gesture = void 0;
 			const held = nextViewport.width !== viewportSize.width && !flight && !fittingInitialPage ? targetOf(selection) : void 0;
@@ -767,7 +788,7 @@ function useCanvasCamera(workspaceKey, initialTarget, row) {
 			ownerWindow.removeEventListener("blur", releaseSpace);
 			delete viewport.dataset.canvasPan;
 			delete viewport.dataset.canvasPromoted;
-			delete viewport.dataset.canvasBlockOverlap;
+			delete viewport.dataset.canvasSeamCover;
 			paintMirror.current = null;
 		};
 	}, [workspaceKey, continuity]);

package/dist/features/page/CuratedPageContent.js

@@ -12,6 +12,7 @@ import * as React from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/features/page/CuratedPageContent.tsx
+/** A block read with its bundle, rendered by its definition's code as a page shows it. */
 function PageBlock(t0) {
 	const $ = c(19);
 	const { blockId, mode } = t0;
@@ -177,4 +178,4 @@ function _temp(block) {
 }
 
 //#endregion
-export { CuratedPageContent };
+export { CuratedPageContent, PageBlock };

package/dist/features/page/UnplacedBlockContent.js

@@ -0,0 +1,52 @@
+import { reads, useRead } from "../../lib/studio-reads.js";
+import { BlockErrorBoundary } from "../preview/components/BlockErrorBoundary.js";
+import { PageBlock } from "./CuratedPageContent.js";
+import { c } from "react/compiler-runtime";
+import { jsx } from "react/jsx-runtime";
+
+//#region src/features/page/UnplacedBlockContent.tsx
+/**
+* A block placed nowhere, alone, as a page would show it: the look document's Block Definition
+* mode (ADR 0032). Its bundle is read like a page's block, so it renders and hydrates as one.
+* Thumbnails render a Block Definition their own way (`BlockPeek`); only the block render is
+* shared.
+*/
+function UnplacedBlockContent(t0) {
+	const $ = c(8);
+	const { blockId } = t0;
+	let t1;
+	if ($[0] !== blockId) {
+		t1 = reads.blockBundle(blockId);
+		$[0] = blockId;
+		$[1] = t1;
+	} else t1 = $[1];
+	const { block } = useRead(t1);
+	let t2;
+	if ($[2] !== blockId) {
+		t2 = /* @__PURE__ */ jsx(PageBlock, {
+			blockId,
+			mode: "site"
+		});
+		$[2] = blockId;
+		$[3] = t2;
+	} else t2 = $[3];
+	let t3;
+	if ($[4] !== block.type || $[5] !== blockId || $[6] !== t2) {
+		t3 = /* @__PURE__ */ jsx("main", {
+			className: "flex flex-col",
+			children: /* @__PURE__ */ jsx(BlockErrorBoundary, {
+				blockId,
+				blockType: block.type,
+				children: t2
+			})
+		});
+		$[4] = block.type;
+		$[5] = blockId;
+		$[6] = t2;
+		$[7] = t3;
+	} else t3 = $[7];
+	return t3;
+}
+
+//#endregion
+export { UnplacedBlockContent };