@cardenelabs/cdl 0.64.0 → 0.65.0

package/dist/react.js

@@ -1139,6 +1139,25 @@ var ARROW_ENDPOINT_CENTER_TOL = 8;
 var ROW_GAP_VARIANCE_TOL = 40;
 var COLUMN_GAP_VARIANCE_TOL = 40;
 var LANE_BORDER_CLEARANCE_TOL = 2;
+function laneVerticalRange(lane, nodes) {
+  const pinnedWithHeight = lane.posX !== void 0 && lane.posY !== void 0 && lane.posH !== void 0;
+  if (!lane.contain && !pinnedWithHeight) return void 0;
+  let top = lane.y;
+  let bottom = lane.y + lane.height;
+  for (const n of nodes) {
+    if (n.lane !== lane.id) continue;
+    top = Math.min(top, n.cy - n.h / 2);
+    bottom = Math.max(bottom, n.cy + n.h / 2);
+  }
+  return { top, bottom };
+}
+function rectCrossesLaneBorder(rect, lane, range) {
+  if (range !== void 0 && (rect.y + rect.h <= range.top || rect.y >= range.bottom)) return void 0;
+  const crosses = (lineX) => rect.x < lineX - LANE_BORDER_CLEARANCE_TOL && rect.x + rect.w > lineX + LANE_BORDER_CLEARANCE_TOL;
+  if (crosses(lane.x)) return "left";
+  if (crosses(lane.x + lane.width)) return "right";
+  return void 0;
+}
 var NEAR_COLLISION_POLICY = {
   "node|node": 70,
   "node|edge-label": 32,
@@ -6994,6 +7013,7 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes, \u5
     }
   }
   {
+    const rangeByLane = new Map(laid.lanes.map((lane) => [lane.id, laneVerticalRange(lane, laid.nodes)]));
     for (const e of laid.edges) {
       if (!hasRenderedLabel(e)) continue;
       const fromNode = nodeById.get(e.from);
@@ -7002,21 +7022,14 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes, \u5
       const allowedLanes = /* @__PURE__ */ new Set();
       if (fromNode) allowedLanes.add(fromNode.lane);
       if (toNode) allowedLanes.add(toNode.lane);
-      const boxW = computeLabelBoxW(e.label, e.sub);
-      const anchor = e.labelAnchor;
-      const boxLeftX = anchor === "start" ? 0 : anchor === "end" ? -boxW : -boxW / 2;
-      const bx = e.labelX + boxLeftX;
-      const bxRight = bx + boxW;
+      const box = computeLabelBBoxWorld(e);
       for (const lane of laid.lanes) {
         if (allowedLanes.has(lane.id)) continue;
-        const laneLeft = lane.x;
-        const laneRight = lane.x + lane.width;
-        const crossesLeft = bx < laneLeft - LANE_BORDER_CLEARANCE_TOL && bxRight > laneLeft + LANE_BORDER_CLEARANCE_TOL;
-        const crossesRight = bx < laneRight - LANE_BORDER_CLEARANCE_TOL && bxRight > laneRight + LANE_BORDER_CLEARANCE_TOL;
-        if (crossesLeft || crossesRight) {
+        const side = rectCrossesLaneBorder(box, lane, rangeByLane.get(lane.id));
+        if (side !== void 0) {
           push(
             "lane-border-clearance",
-            `edge "${e.id}" label bbox (${bx.toFixed(0)}..${bxRight.toFixed(0)}) \u304C\u975E\u767A\u7740 lane "${lane.id}" (${laneLeft.toFixed(0)}..${laneRight.toFixed(0)}) \u306E ${crossesLeft ? "\u5DE6" : "\u53F3"} border \u3092\u8CAB\u901A`
+            `edge "${e.id}" label bbox (${box.x.toFixed(0)}..${(box.x + box.w).toFixed(0)}) \u304C\u975E\u767A\u7740 lane "${lane.id}" (${lane.x.toFixed(0)}..${(lane.x + lane.width).toFixed(0)}) \u306E ${side === "left" ? "\u5DE6" : "\u53F3"} border \u3092\u8CAB\u901A`
           );
           break;
         }
@@ -7362,6 +7375,9 @@ var VERTICAL_DETOUR_CORNER = 14;
 function verticalCornerDir(from, to) {
   return to < from ? -1 : 1;
 }
+function cornerRadiusFor(\u534A\u5F84, ...\u8D70\u308A) {
+  return Math.min(\u534A\u5F84, ...\u8D70\u308A.map((v) => Math.abs(v)));
+}
 var VERTICAL_DETOUR_EXIT = 45;
 function nearestBoxDistance(anchorX, dir, verticalTop, verticalBottom, boxes) {
   let nearest = Infinity;
@@ -7411,6 +7427,7 @@ function layoutEdges(diag, nodes, lanes = []) {
   const labelMarginExtra = (diag.viewport?.labelMargin ?? diag.viewport?.gap ?? DEFAULT_LABEL_MARGIN) - DEFAULT_LABEL_MARGIN;
   const nmap = new Map(nodes.map((n) => [n.id, n]));
   const lmap = new Map(lanes.map((l) => [l.id, l]));
+  const laneRangeById = new Map(lanes.map((l) => [l.id, laneVerticalRange(l, nodes)]));
   const positionedEdges = [];
   const autoEdges = [];
   const selfLoopEdges = [];
@@ -7635,7 +7652,7 @@ function layoutEdges(diag, nodes, lanes = []) {
       nodes.filter((n) => n.id === c.from || n.id === c.to).map((n) => n.lane)
     );
     return lanes.some(
-      (l) => !endpointLanes.has(l.id) && (crossesVerticalLine(pill, l.x) || crossesVerticalLine(pill, l.x + l.width))
+      (l) => !endpointLanes.has(l.id) && rectCrossesLaneBorder(pill, l, laneRangeById.get(l.id)) !== void 0
     );
   };
   const assignDetourSides = () => {
@@ -7855,7 +7872,7 @@ function layoutEdges(diag, nodes, lanes = []) {
       );
       const crossesLaneBorder = lanes.some((l) => {
         if (endpointLanes.has(l.id)) return false;
-        return crossesVerticalLine(alt, l.x) || crossesVerticalLine(alt, l.x + l.width);
+        return rectCrossesLaneBorder(alt, l, laneRangeById.get(l.id)) !== void 0;
       });
       if (crossesLaneBorder) continue;
       r.baseLabelX = r.labelAltX;
@@ -8146,9 +8163,6 @@ function segmentsBBox2(segs) {
   }
   return { x: minX, y: minY, w: maxX - minX, h: maxY - minY };
 }
-function crossesVerticalLine(rect, lineX) {
-  return rect.x < lineX - LANE_BORDER_CLEARANCE_TOL && rect.x + rect.w > lineX + LANE_BORDER_CLEARANCE_TOL;
-}
 function distributeBySides(list) {
   const from = list[0].from;
   const tol = 20;
@@ -8371,6 +8385,7 @@ function routePath(from, to, fromSide, toSide, obstacles = [], detourSide, _from
         iter++;
       }
     }
+    const lCorner = cornerRadiusFor(corner, (B.y - A.y) / 2, midX2 - A.x, B.x - midX2);
     let verticalMidY = (A.y + B.y) / 2;
     if (labelHalfW > 0) {
       const labelBoxH = 36;
@@ -8408,10 +8423,10 @@ function routePath(from, to, fromSide, toSide, obstacles = [], detourSide, _from
       }
     }
     if (edge?.overlay) {
-      const exitEndX = midX2 - xDir * corner;
-      const enterStartX = midX2 + xDir * corner;
-      const midStartY = A.y + yDir * corner;
-      const midEndY = B.y - yDir * corner;
+      const exitEndX = midX2 - xDir * lCorner;
+      const enterStartX = midX2 + xDir * lCorner;
+      const midStartY = A.y + yDir * lCorner;
+      const midEndY = B.y - yDir * lCorner;
       const segments = [
         { len: Math.abs(exitEndX - A.x), midXVal: (A.x + exitEndX) / 2, midYVal: A.y },
         { len: Math.abs(midEndY - midStartY), midXVal: midX2, midYVal: (midStartY + midEndY) / 2 },
@@ -8420,10 +8435,10 @@ function routePath(from, to, fromSide, toSide, obstacles = [], detourSide, _from
       const longest = segments.reduce((a, b) => b.len > a.len ? b : a);
       return {
         d: `M ${A.x} ${A.y}
-          L ${midX2 - xDir * corner} ${A.y}
-          Q ${midX2} ${A.y}, ${midX2} ${A.y + yDir * corner}
-          L ${midX2} ${B.y - yDir * corner}
-          Q ${midX2} ${B.y}, ${midX2 + xDir * corner} ${B.y}
+          L ${midX2 - xDir * lCorner} ${A.y}
+          Q ${midX2} ${A.y}, ${midX2} ${A.y + yDir * lCorner}
+          L ${midX2} ${B.y - yDir * lCorner}
+          Q ${midX2} ${B.y}, ${midX2 + xDir * lCorner} ${B.y}
           L ${B.x} ${B.y}`,
         labelX: longest.midXVal,
         labelY: longest.midYVal,
@@ -8432,10 +8447,10 @@ function routePath(from, to, fromSide, toSide, obstacles = [], detourSide, _from
     }
     return {
       d: `M ${A.x} ${A.y}
-        L ${midX2 - xDir * corner} ${A.y}
-        Q ${midX2} ${A.y}, ${midX2} ${A.y + yDir * corner}
-        L ${midX2} ${B.y - yDir * corner}
-        Q ${midX2} ${B.y}, ${midX2 + xDir * corner} ${B.y}
+        L ${midX2 - xDir * lCorner} ${A.y}
+        Q ${midX2} ${A.y}, ${midX2} ${A.y + yDir * lCorner}
+        L ${midX2} ${B.y - yDir * lCorner}
+        Q ${midX2} ${B.y}, ${midX2 + xDir * lCorner} ${B.y}
         L ${B.x} ${B.y}`,
       labelX: midX2,
       labelY: verticalMidY,