@jxsuite/studio 0.9.0 → 0.10.1

package/src/studio.js

@@ -14,12 +14,9 @@ import {
   popDocument,
   getNodeAtPath,
   pathsEqual,
-  parentElementPath,
   canvasWrap,
   toolbarEl,
-  elToPath,
   canvasPanels,
-  stripEventHandlers,
   registerRenderer,
   render,
   update,
@@ -42,30 +39,21 @@ import {
 
 import { view } from "./view.js";
 
-import { renderNode as runtimeRenderNode, buildScope, defineElement } from "@jxsuite/runtime";
-
-import {
-  isEditing,
-  getActiveElement,
-  isEditableBlock,
-  isInlineInContext,
-} from "./editor/inline-edit.js";
+import { isEditing, isEditableBlock } from "./editor/inline-edit.js";
 import {
   enterComponentInlineEdit,
   initComponentInlineEdit,
 } from "./editor/component-inline-edit.js";
-import { enterInlineEdit, initContentInlineEdit } from "./editor/content-inline-edit.js";
+import { enterInlineEdit } from "./editor/content-inline-edit.js";
 import {
   initCanvasUtils,
-  canvasPanelTemplate,
-  observeCenterUntilStable,
   applyTransform,
-  renderZoomIndicator,
-  resetZoomIndicator,
   positionZoomIndicator,
   updateActivePanelHeaders,
 } from "./canvas/canvas-utils.js";
-import { dismissSlashMenu as sharedDismissSlashMenu } from "./editor/slash-menu.js";
+import { initCanvasHelpers, getActivePanel, findCanvasElement } from "./canvas/canvas-helpers.js";
+import { initCanvasRender, renderCanvas } from "./canvas/canvas-render.js";
+import { initCanvasLiveRender } from "./canvas/canvas-live-render.js";
 import {
   renderStatusbar,
   statusMessage,
@@ -91,29 +79,13 @@ import { renderHeadTemplate } from "./panels/head-panel.js";
 import { exportCemManifest as _exportCemManifest } from "./services/cem-export.js";
 
 import { registerPlatform, getPlatform, hasPlatform } from "./platform.js";
-import {
-  parseMediaEntries,
-  activeBreakpointsForWidth,
-  collectMediaOverrides,
-  applyOverridesToCanvas,
-} from "./utils/canvas-media.js";
+import { parseMediaEntries } from "./utils/canvas-media.js";
 import { createDevServerPlatform } from "./platforms/devserver.js";
 import { codeService } from "./services/code-services.js";
-import {
-  getEffectiveMedia,
-  getEffectiveImports,
-  getEffectiveElements,
-  getEffectiveHead,
-} from "./site-context.js";
 import { defCategory, defBadgeLabel, renderSignalsTemplate } from "./panels/signals-panel.js";
-import {
-  componentRegistry,
-  loadComponentRegistry,
-  computeRelativePath,
-} from "./files/components.js";
+import { loadComponentRegistry } from "./files/components.js";
 
-import { html, render as litRender, nothing } from "lit-html";
-import { ref } from "lit-html/directives/ref.js";
+import { html, render as litRender } from "lit-html";
 
 import webdata from "../data/webdata.json";
 import { renderDataExplorerTemplate } from "./panels/data-explorer.js";
@@ -124,29 +96,20 @@ import { renderGitPanel } from "./panels/git-panel.js";
 // by Bun's bundler despite sideEffects declarations in Spectrum's package.json.
 import { components as _swc } from "./ui/spectrum.js"; // eslint-disable-line no-unused-vars
 import "./ui/panel-resize.js";
-import { dismissContextMenu } from "./editor/context-menu.js";
 import { initShortcuts } from "./editor/shortcuts.js";
 import { renderActivityBar } from "./panels/activity-bar.js";
-import { renderBrowse } from "./browse/browse.js";
 import * as toolbarPanel from "./panels/toolbar.js";
 import * as overlaysPanel from "./panels/overlays.js";
 import * as rightPanelMod from "./panels/right-panel.js";
 import * as leftPanelMod from "./panels/left-panel.js";
-import { renderStylebookMode, renderStylebookOverlays } from "./panels/stylebook-panel.js";
+import { renderStylebookOverlays } from "./panels/stylebook-panel.js";
 import { registerLayersDnD, registerComponentsDnD, registerElementsDnD } from "./panels/dnd.js";
-import { mediaDisplayName, defaultDef } from "./panels/shared.js";
-import { renderFunctionEditor, registerFunctionCompletions } from "./panels/editors.js";
-import {
-  renderBlockActionBar,
-  dismissLinkPopover,
-  initBlockActionBar,
-} from "./panels/block-action-bar.js";
+import { defaultDef } from "./panels/shared.js";
+import { registerFunctionCompletions } from "./panels/editors.js";
+import { renderBlockActionBar, initBlockActionBar } from "./panels/block-action-bar.js";
 import { initCssData } from "./panels/style-utils.js";
-import { renderCanvasNode } from "./panels/preview-render.js";
-import { initPseudoPreview, updateForcedPseudoPreview } from "./panels/pseudo-preview.js";
-import { initCanvasDnD, registerPanelDnD } from "./panels/canvas-dnd.js";
-import { initPanelEvents, registerPanelEvents } from "./panels/panel-events.js";
-import * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
+import { updateForcedPseudoPreview } from "./panels/pseudo-preview.js";
+import { initPanelEvents } from "./panels/panel-events.js";
 
 // ─── Globals ──────────────────────────────────────────────────────────────────
 // These mutable variables are local to studio.js for now. As sections are extracted
@@ -177,11 +140,12 @@ async function navigateToComponent(componentPath) {
     const platform = getPlatform();
     const content = await platform.readFile(componentPath);
     if (!content) return;
-    const doc = JSON.parse(content);
-    S = pushDocument(S, doc, componentPath);
+    const parsed = JSON.parse(content);
+    S = pushDocument(S, parsed, componentPath);
     S.dirty = false;
+    ({ doc, session } = fromFlat(S));
     render();
-    statusMessage(`Editing component: ${doc.tagName || componentPath}`);
+    statusMessage(`Editing component: ${parsed.tagName || componentPath}`);
   } catch (/** @type {any} */ e) {
     const err = /** @type {any} */ (e);
     statusMessage(`Error: ${err.message}`);
@@ -200,6 +164,7 @@ async function navigateBack() {
     }
   }
   S = popDocument(S);
+  ({ doc, session } = fromFlat(S));
   render();
   statusMessage("Returned to parent document");
 }
@@ -230,259 +195,6 @@ async function closeFunctionEditor() {
   updateUi("editingFunction", null);
 }
 
-import { prepareForEditMode } from "./utils/edit-display.js";
-
-/**
- * Render a Jx document into a canvas element using the real runtime. Populates elToPath for each
- * created element via onNodeCreated callback. Returns the live state scope on success, null on
- * failure.
- *
- * @param {number} gen - Render generation for staleness detection
- * @param {any} doc
- * @param {any} canvasEl
- */
-async function renderCanvasLive(gen, doc, canvasEl) {
-  canvasEl.innerHTML = "";
-
-  // Apply content mode typography styling
-  if (S.mode === "content") {
-    canvasEl.setAttribute("data-content-mode", "");
-  } else {
-    canvasEl.removeAttribute("data-content-mode");
-  }
-
-  const renderDoc =
-    canvasMode === "preview" ? structuredClone(doc) : prepareForEditMode(stripEventHandlers(doc));
-
-  // In edit mode, collect paths where $map templates were inlined as children[0]
-  // so we can remap runtime paths (children,0,...) → (children,map,...)
-  const mapParentPaths = new Set();
-  if (canvasMode === "design" || canvasMode === "edit") {
-    (function findMapParents(/** @type {any} */ node, /** @type {any[]} */ path) {
-      if (!node || typeof node !== "object") return;
-      if (
-        node.children &&
-        typeof node.children === "object" &&
-        node.children.$prototype === "Array"
-      ) {
-        mapParentPaths.add(path.join("/"));
-      }
-      if (Array.isArray(node.children)) {
-        for (let i = 0; i < node.children.length; i++) {
-          findMapParents(node.children[i], [...path, "children", i]);
-        }
-      }
-      if (node.$switch && node.cases) {
-        for (const [k, v] of Object.entries(node.cases)) {
-          findMapParents(v, [...path, "cases", k]);
-        }
-      }
-    })(doc, []);
-  }
-
-  try {
-    const root = projectState?.projectRoot || "";
-    const docPrefix = root ? `${root}/` : "";
-    const docBase = S.documentPath ? `${location.origin}/${docPrefix}${S.documentPath}` : undefined;
-
-    // Register custom elements so the runtime can render them
-    let effectiveElements = getEffectiveElements(renderDoc.$elements);
-
-    // In content mode (markdown), auto-discover components for directive-based
-    // custom elements that have no explicit $elements registration.
-    if (S.mode === "content" && componentRegistry.length > 0) {
-      const existingRefs = new Set(
-        effectiveElements.map((/** @type {any} */ e) => (typeof e === "string" ? e : e?.$ref)),
-      );
-      /** @param {any} node */
-      const collectTags = (node) => {
-        /** @type {Set<string>} */
-        const tags = new Set();
-        if (!node || typeof node !== "object") return tags;
-        if (node.tagName) tags.add(node.tagName);
-        if (Array.isArray(node.children)) {
-          for (const child of node.children) {
-            for (const t of collectTags(child)) tags.add(t);
-          }
-        }
-        return tags;
-      };
-      for (const tag of collectTags(renderDoc)) {
-        const comp = componentRegistry.find((/** @type {any} */ c) => c.tagName === tag);
-        if (comp && comp.source !== "npm") {
-          const relPath = computeRelativePath(S.documentPath, comp.path);
-          if (!existingRefs.has(relPath)) {
-            effectiveElements.push({ $ref: relPath });
-            existingRefs.add(relPath);
-          }
-        }
-      }
-    }
-
-    if (effectiveElements.length) {
-      renderDoc.$elements = effectiveElements;
-      for (const entry of effectiveElements) {
-        if (typeof entry === "string") {
-          try {
-            const specifier =
-              entry.startsWith("/") || entry.startsWith(".")
-                ? entry
-                : `/${projectState?.projectRoot || ""}/node_modules/${entry}`.replace(/\/+/g, "/");
-            await import(specifier);
-          } catch (/** @type {any} */ e) {
-            console.warn("Studio: failed to import package", entry, e);
-          }
-        } else if (entry?.$ref) {
-          const href = new URL(entry.$ref, docBase).href;
-          try {
-            await defineElement(href);
-          } catch (/** @type {any} */ e) {
-            console.warn("Studio: failed to register element", entry.$ref, e);
-          }
-        }
-      }
-    }
-
-    // Bail out if a newer render started while we were importing elements
-    if (gen !== view.renderGeneration) return null;
-
-    // Inject site-level imports so buildScope can resolve $prototype names
-    renderDoc.imports = getEffectiveImports(renderDoc.imports);
-
-    // Apply project-level styles mirroring the compiler convention:
-    //   viewport ≈ :root  → CSS custom properties (they inherit down)
-    //   canvasEl ≈ body   → regular CSS properties (inline beats CSS defaults)
-    // This ensures project font-family, color, etc. override the
-    // content-mode fallback typography rules in the stylesheet.
-    // In edit mode, propagate to the .content-edit-canvas wrapper for seamless appearance.
-    const viewport = canvasEl.closest(".canvas-panel-viewport");
-    const editSurface = canvasMode === "edit" ? canvasEl.closest(".content-edit-canvas") : null;
-    const siteStyle = projectState?.projectConfig?.style;
-    if (viewport) {
-      viewport.style.cssText = "";
-      if (siteStyle && typeof siteStyle === "object") {
-        for (const [k, v] of Object.entries(siteStyle)) {
-          if (k.startsWith("--")) {
-            viewport.style.setProperty(k, String(v));
-          } else {
-            /** @type {any} */ (viewport.style)[k] = v;
-          }
-        }
-      }
-    }
-    if (editSurface) {
-      if (siteStyle && typeof siteStyle === "object") {
-        for (const [k, v] of Object.entries(siteStyle)) {
-          if (k.startsWith("--")) {
-            /** @type {any} */ (editSurface).style.setProperty(k, String(v));
-          } else {
-            /** @type {any} */ (editSurface.style)[k] = v;
-          }
-        }
-      }
-    }
-    if (siteStyle && typeof siteStyle === "object") {
-      for (const [k, v] of Object.entries(siteStyle)) {
-        if (!k.startsWith("--")) {
-          /** @type {any} */ (canvasEl.style)[k] = v;
-        }
-      }
-    }
-
-    // Inject site-level $media so runtime can resolve media queries in styles
-    renderDoc.$media = getEffectiveMedia(renderDoc.$media);
-
-    // Inject $head elements (link/meta/script) into document.head
-    const effectiveHead = getEffectiveHead(renderDoc.$head);
-    if (effectiveHead.length) {
-      for (const entry of effectiveHead) {
-        if (!entry?.tagName) continue;
-        const tag = entry.tagName.toLowerCase();
-        const attrs = { ...entry.attributes };
-        const root = projectState?.projectRoot || "";
-        for (const key of ["href", "src"]) {
-          if (
-            attrs[key] &&
-            !attrs[key].startsWith("/") &&
-            !attrs[key].startsWith(".") &&
-            !attrs[key].startsWith("http")
-          ) {
-            attrs[key] = `/${root}/node_modules/${attrs[key]}`.replace(/\/+/g, "/");
-          }
-        }
-        const selector = `${tag}${attrs.href ? `[href="${attrs.href}"]` : ""}${attrs.src ? `[src="${attrs.src}"]` : ""}`;
-        if (selector !== tag && document.head.querySelector(selector)) continue;
-        const el = document.createElement(tag);
-        for (const [k, v] of Object.entries(attrs)) el.setAttribute(k, /** @type {string} */ (v));
-        if (entry.textContent) el.textContent = entry.textContent;
-        document.head.appendChild(el);
-      }
-    }
-
-    const $defs = await buildScope(renderDoc, {}, docBase);
-    // Bail out if a newer render started while buildScope was running
-    if (gen !== view.renderGeneration) return null;
-    const el = /** @type {HTMLElement} */ (
-      runtimeRenderNode(renderDoc, $defs, {
-        onNodeCreated(/** @type {any} */ el, /** @type {any} */ path) {
-          // Remap $map paths: wrapper and template children → real document paths
-          // prepareForEditMode wraps $map template in: children[0] (wrapper) > children[0] (template)
-          // Real paths: wrapper → ['children'] ($map container), template → ['children', 'map']
-          let mappedPath = path;
-          if ((canvasMode === "design" || canvasMode === "edit") && mapParentPaths.size > 0) {
-            for (let i = 0; i < path.length - 1; i++) {
-              if (path[i] === "children" && path[i + 1] === 0) {
-                const parentKey = path.slice(0, i).join("/");
-                if (mapParentPaths.has(parentKey)) {
-                  if (path.length === i + 2) {
-                    // Wrapper div itself → $map container path
-                    mappedPath = path.slice(0, i + 1);
-                  } else if (
-                    path.length >= i + 4 &&
-                    path[i + 2] === "children" &&
-                    path[i + 3] === 0
-                  ) {
-                    // Template or its descendants → children/map/...rest
-                    mappedPath = [...path.slice(0, i), "children", "map", ...path.slice(i + 4)];
-                  }
-                  break;
-                }
-              }
-            }
-          }
-          elToPath.set(el, mappedPath);
-        },
-        _path: [],
-      })
-    );
-    if (canvasMode === "design" || canvasMode === "edit") {
-      // Disable pointer events on all rendered elements for edit mode
-      el.style.pointerEvents = "none";
-      for (const child of el.querySelectorAll("*")) {
-        /** @type {any} */ (child).style.pointerEvents = "none";
-      }
-    }
-    canvasEl.appendChild(el);
-    if (canvasMode === "design" || canvasMode === "edit") {
-      // Custom element connectedCallbacks render children asynchronously —
-      // sweep again after they've had a chance to run
-      requestAnimationFrame(() => {
-        const editingEl = getActiveElement();
-        for (const child of canvasEl.querySelectorAll("*")) {
-          // Preserve pointer-events on the actively-edited element
-          if (view.componentInlineEdit && child === view.componentInlineEdit.el) continue;
-          if (editingEl && child === editingEl) continue;
-          /** @type {any} */ (child).style.pointerEvents = "none";
-        }
-      });
-    }
-    return $defs;
-  } catch (/** @type {any} */ err) {
-    console.warn("renderCanvasLive failed:", err.message, err);
-    return null;
-  }
-}
-
 // ─── Webdata: datalists for autocomplete ──────────────────────────────────────
 
 const datalistHost = document.createElement("div");
@@ -542,24 +254,19 @@ toolbarPanel.mount(toolbarEl, {
 });
 
 overlaysPanel.mount({
-  effectiveZoom,
   getCanvasMode: () => canvasMode,
   isEditing,
   renderBlockActionBar,
-  findCanvasElement,
-  getActivePanel,
 });
 
 initBlockActionBar({
   getCanvasMode: () => canvasMode,
-  findCanvasElement,
-  getActivePanel,
   navigateToComponent,
   createFloatingContainer,
 });
 
 initComponentInlineEdit({ findCanvasElement });
-initContentInlineEdit({ findCanvasElement, getActivePanel });
+initCanvasHelpers({ getCanvasMode: () => canvasMode });
 initCanvasUtils({
   getCanvasMode: () => canvasMode,
   getZoom: () => S.ui.zoom,
@@ -569,19 +276,29 @@ initCanvasUtils({
   },
   renderStylebookOverlays,
 });
-initPseudoPreview({ getActivePanel, findCanvasElement });
-initCanvasDnD({ effectiveZoom });
 initPanelEvents({
   getState: () => S,
   setState: (s) => {
     S = s;
+    ({ doc, session } = fromFlat(S));
   },
   getCanvasMode: () => canvasMode,
-  bubbleInlinePath,
-  findCanvasElement,
   enterInlineEdit,
   navigateToComponent,
-  effectiveZoom,
+});
+initCanvasLiveRender({
+  getState: () => S,
+  getCanvasMode: () => canvasMode,
+});
+initCanvasRender({
+  getCanvasMode: () => canvasMode,
+  setCanvasMode: (mode) => {
+    canvasMode = mode;
+  },
+  getState: () => S,
+  update,
+  openFileFromTree,
+  exportFile,
 });
 
 rightPanelMod.mount({
@@ -700,10 +417,14 @@ setUpdateSessionFn(function _updateSession(/** @type {any} */ patch) {
   if (patch.ui) {
     session.ui = { ...prev.ui, ...patch.ui };
   }
+  if (patch.canvas) {
+    session.canvas = { ...prev.canvas, ...patch.canvas };
+  }
   S = toFlat(doc, session);
 
   const selChanged = !pathsEqual(prev.selection, session.selection);
   const uiChanged = prev.ui !== session.ui;
+  const canvasChanged = prev.canvas !== session.canvas;
 
   const canvasUiChanged =
     uiChanged &&
@@ -724,7 +445,7 @@ setUpdateSessionFn(function _updateSession(/** @type {any} */ patch) {
       console.error("renderCanvas error:", e);
     }
     safeRenderLeftPanel();
-  } else if (selChanged || leftUiChanged) {
+  } else if (selChanged || leftUiChanged || canvasChanged) {
     safeRenderLeftPanel();
   }
 
@@ -732,20 +453,10 @@ setUpdateSessionFn(function _updateSession(/** @type {any} */ patch) {
     updateActivePanelHeaders();
   }
 
-  runPostRenderHooks(doc.document, prev.selection);
-
-  const hoverChanged = prev.hover !== session.hover;
-  notify({ doc: false, selection: selChanged, hover: hoverChanged, ui: uiChanged, mode: false });
-});
-
-// Register post-render hook for pseudo-state preview
-addPostRenderHook(() => updateForcedPseudoPreview());
-
-// Register post-render hook for pending inline edit
-addPostRenderHook((/** @type {any} */ prevDoc) => {
-  if (view.pendingInlineEdit && prevDoc === S.document) {
-    const { path, mediaName: mn } = view.pendingInlineEdit;
-    view.pendingInlineEdit = null;
+  // Process pending inline edit when canvas becomes ready
+  if (canvasChanged && session.canvas.status === "ready" && session.ui?.pendingInlineEdit) {
+    const { path, mediaName: mn } = session.ui.pendingInlineEdit;
+    updateUi("pendingInlineEdit", null);
     const targetPanel =
       canvasPanels.find((/** @type {any} */ p) => p.mediaName === mn) || canvasPanels[0];
     if (targetPanel) {
@@ -753,8 +464,16 @@ addPostRenderHook((/** @type {any} */ prevDoc) => {
       if (el) enterComponentInlineEdit(el, path);
     }
   }
+
+  runPostRenderHooks(doc.document, prev.selection);
+
+  const hoverChanged = prev.hover !== session.hover;
+  notify({ doc: false, selection: selChanged, hover: hoverChanged, ui: uiChanged, mode: false });
 });
 
+// Register post-render hook for pseudo-state preview
+addPostRenderHook(() => updateForcedPseudoPreview());
+
 // Now that renderers and update are registered, bootstrap
 registerFunctionCompletions();
 
@@ -847,480 +566,6 @@ if (_openParam) {
   render();
 }
 
-// ─── Media helpers ────────────────────────────────────────────────────────────
-
-/**
- * After a runtime render, apply active media overrides as inline styles so they beat the base
- * inline styles the runtime already set. The runtime uses @media CSS rules for overrides, but those
- * can never beat inline base styles.
- *
- * @param {Element} canvasEl
- * @param {Set<string>} activeBreakpoints
- */
-function applyCanvasMediaOverrides(canvasEl, activeBreakpoints) {
-  if (!activeBreakpoints.size) return;
-  const docMedia = getEffectiveMedia(S.document.$media || {});
-  const validBreakpoints = new Set();
-  for (const name of activeBreakpoints) {
-    if (docMedia[name]) validBreakpoints.add(name);
-  }
-  const overrides = collectMediaOverrides(document.styleSheets, validBreakpoints);
-  applyOverridesToCanvas(canvasEl, overrides);
-}
-
-// ─── Canvas ───────────────────────────────────────────────────────────────────
-
-function renderCanvas() {
-  // Advance render generation so stale async renders from the previous cycle bail out
-  ++view.renderGeneration;
-
-  // Always clear Lit's internal state so it builds fresh DOM. Stale async
-  // renderCanvasLive calls from a previous cycle can corrupt nested ChildPart
-  // markers (Comment nodes inside panzoom-wrap) in ways the root-only
-  // ensureLitState check cannot detect.
-  // @ts-ignore
-  if (canvasWrap["_$litPart$"]) {
-    canvasWrap.textContent = "";
-    // @ts-ignore
-    delete canvasWrap["_$litPart$"];
-  }
-
-  // Function editor mode: editing a function body in Monaco (JS)
-  if (S.ui.editingFunction) {
-    renderFunctionEditor();
-    return;
-  }
-
-  // Dispose function editor if switching away
-  if (view.functionEditor) {
-    view.functionEditor.dispose();
-    view.functionEditor = null;
-  }
-
-  // Source mode: update existing Monaco editor without recreating
-  if (canvasMode === "source" && view.monacoEditor) {
-    const jsonStr = JSON.stringify(S.document, null, 2);
-    const currentVal = view.monacoEditor.getValue();
-    if (currentVal !== jsonStr) {
-      // Prevent triggering the onChange handler for this programmatic update
-      view.monacoEditor._ignoreNextChange = true;
-      view.monacoEditor.setValue(jsonStr);
-    }
-    return;
-  }
-
-  // Detect whether this is a mode transition or a content-only re-render
-  const modeChanged = canvasMode !== view.prevCanvasMode;
-  view.prevCanvasMode = canvasMode;
-
-  // DnD handlers are registered on inner canvas elements that get replaced on every
-  // content render, so always clean them up.
-  for (const fn of view.canvasDndCleanups) fn();
-  view.canvasDndCleanups = [];
-
-  // Panel event handlers (click, dblclick, etc.) capture closures over panel references.
-  // Always re-register to keep closures fresh across document switches.
-  for (const fn of view.canvasEventCleanups) fn();
-  view.canvasEventCleanups = [];
-
-  // Panel JS objects are cheap — always clear and repopulate from templates.
-  // The actual DOM elements are preserved by Lit's diffing on content-only re-renders.
-  canvasPanels.length = 0;
-
-  if (modeChanged) {
-    // Full teardown on mode transitions — new panel structure needed
-    if (view.centerObserver) {
-      view.centerObserver.disconnect();
-      view.centerObserver = null;
-    }
-
-    // Dispose Monaco editor if switching away from source mode
-    if (view.monacoEditor) {
-      view.monacoEditor.dispose();
-      view.monacoEditor = null;
-    }
-
-    litRender(nothing, canvasWrap);
-    view.panzoomWrap = null;
-    // Reset inline style overrides from other modes
-    canvasWrap.style.padding = "";
-    canvasWrap.style.alignItems = "";
-    canvasWrap.style.display = "";
-    canvasWrap.style.overflow = "";
-    canvasWrap.style.overflow = "";
-
-    // Clear zoom indicator (only re-rendered by design/preview/stylebook)
-    resetZoomIndicator();
-
-    // Dismiss open popovers/toolbars that are no longer relevant
-    if (view.blockActionBarEl) litRender(nothing, view.blockActionBarEl);
-    dismissLinkPopover();
-    dismissContextMenu();
-    sharedDismissSlashMenu();
-  }
-
-  // Manage mode: project-level file browser table
-  if (canvasMode === "manage") {
-    canvasWrap.style.padding = "0";
-    canvasWrap.style.overflow = "auto";
-    renderBrowse(canvasWrap, {
-      openFile: (/** @type {string} */ path) => {
-        canvasMode = "edit";
-        openFileFromTree(path);
-      },
-    });
-    return;
-  }
-
-  // Settings mode: render element catalog with panzoom surface
-  if (canvasMode === "settings") {
-    renderStylebookMode({
-      canvasPanelTemplate,
-      applyTransform,
-      observeCenterUntilStable,
-      renderZoomIndicator,
-      updateActivePanelHeaders,
-      overlayBoxDescriptor,
-      effectiveZoom,
-    });
-    return;
-  }
-
-  // Source mode: create Monaco editor instead of canvas
-  if (canvasMode === "source") {
-    canvasWrap.style.padding = "0";
-    canvasWrap.style.display = "block";
-    /** @type {HTMLDivElement | null} */
-    let editorContainer = null;
-    litRender(
-      html`<div class="source-wrap">
-        <div class="source-toolbar">
-          <sp-action-button size="s" @click=${exportFile}>
-            <sp-icon-export slot="icon"></sp-icon-export>
-            Export
-          </sp-action-button>
-        </div>
-        <div
-          class="source-editor"
-          ${ref((el) => {
-            if (el) editorContainer = /** @type {HTMLDivElement} */ (el);
-          })}
-        ></div>
-      </div>`,
-      canvasWrap,
-    );
-
-    const jsonStr = JSON.stringify(S.document, null, 2);
-    view.monacoEditor = monaco.editor.create(/** @type {any} */ (editorContainer), {
-      value: jsonStr,
-      language: "json",
-      theme: "vs-dark",
-      automaticLayout: true,
-      minimap: { enabled: false },
-      fontSize: 12,
-      fontFamily: "'SF Mono', 'Fira Code', 'Consolas', monospace",
-      lineNumbers: "on",
-      scrollBeyondLastLine: false,
-      wordWrap: "on",
-      tabSize: 2,
-    });
-
-    // Debounced sync back to state
-    /** @type {any} */
-    let debounce;
-    view.monacoEditor.onDidChangeModelContent(() => {
-      if (view.monacoEditor._ignoreNextChange) {
-        view.monacoEditor._ignoreNextChange = false;
-        return;
-      }
-      clearTimeout(debounce);
-      debounce = setTimeout(() => {
-        try {
-          const parsed = JSON.parse(view.monacoEditor.getValue());
-          update({ ...S, document: parsed, dirty: true });
-        } catch {
-          // Invalid JSON — don't update state
-        }
-      }, 600);
-    });
-    return;
-  }
-
-  // Edit (content) mode — centered column, no panzoom, always 100%
-  if (canvasMode === "edit") {
-    if (modeChanged) {
-      canvasWrap.style.padding = "0";
-      canvasWrap.style.overflow = "hidden";
-
-      // Remove zoom indicator left over from design/preview mode
-      resetZoomIndicator();
-    }
-
-    const { tpl: panelTpl, panel } = canvasPanelTemplate(null, null, true);
-    const editTpl = html`
-      <div class="content-edit-canvas">
-        <div class="content-edit-column">${panelTpl}</div>
-      </div>
-    `;
-    litRender(editTpl, canvasWrap);
-    canvasPanels.push(panel);
-    renderCanvasIntoPanel(panel, new Set(), S.ui.featureToggles);
-    return;
-  }
-
-  // Normal canvas mode (design / preview) — set up panzoom surface
-  if (modeChanged) {
-    canvasWrap.style.padding = "0";
-    canvasWrap.style.overflow = "hidden";
-  }
-
-  const {
-    sizeBreakpoints,
-    featureQueries: _featureQueries,
-    baseWidth,
-  } = parseMediaEntries(getEffectiveMedia(S.document.$media));
-  const hasMedia = sizeBreakpoints.length > 0;
-  const featureToggles = S.ui.featureToggles;
-
-  // Create panzoom wrapper (the element that gets transformed)
-  if (!hasMedia) {
-    // Single panel — use baseWidth if a custom one is defined, otherwise full-width
-    const effectiveMedia = getEffectiveMedia(S.document.$media);
-    const hasBaseWidth = effectiveMedia && effectiveMedia["--"];
-    const label = hasBaseWidth ? `${mediaDisplayName("--")} (${baseWidth}px)` : null;
-    const { tpl: panelTpl, panel } = canvasPanelTemplate(
-      hasBaseWidth ? "base" : null,
-      label,
-      !hasBaseWidth,
-      hasBaseWidth ? baseWidth : undefined,
-    );
-    litRender(
-      html`
-        <div
-          class="panzoom-wrap"
-          style="transform-origin:0 0"
-          ${ref((el) => {
-            if (el) view.panzoomWrap = /** @type {HTMLDivElement} */ (el);
-          })}
-        >
-          ${panelTpl}
-        </div>
-      `,
-      canvasWrap,
-    );
-    canvasPanels.push(panel);
-    renderCanvasIntoPanel(panel, new Set(), featureToggles);
-    applyTransform();
-    if (modeChanged) {
-      observeCenterUntilStable();
-    }
-    renderZoomIndicator();
-    return;
-  }
-
-  // Build all panels: base first, then breakpoints in declared order (ascending for min-width,
-  // descending for max-width — matching the direction of the design's media queries).
-  const allPanelDefs = [
-    {
-      name: "base",
-      displayName: mediaDisplayName("--"),
-      width: baseWidth,
-      activeSet: activeBreakpointsForWidth(sizeBreakpoints, baseWidth),
-    },
-  ];
-  for (const bp of sizeBreakpoints) {
-    allPanelDefs.push({
-      name: bp.name,
-      displayName: mediaDisplayName(bp.name),
-      width: bp.width,
-      activeSet: activeBreakpointsForWidth(sizeBreakpoints, bp.width),
-    });
-  }
-
-  /** @type {{ tpl: any; panel: any; activeSet: any }[]} */
-  const panelEntries = allPanelDefs.map((def) => {
-    const label = `${def.displayName} (${def.width}px)`;
-    const { tpl, panel } = canvasPanelTemplate(def.name, label, false, def.width);
-    return { tpl, panel, activeSet: def.activeSet };
-  });
-
-  litRender(
-    html`
-      <div
-        class="panzoom-wrap"
-        style="transform-origin:0 0"
-        ${ref((el) => {
-          if (el) view.panzoomWrap = /** @type {HTMLDivElement} */ (el);
-        })}
-      >
-        ${panelEntries.map((e) => e.tpl)}
-      </div>
-    `,
-    canvasWrap,
-  );
-
-  for (const { panel, activeSet } of panelEntries) {
-    canvasPanels.push(panel);
-    renderCanvasIntoPanel(panel, activeSet, featureToggles);
-  }
-
-  // Highlight active panel header
-  updateActivePanelHeaders();
-
-  // Apply current zoom + pan transform
-  applyTransform();
-  if (modeChanged) {
-    observeCenterUntilStable();
-  }
-
-  // Floating zoom indicator
-  renderZoomIndicator();
-}
-
-/**
- * Render document into a single canvas panel. Tries runtime rendering first, falls back to
- * structural preview.
- *
- * @param {any} panel
- * @param {any} activeBreakpoints
- * @param {any} featureToggles
- */
-function renderCanvasIntoPanel(panel, activeBreakpoints, featureToggles) {
-  const gen = view.renderGeneration;
-  renderCanvasLive(gen, S.document, panel.canvas).then((scope) => {
-    // Skip post-render setup if a newer render has started
-    if (gen !== view.renderGeneration) return;
-    if (scope) {
-      view.liveScope = scope;
-      applyCanvasMediaOverrides(panel.canvas, activeBreakpoints);
-      statusMessage("Runtime render OK", 1500);
-    } else {
-      // Fallback to structural preview
-      renderCanvasNode(S.document, [], panel.canvas, activeBreakpoints, featureToggles);
-    }
-    registerPanelDnD(panel);
-    registerPanelEvents(panel);
-    renderOverlays();
-    updateForcedPseudoPreview();
-
-    // Process pending inline edit now that the canvas is populated
-    if (view.pendingInlineEdit) {
-      const { path, mediaName: mn } = view.pendingInlineEdit;
-      view.pendingInlineEdit = null;
-      const targetPanel = canvasPanels.find((p) => p.mediaName === mn) || canvasPanels[0];
-      if (targetPanel) {
-        const el = findCanvasElement(path, targetPanel.canvas);
-        if (el) enterComponentInlineEdit(el, path);
-      }
-    }
-  });
-}
-
-// ─── Overlay system ───────────────────────────────────────────────────────────
-
-function renderOverlays() {
-  overlaysPanel.render();
-}
-
-/**
- * Build an overlay box descriptor (no DOM creation).
- *
- * @param {any} el
- * @param {any} type
- * @param {any} panel
- */
-function overlayBoxDescriptor(el, type, panel) {
-  const vpRect = panel.viewport.getBoundingClientRect();
-  const elRect = el.getBoundingClientRect();
-  const scale = effectiveZoom();
-  return {
-    cls: `overlay-box overlay-${type}`,
-    top: `${(elRect.top - vpRect.top + panel.viewport.scrollTop) / scale}px`,
-    left: `${(elRect.left - vpRect.left + panel.viewport.scrollLeft) / scale}px`,
-    width: `${elRect.width / scale}px`,
-    height: `${elRect.height / scale}px`,
-  };
-}
-
-function getActivePanel() {
-  if (canvasPanels.length === 0) return null;
-  if (canvasPanels.length === 1) return canvasPanels[0];
-  for (const p of canvasPanels) {
-    if (S.ui.activeMedia === null && (p.mediaName === "base" || p.mediaName === null)) return p;
-    if (p.mediaName === S.ui.activeMedia) return p;
-  }
-  return canvasPanels[0];
-}
-
-/**
- * Walk up the tree from a path, bubbling past inline elements until we find the nearest non-inline
- * ancestor. Returns the original path if already non-inline.
- *
- * @param {any} doc
- * @param {any} path
- */
-function bubbleInlinePath(doc, path) {
-  let currentPath = path;
-  while (currentPath.length >= 2) {
-    const node = getNodeAtPath(doc, currentPath);
-    const pPath = parentElementPath(currentPath);
-    const parentNode = pPath ? getNodeAtPath(doc, pPath) : null;
-    if (!node || !parentNode) break;
-    const childTag = (node.tagName ?? "div").toLowerCase();
-    const parentTag = (parentNode.tagName ?? "div").toLowerCase();
-    if (!isInlineInContext(childTag, parentTag)) break;
-    currentPath = pPath;
-  }
-  return currentPath;
-}
-
-/** Effective zoom scale — always 1 in edit (content) mode, S.ui.zoom otherwise. */
-function effectiveZoom() {
-  return canvasMode === "edit" ? 1 : S.ui.zoom;
-}
-
-/**
- * @param {any} path
- * @param {any} canvasEl
- */
-function findCanvasElement(path, canvasEl) {
-  let el = canvasEl.firstElementChild;
-  if (!el) return null;
-  if (path.length === 0) return el;
-
-  for (let i = 0; i < path.length; i += 2) {
-    if (path[i] !== "children" && path[i] !== "cases") return null;
-    const idx = path[i + 1];
-    if (idx === undefined) {
-      // Odd-length path like ['children', 2, 'children'] — $map container
-      // The wrapper div is children[0] of the current element
-      el = el.children[0];
-    } else if (idx === "map") {
-      // $map template: wrapper is children[0], template is wrapper.children[0]
-      el = el.children[0]?.children[0];
-    } else {
-      el = el.children[idx];
-    }
-    if (!el) break;
-  }
-
-  // Verify the result: if DOM traversal landed on the wrong element
-  // (e.g. a custom element template child instead of the intended node),
-  // fall back to scanning elToPath.
-  if (el) {
-    const elPath = elToPath.get(el);
-    if (elPath && pathsEqual(elPath, path)) return el;
-    // el has no path or wrong path — it's a template element, not the target
-  }
-
-  // Fall back: scan all descendants for an element with matching elToPath
-  for (const candidate of canvasEl.querySelectorAll("*")) {
-    const p = elToPath.get(candidate);
-    if (p && pathsEqual(p, path)) return candidate;
-  }
-  return null;
-}
-
 // ─── Left panel: delegated to panels/left-panel.js ───────────────────────────
 
 function renderLeftPanel() {
@@ -1359,6 +604,7 @@ function fileOpsCtx() {
     S,
     commit: (/** @type {any} */ ns) => {
       S = ns;
+      ({ doc, session } = fromFlat(S));
       render();
     },
     renderToolbar,
@@ -1370,6 +616,7 @@ function openFile() {
 async function loadMarkdown(/** @type {any} */ source, /** @type {any} */ fileHandle) {
   const ns = await _loadMarkdown(source, fileHandle);
   S = ns;
+  ({ doc, session } = fromFlat(S));
 }
 function saveFile() {
   return _saveFile(fileOpsCtx());
@@ -1388,6 +635,7 @@ function openProject() {
     S,
     commit: (/** @type {any} */ ns) => {
       S = ns;
+      ({ doc, session } = fromFlat(S));
     },
     renderActivityBar: () => renderActivityBar(S),
     renderLeftPanel,
@@ -1407,6 +655,7 @@ function openFileFromTree(/** @type {any} */ path) {
       },
       commit: (/** @type {any} */ ns) => {
         S = ns;
+        ({ doc, session } = fromFlat(S));
       },
       render,
       loadMarkdown,
@@ -1420,6 +669,7 @@ initShortcuts(() => ({
   S,
   setS: (ns) => {
     S = ns;
+    ({ doc, session } = fromFlat(S));
   },
   canvasMode,
   panX: view.panX,