@cardenelabs/cdl 0.42.0 → 0.43.0

package/dist/index.js

@@ -20215,7 +20215,8 @@ function expandLaneGapsForEdgeLabels(lanes, nodes, edges) {
   const nodeById = new Map(nodes.map((n) => [n.id, n]));
   const sortedByX = [...layoutedLanes].sort((a, b) => a.x - b.x);
   const laneIndexById = new Map(sortedByX.map((lane, i) => [lane.id, i]));
-  const requiredBoxWByPair = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
+  const requiredBoxWAdjacent = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
+  const requiredBoxWSpanning = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
   for (const edge of edges) {
     const fromLane = nodeById.get(edge.from)?.lane;
     const toLane = nodeById.get(edge.to)?.lane;
@@ -20227,23 +20228,33 @@ function expandLaneGapsForEdgeLabels(lanes, nodes, edges) {
     if (labelBoxW === 0) continue;
     const lo = Math.min(fi, ti);
     const hi = Math.max(fi, ti);
+    const \u8981\u6C42 = hi - lo === 1 ? requiredBoxWAdjacent : requiredBoxWSpanning;
     for (let pair = lo; pair < hi; pair++) {
-      if (labelBoxW > requiredBoxWByPair[pair]) requiredBoxWByPair[pair] = labelBoxW;
+      if (labelBoxW > \u8981\u6C42[pair]) \u8981\u6C42[pair] = labelBoxW;
     }
   }
+  const \u7BB1\u306E\u534A\u5E45 = /* @__PURE__ */ new Map();
+  for (const n of nodes) {
+    const \u4ECA = \u7BB1\u306E\u534A\u5E45.get(n.lane) ?? 0;
+    if (n.w / 2 > \u4ECA) \u7BB1\u306E\u534A\u5E45.set(n.lane, n.w / 2);
+  }
   const requiredPitchByPair = [];
   for (let i = 0; i < sortedByX.length - 1; i++) {
     const lane = sortedByX[i];
     const rightLane = sortedByX[i + 1];
-    const halfSum = lane.width / 2 + rightLane.width / 2;
+    const laneHalfSum = lane.width / 2 + rightLane.width / 2;
+    const nodeHalfSum = (\u7BB1\u306E\u534A\u5E45.get(lane.id) ?? 0) + (\u7BB1\u306E\u534A\u5E45.get(rightLane.id) ?? 0);
     const currentPitch = rightLane.x + rightLane.width / 2 - (lane.x + lane.width / 2);
-    const maxLabelBoxW = requiredBoxWByPair[i];
-    if (maxLabelBoxW === 0) {
+    const \u96A3 = requiredBoxWAdjacent[i];
+    const \u8DE8 = requiredBoxWSpanning[i];
+    if (\u96A3 === 0 && \u8DE8 === 0) {
       requiredPitchByPair.push(currentPitch);
       continue;
     }
-    const requiredGap = maxLabelBoxW + CLEARANCE_NODE_LABEL * 2 + EDGE_STUB_OUT * 2;
-    requiredPitchByPair.push(Math.max(currentPitch, requiredGap + halfSum));
+    const \u4E0A\u4E57\u305B = CLEARANCE_NODE_LABEL * 2 + EDGE_STUB_OUT * 2;
+    const \u96A3\u306E\u8981\u6C42 = \u96A3 === 0 ? 0 : \u96A3 + \u4E0A\u4E57\u305B + nodeHalfSum;
+    const \u8DE8\u306E\u8981\u6C42 = \u8DE8 === 0 ? 0 : \u8DE8 + \u4E0A\u4E57\u305B + laneHalfSum;
+    requiredPitchByPair.push(Math.max(currentPitch, \u96A3\u306E\u8981\u6C42, \u8DE8\u306E\u8981\u6C42));
   }
   const targetPitch = Math.ceil(Math.max(...requiredPitchByPair));
   const shiftedXById = /* @__PURE__ */ new Map();