@aranzatech/diagrams-bpmn 0.3.3 → 0.3.4

package/dist/layout/index.cjs

@@ -1691,6 +1691,33 @@ function nodeRect(node, byId, cache) {
 function rectContainsRect(outer, inner) {
   return inner.x >= outer.x && inner.y >= outer.y && inner.x + inner.width <= outer.x + outer.width && inner.y + inner.height <= outer.y + outer.height;
 }
+function sortNodesParentFirst(nodes) {
+  const byId = new Map(nodes.map((node) => [node.id, node]));
+  const memo = /* @__PURE__ */ new Map();
+  const depthOf = (node) => {
+    const cached = memo.get(node.id);
+    if (cached != null) return cached;
+    if (!node.parentId) {
+      memo.set(node.id, 0);
+      return 0;
+    }
+    const parent = byId.get(node.parentId);
+    const depth = parent ? depthOf(parent) + 1 : 0;
+    memo.set(node.id, depth);
+    return depth;
+  };
+  return [...nodes].sort((a, b) => {
+    const depthDiff = depthOf(a) - depthOf(b);
+    if (depthDiff !== 0) return depthDiff;
+    const ay = a.position?.y ?? 0;
+    const by = b.position?.y ?? 0;
+    if (ay !== by) return ay - by;
+    const ax = a.position?.x ?? 0;
+    const bx = b.position?.x ?? 0;
+    if (ax !== bx) return ax - bx;
+    return a.id.localeCompare(b.id);
+  });
+}
 function gapMidX(sAbs, sW, tAbs, tW) {
   const leftRightEdge = Math.min(sAbs.x + sW, tAbs.x + tW);
   const rightLeftEdge = Math.max(sAbs.x, tAbs.x);
@@ -1964,7 +1991,7 @@ async function bpmnCustomLayout(nodes, edges) {
     const { bpmnElkLayout: bpmnElkLayout2 } = await Promise.resolve().then(() => (init_elk(), elk_exports));
     const elkResult = await bpmnElkLayout2(nodes.filter((n) => !LAYOUT_ARTIFACT_TYPES.has(n.data.elementType)), edges);
     const posArtifacts = positionArtifacts(artifacts, elkResult.nodes, edges, nodes);
-    return { nodes: [...elkResult.nodes, ...posArtifacts], edges: elkResult.edges };
+    return { nodes: sortNodesParentFirst([...elkResult.nodes, ...posArtifacts]), edges: elkResult.edges };
   }
   const poolIds = new Set(pools.map((p) => p.id));
   const allLaneIds = new Set(lanes.map((l) => l.id));
@@ -2035,7 +2062,7 @@ async function bpmnCustomLayout(nodes, edges) {
   const routedEdges = routeEdges(edges, resultNodes, allBackEdgeIds, allLaneIds, poolIds);
   const positionedArtifacts = positionArtifacts(artifacts, resultNodes, edges, nodes);
   return {
-    nodes: [...resultNodes, ...positionedArtifacts],
+    nodes: sortNodesParentFirst([...resultNodes, ...positionedArtifacts]),
     edges: routedEdges
   };
 }