@cardenelabs/cdl 0.65.0 → 0.66.0

package/dist/react.js

@@ -7378,6 +7378,10 @@ function verticalCornerDir(from, to) {
 function cornerRadiusFor(\u534A\u5F84, ...\u8D70\u308A) {
   return Math.min(\u534A\u5F84, ...\u8D70\u308A.map((v) => Math.abs(v)));
 }
+function runCrossesBox(\u8D70\u308A, \u7BB1) {
+  if (\u8D70\u308A.y <= \u7BB1.cy - \u7BB1.h / 2 || \u8D70\u308A.y >= \u7BB1.cy + \u7BB1.h / 2) return false;
+  return \u7BB1.cx + \u7BB1.w / 2 > Math.min(\u8D70\u308A.x1, \u8D70\u308A.x2) && \u7BB1.cx - \u7BB1.w / 2 < Math.max(\u8D70\u308A.x1, \u8D70\u308A.x2);
+}
 var VERTICAL_DETOUR_EXIT = 45;
 function nearestBoxDistance(anchorX, dir, verticalTop, verticalBottom, boxes) {
   let nearest = Infinity;
@@ -8370,18 +8374,28 @@ function routePath(from, to, fromSide, toSide, obstacles = [], detourSide, _from
         const labelIntersect = oTop < labelBottom && oBottom > labelTop;
         return segIntersect || labelIntersect;
       };
+      const \u6A2A\u306E\u8D70\u308A\u304C\u585E\u304C\u308B = (mx) => labelObstacles.some((o) => {
+        if (o.id === from.id || o.id === to.id) return false;
+        return runCrossesBox({ y: A.y, x1: A.x, x2: mx }, o) || runCrossesBox({ y: B.y, x1: mx, x2: B.x }, o);
+      });
       let iter = 0;
       while (iter < 12) {
         const band = labelBand(midX2);
-        const hit = labelObstacles.find((o) => intersects(o, band));
+        const hit = labelObstacles.find((o) => intersects(o, band)) ?? labelObstacles.find(
+          (o) => o.id !== from.id && o.id !== to.id && (runCrossesBox({ y: A.y, x1: A.x, x2: midX2 }, o) || runCrossesBox({ y: B.y, x1: midX2, x2: B.x }, o))
+        );
         if (!hit) break;
         const hitLeft = hit.cx - hit.w / 2;
         const hitRight = hit.cx + hit.w / 2;
         const retreatRight = hitRight + labelHalfW + CLEARANCE_NODE_LABEL + 4;
         const retreatLeft = hitLeft - labelHalfW - CLEARANCE_NODE_LABEL - 4;
+        const \u53F3\u304C\u585E\u304C\u308B = \u6A2A\u306E\u8D70\u308A\u304C\u585E\u304C\u308B(retreatRight);
+        const \u5DE6\u304C\u585E\u304C\u308B = \u6A2A\u306E\u8D70\u308A\u304C\u585E\u304C\u308B(retreatLeft);
         const dRight = Math.abs(retreatRight - midX2);
         const dLeft = Math.abs(retreatLeft - midX2);
-        midX2 = dRight <= dLeft ? retreatRight : retreatLeft;
+        const \u6B21 = \u53F3\u304C\u585E\u304C\u308B === \u5DE6\u304C\u585E\u304C\u308B ? dRight <= dLeft ? retreatRight : retreatLeft : \u53F3\u304C\u585E\u304C\u308B ? retreatLeft : retreatRight;
+        if (\u6B21 === midX2) break;
+        midX2 = \u6B21;
         iter++;
       }
     }