@cardenelabs/cdl 0.21.0 → 0.21.1

package/dist/react.cjs

@@ -1756,8 +1756,12 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
         for (const { p } of ordered) {
           const axis = p.axis;
           if (!pathShiftIsSafe(e.id, axis, p.sign, amount)) continue;
+          const \u52D5\u304B\u3057\u305F\u5F8C = measurePathLabelGapSegs(
+            simulateShiftedSegments(e, axis === "x" ? p.sign * amount : 0, axis === "y" ? p.sign * amount : 0),
+            label
+          );
           out.push({ target: { kind: "edge-path", id: e.id }, axis, sign: p.sign, amount });
-          \u7DDA\u3092\u52D5\u304B\u305B\u305F = true;
+          \u7DDA\u3092\u52D5\u304B\u305B\u305F = \u52D5\u304B\u3057\u305F\u5F8C > gap;
           break;
         }
         if (!\u7DDA\u3092\u52D5\u304B\u305B\u305F) {
@@ -1780,16 +1784,49 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
           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
+            const \u91CF = pathLabelClearance - gap + NEAR_MISS_MARGIN;
+            const \u5019\u88DC = Math.abs(dx) >= Math.abs(dy) ? [
+              { axis: "x", sign: dx >= 0 ? 1 : -1 },
+              { axis: "y", sign: dy >= 0 ? 1 : -1 }
+            ] : [
+              { axis: "y", sign: dy >= 0 ? 1 : -1 },
+              { axis: "x", sign: dx >= 0 ? 1 : -1 }
+            ];
+            const \u52D5\u304B\u3057\u305F\u7BB1 = (axis, sign) => ({
+              ...label,
+              x: label.x + (axis === "x" ? sign * \u91CF : 0),
+              y: label.y + (axis === "y" ? sign * \u91CF : 0)
             });
+            const \u7DDA\u3054\u3068\u306E\u8DDD\u96E2 = (\u7BB1) => {
+              const \u51FA = /* @__PURE__ */ new Map();
+              for (const \u4ED6 of edges) {
+                if (\u4ED6.id === label.id) continue;
+                const segs2 = segmentsExcludingOwnPath(shiftedSegments(\u4ED6.id, \u4ED6.d), ownSegsOf(label.id));
+                if (segs2.length === 0) continue;
+                \u51FA.set(\u4ED6.id, measurePathLabelGapSegs(segs2, \u7BB1));
+              }
+              return \u51FA;
+            };
+            const \u3044\u307E\u306E\u8DDD\u96E2 = \u7DDA\u3054\u3068\u306E\u8DDD\u96E2(label);
+            const \u60AA\u304F\u3059\u308B = (\u7BB1) => {
+              const \u5F8C = \u7DDA\u3054\u3068\u306E\u8DDD\u96E2(\u7BB1);
+              for (const [id, \u524D\u306E\u5024] of \u3044\u307E\u306E\u8DDD\u96E2) {
+                const \u5F8C\u306E\u5024 = \u5F8C.get(id) ?? Infinity;
+                if (\u5F8C\u306E\u5024 < Math.min(\u524D\u306E\u5024, pathLabelClearance)) return true;
+              }
+              return false;
+            };
+            for (const \u5019 of \u5019\u88DC) {
+              if (\u60AA\u304F\u3059\u308B(\u52D5\u304B\u3057\u305F\u7BB1(\u5019.axis, \u5019.sign))) continue;
+              out.push({
+                target: { kind: "label", id: label.id },
+                axis: \u5019.axis,
+                sign: \u5019.sign,
+                amount: \u91CF,
+                chain: false
+              });
+              break;
+            }
           }
         }
       }