@cardenelabs/cdl 0.20.0 → 0.21.0

package/dist/index.js

@@ -12091,6 +12091,7 @@ function footerShapeDrawTop(node) {
 
 // src/layout/collisions.ts
 var LANE_LABEL_CLEARANCE_MARGIN = 2;
+var NEAR_MISS_MARGIN = LANE_LABEL_CLEARANCE_MARGIN;
 function collectBBoxes(lanes, nodes, edges) {
   const out = [];
   for (const lane of lanes) {
@@ -12918,8 +12919,8 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
         };
         const shift = computeOverlapShift(label, inflated);
         if (!shift) continue;
-        const amount = shift.amount - minClearance;
-        if (amount <= 0) continue;
+        const amount = shift.amount - minClearance + NEAR_MISS_MARGIN;
+        if (amount <= NEAR_MISS_MARGIN) continue;
         out.push({
           target: { kind: "label", id: label.id },
           axis: shift.axis,
@@ -12960,6 +12961,36 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
         out.push({ target: { kind: "label", id: moveBox.id }, ...shift });
       }
     }
+    for (let i = 0; i < labels.length; i++) {
+      for (let j = i + 1; j < labels.length; j++) {
+        const a = labels[i];
+        const b = labels[j];
+        if (computeOverlapShift(a, b)) continue;
+        const orderA = edgeOrder.get(a.id);
+        const orderB = edgeOrder.get(b.id);
+        const moveBox = orderA > orderB ? a : b;
+        const staticBox = orderA > orderB ? b : a;
+        const required = requiredNearClearance(moveBox.kind, staticBox.kind);
+        const inflated = {
+          ...staticBox,
+          x: staticBox.x - required,
+          y: staticBox.y - required,
+          w: staticBox.w + required * 2,
+          h: staticBox.h + required * 2
+        };
+        const shift = computeOverlapShift(moveBox, inflated);
+        if (!shift) continue;
+        const amount = shift.amount - minClearance + NEAR_MISS_MARGIN;
+        if (amount <= NEAR_MISS_MARGIN) continue;
+        out.push({
+          target: { kind: "label", id: moveBox.id },
+          axis: shift.axis,
+          sign: shift.sign,
+          amount,
+          chain: false
+        });
+      }
+    }
     for (const label of labels) {
       const currentShift = getLabelChainShift(label.id);
       if (currentShift.dx === 0 && currentShift.dy === 0) continue;
@@ -13055,12 +13086,46 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
         if (bestSideIdx < 0) continue;
         const amount = pathLabelClearance - gap + pathLabelClearance;
         const ordered = edgeProbes.map((p, idx) => ({ p, idx })).sort((a, b) => probeDist[a.idx] - probeDist[b.idx]);
+        let \u7DDA\u3092\u52D5\u304B\u305B\u305F = false;
         for (const { p } of ordered) {
           const axis = p.axis;
           if (!pathShiftIsSafe(e.id, axis, p.sign, amount)) continue;
           out.push({ target: { kind: "edge-path", id: e.id }, axis, sign: p.sign, amount });
+          \u7DDA\u3092\u52D5\u304B\u305B\u305F = true;
           break;
         }
+        if (!\u7DDA\u3092\u52D5\u304B\u305B\u305F) {
+          const \u82AF = { x: label.x + label.w / 2, y: label.y + label.h / 2 };
+          let \u8FD1\u3044\u70B9 = null;
+          let \u6700\u77ED = Infinity;
+          for (const seg of segs) {
+            for (const \u70B9 of [
+              { x: seg.x1, y: seg.y1 },
+              { x: seg.x2, y: seg.y2 },
+              { x: (seg.x1 + seg.x2) / 2, y: (seg.y1 + seg.y2) / 2 }
+            ]) {
+              const d = Math.hypot(\u70B9.x - \u82AF.x, \u70B9.y - \u82AF.y);
+              if (d < \u6700\u77ED) {
+                \u6700\u77ED = d;
+                \u8FD1\u3044\u70B9 = \u70B9;
+              }
+            }
+          }
+          if (\u8FD1\u3044\u70B9) {
+            const dx = \u82AF.x - \u8FD1\u3044\u70B9.x;
+            const dy = \u82AF.y - \u8FD1\u3044\u70B9.y;
+            const axis = Math.abs(dx) >= Math.abs(dy) ? "x" : "y";
+            const \u5411\u304D = axis === "x" ? dx : dy;
+            const sign = \u5411\u304D >= 0 ? 1 : -1;
+            out.push({
+              target: { kind: "label", id: label.id },
+              axis,
+              sign,
+              amount: pathLabelClearance - gap + NEAR_MISS_MARGIN,
+              chain: false
+            });
+          }
+        }
       }
     }
     for (const label of labels) {
@@ -15248,7 +15313,7 @@ function layoutNodes(diag, lanes) {
     const cx = lane.x + lane.width / 2;
     const \u6BB5\u306E\u82AF = rowCy.get(n.stack);
     const \u6BB5\u306E\u9AD8\u3055 = rowH.get(n.stack);
-    const \u81EA\u524D\u306E\u9AD8\u3055 = n.rowMarks !== void 0 || \u6BB5\u3092\u7A4D\u3080\u7BB1\u304B(n.kind, (n.rows?.length ?? 0) > 0);
+    const \u81EA\u524D\u306E\u9AD8\u3055 = n.rowMarks !== void 0;
     const h = n.h ?? (\u81EA\u524D\u306E\u9AD8\u3055 ? \u7BB1\u306E\u9AD8\u3055(n, size.h) : \u6BB5\u306E\u9AD8\u3055);
     const cy = \u6BB5\u306E\u82AF;
     const w = autoRowsWidth(n, size.w);