@canvas-harness/core 0.1.12 → 0.1.14

package/dist/index.cjs

@@ -5519,6 +5519,7 @@ var createRenderer = (opts) => {
     stats: () => loop.stats(),
     lastDrawCount: () => lastDrawn,
     getOverlaySet: () => [...overlaySet],
+    getAssetCache: () => assetCache,
     dispose() {
       loop.stop();
       unsubChange();
@@ -5853,8 +5854,13 @@ var hitTestAny = (store, worldPoint, cameraZ, selectedNodes = /* @__PURE__ */ ne
     }
   }
   const nodeHit = hitTestPoint(store, worldPoint, cameraZ, selectedNodes);
-  if (nodeHit) return nodeHit;
-  return hitTestEdge(store, worldPoint, cameraZ);
+  const edgeHit = hitTestEdge(store, worldPoint, cameraZ);
+  if (nodeHit && edgeHit && "edgeId" in edgeHit) {
+    const nodeZ = store.getNode(nodeHit.nodeId)?.z ?? 0;
+    const edgeZ = store.getEdge(edgeHit.edgeId)?.z ?? 0;
+    return edgeZ >= nodeZ ? edgeHit : nodeHit;
+  }
+  return nodeHit ?? edgeHit;
 };
 var marqueeNodes = (store, rect) => {
   const candidates = store.querySpatial({ rect }).nodes;
@@ -6109,9 +6115,14 @@ var makeContext = (cssW, cssH, scale, opts) => {
 };
 var paintScene = (ctx, store, nodes, scale, opts, edges) => {
   const theme = opts.theme;
+  const assetCache = opts.assetCache;
   for (const node of nodes) {
     drawWithNodeTransform(ctx, node, () => {
       if (isDrawablePrimitive(node.type)) drawShape(ctx, node, scale, theme);
+      if (assetCache) {
+        if (node.type === "image") paintImageNode(ctx, node, assetCache, theme);
+        else if (node.type === "icon") paintIconNode(ctx, node, assetCache, scale, theme);
+      }
       paintContent(ctx, node);
     });
   }
@@ -6223,10 +6234,30 @@ var renderNodeSvg = (node) => {
   const strokeWidth = node.style?.strokeWidth ?? 1.5;
   const opacity = node.style?.opacity ?? 1;
   const rotate = node.angle !== 0 ? ` transform="rotate(${node.angle * 180 / Math.PI} ${node.x + node.w / 2} ${node.y + node.h / 2})"` : "";
-  const shape = renderShapeSvg(node, fill, stroke, strokeWidth, opacity);
   const text = renderTextSvg(node);
+  if (node.type === "image") {
+    return `<g${rotate}>${renderImageNodeSvg(node, opacity)}${text}</g>`;
+  }
+  if (node.type === "icon") {
+    return `<g${rotate}>${renderIconNodeSvg(node, opacity)}${text}</g>`;
+  }
+  const shape = renderShapeSvg(node, fill, stroke, strokeWidth, opacity);
   return `<g${rotate}>${shape}${text}</g>`;
 };
+var renderImageNodeSvg = (node, opacity) => {
+  const data = node.data;
+  if (!data?.src) return "";
+  return `<image href="${escapeAttr(data.src)}" x="${node.x}" y="${node.y}" width="${node.w}" height="${node.h}" preserveAspectRatio="none" opacity="${opacity}" />`;
+};
+var renderIconNodeSvg = (node, opacity) => {
+  const data = node.data;
+  if (!data?.src) return "";
+  const colored = node.style?.iconColor ? applySvgColor(data.src, node.style.iconColor) : data.src;
+  const dim = extractSvgDimensions(colored);
+  const sx = node.w / dim.w;
+  const sy = node.h / dim.h;
+  return `<g transform="translate(${node.x} ${node.y}) scale(${sx} ${sy})" opacity="${opacity}">${colored}</g>`;
+};
 var renderShapeSvg = (node, fill, stroke, strokeWidth, opacity) => {
   const attrs = (extra) => `fill="${escapeAttr(fill)}" stroke="${escapeAttr(stroke)}" stroke-width="${strokeWidth}" opacity="${opacity}"${extra}`;
   switch (node.type) {
@@ -6648,6 +6679,7 @@ exports.clipSamples = clipSamples;
 exports.computeAutoFitHeight = computeAutoFitHeight;
 exports.computeEdgeGeometry = computeEdgeGeometry;
 exports.copy = copy;
+exports.createAssetCache = createAssetCache;
 exports.createCanvasStore = createCanvasStore;
 exports.createDefaultTextareaEditor = createDefaultTextareaEditor;
 exports.createFrameLoop = createFrameLoop;
@@ -6724,6 +6756,8 @@ exports.onMathJaxReady = onMathJaxReady;
 exports.opSchemas = opSchemas;
 exports.opSchemasAsAnthropicTools = opSchemasAsAnthropicTools;
 exports.paintBackground = paintBackground;
+exports.paintIconNode = paintIconNode;
+exports.paintImageNode = paintImageNode;
 exports.panByScreen = panByScreen;
 exports.paste = paste;
 exports.pointInNode = pointInNode;