@weasel-js/diagram-formats 1.11.1 → 1.12.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { diagramThemeFrom, DIAGRAM_THEME_KEY, diagramLabelOf, offPageSplits, diagramScene, themeDocValue, diagramShape, markShape, documentBoundsOf, dataNodeStyle, dataEdgeStyle, diagramEdgeOf, diagramContainerOf, NODE_STROKE_WIDTH, dataRegionStyle, poolAxisOf, titleIdOf, layoutOwnsRoute, EDGE_STROKE_WIDTH, diagramThemeOf, edgeIdOf, layoutOwnsPort, DEFAULT_PORTS, LANE_STROKE_WIDTH } from '@weasel-js/diagram';
-import { placedPagesOf, layoutPages, PAGES_DOC_KEY, isAnnotationLayer, boundsOfPath, layoutTextPose, warmRender, renderSceneToPixels, planPixelRender, viewToMat3, createRasterSession, pageHolding, effectivePose, derivedDepOf, pageName, derivedPartsOf, createScene, mat3 } from '@weasel-js/core';
+import { placedPagesOf, layoutPages, PAGES_DOC_KEY, isAnnotationLayer, boundsOfPath, layoutTextPose, warmRender, renderSceneToPixels, planPixelRender, viewToMat3, createRasterSession, pageHolding, effectivePose, derivedDepOf, pageName, derivedPartsOf, INHERIT, resolvePartPaint, createScene, mat3 } from '@weasel-js/core';
 import { svgNodesFromKit, svgLeafFromKit, warmSvg, serializeSvg, escapeAttr, svgPaintFromKit, svgStrokeFromKit } from '@weasel-js/svg';
 import { writePdf, registryFontSource } from '@weasel-js/pdf';
 
@@ -2978,12 +2978,11 @@ function diagramPainted(painters, node, pose) {
   return painter.paint(node, pose).flatMap((cmd) => commandNode(cmd, at) ?? []);
 }
 function derivedNodes(path, data) {
-  const parts = derivedPartsOf(path) ?? [{ path }];
-  return parts.flatMap((part) => svgLeafFromKit({
-    path: part.path,
-    ...part.fill !== void 0 ? { fill: part.fill } : data.fill !== void 0 ? { fill: data.fill } : {},
-    stroke: part.stroke !== void 0 ? part.stroke : data.stroke
-  }, boundsOfPath(part.path)) ?? []);
+  const parts = derivedPartsOf(path) ?? [{ path, fill: INHERIT, stroke: INHERIT }];
+  return parts.flatMap((part) => svgLeafFromKit(
+    { path: part.path, ...resolvePartPaint(part, data) },
+    boundsOfPath(part.path)
+  ) ?? []);
 }
 var one = (nodes) => nodes.length === 0 ? null : nodes.length === 1 ? nodes[0] : { kind: "group", children: nodes };
 function pageSvgNodes(scene, page) {
@@ -3089,7 +3088,8 @@ function pageRasterizer(session) {
       scene: empty,
       sourceRect: { x: -toRaster[6] / sx, y: -toRaster[7] / sy, width: rect.width * scale / sx, height: rect.height * scale / sy },
       scale: { x: sx, y: sy },
-      overlay: [{ kind: "group", transform: toPixels, children: [...commands] }]
+      overlay: [{ kind: "group", transform: toPixels, children: [...commands] }],
+      screen: toPixels
     });
   };
 }