@cardenelabs/cdl 0.47.0 → 0.48.0

package/dist/react.js

@@ -8280,33 +8280,73 @@ function placeAvoidingSiblingPaths(args) {
     }
   };
   consider([...wants]);
+  const \u62BC\u3059\u91CF = (idx, side, pos) => {
+    let \u8981\u308B = 0;
+    for (const i of idx) {
+      const box = boxes[i];
+      const rect = { x: box.x, y: pos[i] - box.h / 2, w: box.w, h: box.h };
+      for (const probe of probeSegs[i]) {
+        if (measurePathLabelGapSegs(probe.segs, rect) >= CLEARANCE_PATH_LABEL) continue;
+        let lo = Infinity;
+        let hi = -Infinity;
+        for (const seg of probe.segs) {
+          const c = clipY(seg, box.x, box.x + box.w);
+          if (!c) continue;
+          lo = Math.min(lo, c.lo);
+          hi = Math.max(hi, c.hi);
+        }
+        if (lo > hi) continue;
+        const \u884C\u304D\u5148 = side === "above" ? lo - box.h / 2 - CLEARANCE_PATH_LABEL : hi + box.h / 2 + CLEARANCE_PATH_LABEL;
+        \u8981\u308B = Math.max(\u8981\u308B, side === "above" ? pos[i] - \u884C\u304D\u5148 : \u884C\u304D\u5148 - pos[i]);
+      }
+    }
+    return Math.max(0, \u8981\u308B);
+  };
   if (bands.some((b) => b !== null)) {
     for (let split = 0; split <= order.length; split++) {
       const above = order.slice(0, split);
       const below = order.slice(split);
-      const out = new Array(members.length);
-      for (const [idx, side] of [
-        [above, "above"],
-        [below, "below"]
-      ]) {
-        if (idx.length === 0) continue;
-        const ys = spread(idx);
-        let shift = 0;
-        for (let k = 0; k < idx.length; k++) {
-          const band = bands[idx[k]];
-          if (!band) continue;
-          shift = side === "above" ? Math.min(shift, band.lo - ys[k]) : Math.max(shift, band.hi - ys[k]);
-        }
-        for (let k = 0; k < idx.length; k++) out[idx[k]] = ys[k] + shift;
-      }
-      if (above.length > 0 && below.length > 0) {
+      const \u9593\u3092\u7A7A\u3051\u308B = (out) => {
+        if (above.length === 0 || below.length === 0) return;
         const lastIdx = above[above.length - 1];
         const firstIdx = below[0];
         const need = (sizes[lastIdx] + sizes[firstIdx]) / 2 + CLEARANCE_LABEL_LABEL;
         const deficit = need - (out[firstIdx] - out[lastIdx]);
-        if (deficit > 0) for (const i of below) out[i] += deficit;
-      }
-      consider(out);
+        if (deficit > 0) for (const i of below) out[i] = out[i] + deficit;
+      };
+      const \u5E2F\u3092\u8D8A\u3048\u308B = () => {
+        const out = new Array(members.length);
+        for (const [idx, side] of [
+          [above, "above"],
+          [below, "below"]
+        ]) {
+          if (idx.length === 0) continue;
+          const ys = spread(idx);
+          let shift = 0;
+          for (let k = 0; k < idx.length; k++) {
+            const band = bands[idx[k]];
+            if (!band) continue;
+            shift = side === "above" ? Math.min(shift, band.lo - ys[k]) : Math.max(shift, band.hi - ys[k]);
+          }
+          for (let k = 0; k < idx.length; k++) out[idx[k]] = ys[k] + shift;
+        }
+        \u9593\u3092\u7A7A\u3051\u308B(out);
+        return out;
+      };
+      const \u62BC\u3057\u3066\u8D8A\u3048\u308B = () => {
+        const out = \u5E2F\u3092\u8D8A\u3048\u308B();
+        for (let round = 0; round < 4; round += 1) {
+          const a = \u62BC\u3059\u91CF(above, "above", out);
+          const b = \u62BC\u3059\u91CF(below, "below", out);
+          if (a === 0 && b === 0) return out;
+          for (const i of above) out[i] = out[i] - a;
+          for (const i of below) out[i] = out[i] + b;
+        }
+        return \u62BC\u3059\u91CF(above, "above", out) === 0 && \u62BC\u3059\u91CF(below, "below", out) === 0 ? out : null;
+      };
+      consider(\u5E2F\u3092\u8D8A\u3048\u308B());
+      const \u62BC\u3057\u305F = \u62BC\u3057\u3066\u8D8A\u3048\u308B();
+      if (\u62BC\u3057\u305F) consider(\u62BC\u3057\u305F);
     }
   }
   const plain = spread(all);