@markdy/renderer-dom 0.8.25 → 0.8.27

package/dist/index.d.ts

@@ -81,6 +81,17 @@ interface SvgExportOptions {
 }
 declare function exportDiagramAsVectorSvg(containerEl: HTMLElement, options?: SvgExportOptions): string;
 
+/**
+ * packages/renderer-dom/src/export/png-exporter.ts
+ * High-DPI raster PNG export with 2x retina scaling.
+ * Zero external dependencies.
+ */
+
+interface PngExportOptions extends SvgExportOptions {
+    pixelRatio?: number;
+}
+declare function exportDiagramAsPng(containerEl: HTMLElement, options?: PngExportOptions): Promise<Blob>;
+
 /**
  * packages/renderer-dom/src/presentation-controller.ts
  * Interactive Beat Navigation & Keyboard-driven presentation controller.
@@ -95,13 +106,17 @@ declare class DiagramPresentationController {
     private diagram;
     private plan;
     private currentBeatIndex;
+    private options;
+    private isDestroyed;
     constructor(diagram: Diagram, plan: RenderPlan, options?: ControllerOptions);
     nextBeat(): void;
     prevBeat(): void;
+    private applyCurrentBeat;
     getCurrentBeatIndex(): number;
     togglePlay(): void;
     setSpeed(rate: number): void;
-    private attachKeyboardListener;
+    private onKeyDown;
+    destroy(): void;
 }
 
-export { type AnimationRecordFrame, type ControllerOptions, type Diagram, type DiagramOptions, DiagramPresentationController, type GifExportOptions, ICON_REGISTRY, type IconSpec, type SvgExportOptions, createDiagram, encodeGifSequence, exportDiagramAsVectorSvg };
+export { type AnimationRecordFrame, type ControllerOptions, type Diagram, type DiagramOptions, DiagramPresentationController, type GifExportOptions, ICON_REGISTRY, type IconSpec, type PngExportOptions, type SvgExportOptions, createDiagram, encodeGifSequence, exportDiagramAsPng, exportDiagramAsVectorSvg };

package/dist/index.js

@@ -808,13 +808,14 @@ function ensureAnnotationStyles(doc) {
   doc.head.appendChild(style);
 }
 function positionForAnnotation(position, bounds, index) {
-  const pad = 24;
+  const pad = 28;
+  const topPad = 68;
   const p = (position ?? "").toLowerCase();
-  if (p.includes("top") && p.includes("right")) return { x: bounds.width - pad - 200, y: pad + index * 48 };
-  if (p.includes("top") && p.includes("left")) return { x: pad, y: pad + index * 48 };
+  if (p.includes("top") && p.includes("right")) return { x: bounds.width - pad - 200, y: topPad + index * 48 };
+  if (p.includes("top") && p.includes("left")) return { x: pad, y: topPad + index * 48 };
   if (p.includes("bottom") && p.includes("right")) return { x: bounds.width - pad - 200, y: bounds.height - pad - 40 };
   if (p.includes("bottom") && p.includes("left")) return { x: pad, y: bounds.height - pad - 40 };
-  return { x: bounds.width - pad - 200, y: pad + index * 48 };
+  return { x: bounds.width - pad - 200, y: topPad + index * 48 };
 }
 function mountAnnotations(layer, annotations, nodes, theme, bounds) {
   if (annotations.length === 0) return;
@@ -2110,11 +2111,16 @@ function createDiagram(opts) {
   const totalDurationMs = plan.duration * 1e3;
   const durationSeconds = plan.duration;
   const viewport = document.createElement("div");
+  viewport.className = "markdy-viewport";
   Object.assign(viewport.style, {
     position: "relative",
     width: "100%",
+    height: "100%",
+    maxWidth: "100%",
+    maxHeight: "100%",
     aspectRatio: `${plan.meta.width} / ${plan.meta.height}`,
-    overflow: "hidden"
+    overflow: "hidden",
+    boxSizing: "border-box"
   });
   container.appendChild(viewport);
   let progressEl = null;
@@ -2269,14 +2275,85 @@ function createDiagram(opts) {
     nodeEls.set(node.id, el);
   }
   let fitScale = 1;
+  let sceneOffsetX = 0;
+  let sceneOffsetY = 0;
+  function computeContentBounds() {
+    if (!plan.nodes || plan.nodes.length === 0) {
+      return { minX: 0, minY: 0, maxX: plan.meta.width, maxY: plan.meta.height, width: plan.meta.width, height: plan.meta.height };
+    }
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    for (const node of plan.nodes) {
+      minX = Math.min(minX, node.x);
+      minY = Math.min(minY, node.y);
+      maxX = Math.max(maxX, node.x + node.width);
+      maxY = Math.max(maxY, node.y + node.height);
+    }
+    for (const gb of plan.groupBoundaries ?? []) {
+      minX = Math.min(minX, gb.x);
+      minY = Math.min(minY, gb.y);
+      maxX = Math.max(maxX, gb.x + gb.width);
+      maxY = Math.max(maxY, gb.y + gb.height);
+    }
+    for (const bus of plan.treeBuses ?? []) {
+      minX = Math.min(minX, bus.parentX, ...bus.childXs.length ? bus.childXs : [bus.parentX]);
+      minY = Math.min(minY, bus.parentY, bus.branchY, bus.childY);
+      maxX = Math.max(maxX, bus.parentX, ...bus.childXs.length ? bus.childXs : [bus.parentX]);
+      maxY = Math.max(maxY, bus.parentY, bus.branchY, bus.childY);
+    }
+    if (plan.title) {
+      minY = Math.min(minY, 20);
+    }
+    const pad = 36;
+    minX = Math.max(0, minX - pad);
+    minY = Math.max(0, minY - pad);
+    maxX = Math.min(plan.meta.width, maxX + pad);
+    maxY = Math.min(plan.meta.height, maxY + pad);
+    const width = Math.max(maxX - minX, 200);
+    const height = Math.max(maxY - minY, 140);
+    return { minX, minY, maxX, maxY, width, height };
+  }
   function scaleScene() {
-    const width = viewport.clientWidth || plan.meta.width;
-    fitScale = width / plan.meta.width;
+    const isBrowserLayout = (viewport.clientWidth || container.clientWidth || 0) > 0;
+    if (!isBrowserLayout) {
+      fitScale = 1;
+      sceneOffsetX = 0;
+      sceneOffsetY = 0;
+      scene.style.left = "0px";
+      scene.style.top = "0px";
+      scene.style.transformOrigin = "0 0";
+      scene.style.transform = "scale(1)";
+      return;
+    }
+    const vWidth = viewport.clientWidth || container.clientWidth || plan.meta.width;
+    const vHeight = viewport.clientHeight || container.clientHeight || vWidth * plan.meta.height / plan.meta.width;
+    const canvasScaleX = vWidth / plan.meta.width;
+    const canvasScaleY = vHeight / plan.meta.height;
+    const baseCanvasScale = Math.min(canvasScaleX, canvasScaleY);
+    const bounds = computeContentBounds();
+    const contentScaleX = vWidth * 0.94 / bounds.width;
+    const contentScaleY = vHeight * 0.94 / bounds.height;
+    const optimalContentScale = Math.min(contentScaleX, contentScaleY);
+    const chosenScale = Math.max(
+      baseCanvasScale,
+      Math.min(optimalContentScale, baseCanvasScale * 1.45)
+    );
+    fitScale = Number.isFinite(chosenScale) && chosenScale > 0 ? chosenScale : 1;
+    const scaledWidth = plan.meta.width * fitScale;
+    const scaledHeight = plan.meta.height * fitScale;
+    sceneOffsetX = (vWidth - scaledWidth) / 2;
+    sceneOffsetY = (vHeight - scaledHeight) / 2;
+    scene.style.left = `${sceneOffsetX}px`;
+    scene.style.top = `${sceneOffsetY}px`;
+    scene.style.transformOrigin = "0 0";
     scene.style.transform = `scale(${fitScale})`;
   }
   scaleScene();
   const resizeObserver = typeof ResizeObserver === "function" ? new ResizeObserver(scaleScene) : null;
   resizeObserver?.observe(viewport);
+  if (container !== viewport) resizeObserver?.observe(container);
   const edgeRuntimes = /* @__PURE__ */ new Map();
   const edgeSceneId = createEdgeSceneId();
   const sequenceAnims = plan.diagramType === "sequence" ? mountSequenceLayer(
@@ -2341,8 +2418,8 @@ function createDiagram(opts) {
   function handleViewportWheel(event) {
     event.preventDefault();
     const rect = viewport.getBoundingClientRect();
-    const pointerX = (event.clientX - rect.left) / fitScale;
-    const pointerY = (event.clientY - rect.top) / fitScale;
+    const pointerX = (event.clientX - rect.left - sceneOffsetX) / fitScale;
+    const pointerY = (event.clientY - rect.top - sceneOffsetY) / fitScale;
     const nextScale = Math.min(MAX_VIEWPORT_ZOOM, Math.max(MIN_VIEWPORT_ZOOM, viewportScale * Math.exp(-event.deltaY * VIEWPORT_ZOOM_STEP)));
     if (nextScale === viewportScale) return;
     const sceneX = (pointerX - viewportPanX) / viewportScale;
@@ -2694,7 +2771,7 @@ function lzwCompress(pixels, minCodeSize = 8) {
     if (nextCode === 1 << codeSize && codeSize < 12) {
       codeSize++;
     }
-    if (nextCode >= 4095) {
+    if (nextCode >= 4096) {
       codes.push(clearCode);
       dict = /* @__PURE__ */ new Map();
       for (let j = 0; j < clearCode; j++) dict.set(String(j), j);
@@ -2785,31 +2862,101 @@ function encodeGifSequence(frames, options = {}) {
 
 // src/export/svg-exporter.ts
 function exportDiagramAsVectorSvg(containerEl, options = {}) {
-  const svgEl = containerEl.querySelector("svg");
-  if (!svgEl) throw new Error("No Markdy SVG element found in container");
-  const clonedSvg = svgEl.cloneNode(true);
-  const width = svgEl.getAttribute("width") || String(svgEl.clientWidth || 800);
-  const height = svgEl.getAttribute("height") || String(svgEl.clientHeight || 400);
-  clonedSvg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
-  clonedSvg.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
-  clonedSvg.setAttribute("width", width);
-  clonedSvg.setAttribute("height", height);
-  clonedSvg.setAttribute("viewBox", `0 0 ${width} ${height}`);
+  const sceneEl = containerEl.classList?.contains("markdy-scene-root") ? containerEl : containerEl.querySelector(".markdy-scene-root") || containerEl.querySelector("svg") || (containerEl.tagName?.toLowerCase() === "svg" ? containerEl : null);
+  if (!sceneEl) throw new Error("No Markdy scene element found in container");
+  if (sceneEl.tagName?.toLowerCase() === "svg") {
+    const clonedSvg = sceneEl.cloneNode(true);
+    if (!clonedSvg.getAttribute("xmlns")) {
+      clonedSvg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
+    }
+    const serializer2 = new XMLSerializer();
+    return `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+${serializer2.serializeToString(clonedSvg)}`;
+  }
+  const clonedScene = sceneEl.cloneNode(true);
+  const widthStr = clonedScene.style.width || String(sceneEl.clientWidth || 800);
+  const heightStr = clonedScene.style.height || String(sceneEl.clientHeight || 400);
+  let width = parseFloat(widthStr);
+  let height = parseFloat(heightStr);
+  if (isNaN(width)) width = 800;
+  if (isNaN(height)) height = 400;
+  const scale = options.scale || 1;
+  const scaledWidth = width * scale;
+  const scaledHeight = height * scale;
+  clonedScene.style.transform = `scale(${scale})`;
+  clonedScene.style.transformOrigin = "0 0";
+  clonedScene.style.position = "relative";
+  clonedScene.style.left = "0px";
+  clonedScene.style.top = "0px";
+  clonedScene.setAttribute("xmlns", "http://www.w3.org/1999/xhtml");
   if (options.transparentBackground) {
-    const bgRect = clonedSvg.querySelector("rect");
-    if (bgRect) bgRect.remove();
+    clonedScene.style.background = "transparent";
   }
+  const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
+  svg.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+  svg.setAttribute("width", String(scaledWidth));
+  svg.setAttribute("height", String(scaledHeight));
+  svg.setAttribute("viewBox", `0 0 ${scaledWidth} ${scaledHeight}`);
   if (options.includeThemeStyles !== false) {
     const styleEl = document.createElementNS("http://www.w3.org/2000/svg", "style");
-    styleEl.textContent = `
-      text { font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; }
+    let combinedStyles = `
+      foreignObject { width: 100%; height: 100%; }
       .markdy-node { transition: opacity 0.3s ease; }
     `;
-    clonedSvg.insertBefore(styleEl, clonedSvg.firstChild);
-  }
+    if (typeof document !== "undefined") {
+      const styles = document.querySelectorAll("style[id^='markdy-']");
+      for (let i = 0; i < styles.length; i++) {
+        combinedStyles += styles[i].textContent + "\n";
+      }
+    }
+    styleEl.textContent = combinedStyles;
+    svg.appendChild(styleEl);
+  }
+  const foreignObject = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
+  foreignObject.setAttribute("width", "100%");
+  foreignObject.setAttribute("height", "100%");
+  foreignObject.appendChild(clonedScene);
+  svg.appendChild(foreignObject);
   const serializer = new XMLSerializer();
   return `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-` + serializer.serializeToString(clonedSvg);
+` + serializer.serializeToString(svg);
+}
+
+// src/export/png-exporter.ts
+async function exportDiagramAsPng(containerEl, options = {}) {
+  const svgXml = exportDiagramAsVectorSvg(containerEl, options);
+  const pixelRatio = options.pixelRatio || 2;
+  const blob = new Blob([svgXml], { type: "image/svg+xml;charset=utf-8" });
+  const url = URL.createObjectURL(blob);
+  const img = new Image();
+  await new Promise((resolve, reject) => {
+    img.onload = () => resolve();
+    img.onerror = () => {
+      URL.revokeObjectURL(url);
+      reject(new Error("Failed to rasterize SVG into Image for PNG export"));
+    };
+    img.src = url;
+  });
+  const width = img.naturalWidth || 800;
+  const height = img.naturalHeight || 400;
+  const canvas = document.createElement("canvas");
+  canvas.width = width * pixelRatio;
+  canvas.height = height * pixelRatio;
+  const ctx = canvas.getContext("2d");
+  if (!ctx) {
+    URL.revokeObjectURL(url);
+    throw new Error("Could not get 2D canvas context for PNG export");
+  }
+  ctx.scale(pixelRatio, pixelRatio);
+  ctx.drawImage(img, 0, 0, width, height);
+  URL.revokeObjectURL(url);
+  return new Promise((resolve, reject) => {
+    canvas.toBlob((b) => {
+      if (b) resolve(b);
+      else reject(new Error("Canvas toBlob failed for PNG export"));
+    }, "image/png");
+  });
 }
 
 // src/presentation-controller.ts
@@ -2817,60 +2964,79 @@ var DiagramPresentationController = class {
   diagram;
   plan;
   currentBeatIndex = 0;
+  options;
+  isDestroyed = false;
   constructor(diagram, plan, options = {}) {
     this.diagram = diagram;
     this.plan = plan;
+    this.options = options;
     if (options.enableKeyboard !== false && typeof window !== "undefined") {
-      this.attachKeyboardListener();
+      window.addEventListener("keydown", this.onKeyDown);
     }
   }
   nextBeat() {
     if (this.currentBeatIndex < this.plan.beats.length - 1) {
       this.currentBeatIndex++;
-      const beat = this.plan.beats[this.currentBeatIndex];
-      this.diagram.seek(beat.start);
+      this.applyCurrentBeat();
     }
   }
   prevBeat() {
     if (this.currentBeatIndex > 0) {
       this.currentBeatIndex--;
-      const beat = this.plan.beats[this.currentBeatIndex];
-      this.diagram.seek(beat.start);
+      this.applyCurrentBeat();
+    }
+  }
+  applyCurrentBeat() {
+    const beat = this.plan.beats[this.currentBeatIndex];
+    this.diagram.seek(beat.start);
+    if (this.options.onBeatChange) {
+      this.options.onBeatChange(beat.name, this.currentBeatIndex);
     }
   }
   getCurrentBeatIndex() {
     return this.currentBeatIndex;
   }
   togglePlay() {
-    this.diagram.play();
+    if (this.diagram.isPlaying()) {
+      this.diagram.pause();
+    } else {
+      this.diagram.play();
+    }
   }
   setSpeed(rate) {
     this.diagram.setPlaybackRate(rate);
   }
-  attachKeyboardListener() {
-    window.addEventListener("keydown", (e) => {
-      if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) return;
-      switch (e.key) {
-        case "ArrowRight":
-        case "PageDown":
-          this.nextBeat();
-          break;
-        case "ArrowLeft":
-        case "PageUp":
-          this.prevBeat();
-          break;
-        case " ":
-          e.preventDefault();
-          this.togglePlay();
-          break;
-        case "1":
-          this.setSpeed(1);
-          break;
-        case "2":
-          this.setSpeed(2);
-          break;
-      }
-    });
+  onKeyDown = (e) => {
+    if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement || e.target instanceof HTMLSelectElement || e.target?.isContentEditable) {
+      return;
+    }
+    switch (e.key) {
+      case "ArrowRight":
+      case "PageDown":
+        this.nextBeat();
+        break;
+      case "ArrowLeft":
+      case "PageUp":
+        this.prevBeat();
+        break;
+      case " ":
+        e.preventDefault();
+        this.togglePlay();
+        break;
+      case "1":
+        this.setSpeed(1);
+        break;
+      case "2":
+        this.setSpeed(2);
+        break;
+    }
+  };
+  destroy() {
+    if (this.isDestroyed) return;
+    this.isDestroyed = true;
+    if (typeof window !== "undefined") {
+      window.removeEventListener("keydown", this.onKeyDown);
+    }
   }
 };
 export {
@@ -2878,5 +3044,6 @@ export {
   ICON_REGISTRY,
   createDiagram,
   encodeGifSequence,
+  exportDiagramAsPng,
   exportDiagramAsVectorSvg
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markdy/renderer-dom",
-  "version": "0.8.25",
+  "version": "0.8.27",
   "description": "Browser renderer for diagram-native animated MarkdyScript architecture diagrams, built on the Web Animations API.",
   "license": "MIT",
   "type": "module",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@markdy/core": "0.8.25"
+    "@markdy/core": "0.8.27"
   },
   "devDependencies": {
     "jsdom": "^29.1.1",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
     "vitest": "^4.1.7",
-    "@markdy/stdlib-systems": "0.8.25"
+    "@markdy/stdlib-systems": "0.8.27"
   },
   "scripts": {
     "build": "tsup",