@cardenelabs/cdl 0.29.0 → 0.30.1

package/dist/react.cjs

@@ -8393,16 +8393,112 @@ function separateSharedStraightRuns(edges, nodes) {
     e.d = verticesToPath(verts.get(e.id));
   }
 }
+function pullOutgoingFirstCorner(edges, nodes) {
+  if (edges.length < 2) return;
+  const \u675F = /* @__PURE__ */ new Map();
+  const \u540C\u3058\u7D44\u306E\u6570 = /* @__PURE__ */ new Map();
+  for (const e of edges) {
+    const key = `${e.from}::${e.fromSide}`;
+    const list = \u675F.get(key) ?? [];
+    list.push(e);
+    \u675F.set(key, list);
+    const pair = `${e.from}->${e.to}`;
+    \u540C\u3058\u7D44\u306E\u6570.set(pair, (\u540C\u3058\u7D44\u306E\u6570.get(pair) ?? 0) + 1);
+  }
+  let \u672D\u3092\u65E7\u7D4C\u8DEF\u3078\u8FFD\u5F93\u6E08\u307F = false;
+  for (const list of \u675F.values()) {
+    if (list.length < 2) continue;
+    const \u4E26\u3073 = list.flatMap((e) => {
+      const pts = pathVertices(e.d);
+      if (!pts || pts.length < 2) return [];
+      return [{ e, pts, \u6700\u521D\u306E\u9577\u3055: Math.hypot(pts[1].x - pts[0].x, pts[1].y - pts[0].y) }];
+    }).sort((a, b) => b.\u6700\u521D\u306E\u9577\u3055 - a.\u6700\u521D\u306E\u9577\u3055);
+    for (const { e, pts, \u6700\u521D\u306E\u9577\u3055 } of \u4E26\u3073.slice(1)) {
+      if ((\u540C\u3058\u7D44\u306E\u6570.get(`${e.from}->${e.to}`) ?? 0) > 1) continue;
+      if (pts.length < 3 || \u6700\u521D\u306E\u9577\u3055 <= EDGE_STUB_OUT + VERTICAL_DETOUR_CORNER) continue;
+      const \u6A2A = e.fromSide === "left" || e.fromSide === "right";
+      if (!runIsAligned(pts, 0, \u6A2A ? 1 : 0)) continue;
+      const \u79FB\u52D5\u91CF = \u6700\u521D\u306E\u9577\u3055 - (EDGE_STUB_OUT + VERTICAL_DETOUR_CORNER);
+      const ux = (pts[1].x - pts[0].x) / \u6700\u521D\u306E\u9577\u3055;
+      const uy = (pts[1].y - pts[0].y) / \u6700\u521D\u306E\u9577\u3055;
+      const \u8A66\u3057 = pts.map(
+        (p, i) => i === 1 || i === 2 ? { x: p.x - ux * \u79FB\u52D5\u91CF, y: p.y - uy * \u79FB\u52D5\u91CF } : p
+      );
+      const \u8A66\u3057D = verticesToPath(\u8A66\u3057);
+      const \u8A66\u3057\u533A\u9593 = flattenPathSegments(extractPathSegments(\u8A66\u3057D));
+      if (nodes.some(
+        (n) => n.id !== e.from && n.id !== e.to && segmentsCrossRect(\u8A66\u3057\u533A\u9593, nodeRect(n))
+      )) {
+        continue;
+      }
+      const \u524D = e.d;
+      const \u524D\u306E\u4EA4\u5DEE = countEdgeCrossings(edges).count;
+      e.d = \u8A66\u3057D;
+      if (countEdgeCrossings(edges).count > \u524D\u306E\u4EA4\u5DEE) {
+        e.d = \u524D;
+        continue;
+      }
+      e.d = \u524D;
+      if (!\u672D\u3092\u65E7\u7D4C\u8DEF\u3078\u8FFD\u5F93\u6E08\u307F) {
+        slideLabelsAlongOwnPath(edges, nodes);
+        \u672D\u3092\u65E7\u7D4C\u8DEF\u3078\u8FFD\u5F93\u6E08\u307F = true;
+      }
+      const labelBox = computeLabelBBoxWorld(e);
+      const label = { x: labelBox.x + labelBox.w / 2, y: labelBox.y + labelBox.h / 2 };
+      const \u7DDA\u5206\u307E\u3067\u306E\u8DDD\u96E22 = (a, b) => {
+        const dx = b.x - a.x;
+        const dy = b.y - a.y;
+        const len2 = dx * dx + dy * dy;
+        const t = len2 === 0 ? 0 : Math.max(0, Math.min(1, ((label.x - a.x) * dx + (label.y - a.y) * dy) / len2));
+        return (label.x - (a.x + dx * t)) ** 2 + (label.y - (a.y + dy * t)) ** 2;
+      };
+      const \u52D5\u304F\u533A\u9593\u3078\u306E\u8DDD\u96E2 = \u7DDA\u5206\u307E\u3067\u306E\u8DDD\u96E22(pts[1], pts[2]);
+      const label\u3082\u52D5\u304B\u3059 = pts.slice(0, -1).every((p, i) => \u7DDA\u5206\u307E\u3067\u306E\u8DDD\u96E22(p, pts[i + 1]) >= \u52D5\u304F\u533A\u9593\u3078\u306E\u8DDD\u96E2 - 1e-6);
+      e.d = \u8A66\u3057D;
+      if (label\u3082\u52D5\u304B\u3059) {
+        e.labelX -= ux * \u79FB\u52D5\u91CF;
+        e.labelY -= uy * \u79FB\u52D5\u91CF;
+      }
+    }
+  }
+}
 var ENDPOINT_FAN_STEP = 56;
 var ENDPOINT_FAN_MIN = 20;
 var ENDPOINT_FAN_RUNUP = 40;
+var MIXED_ROOT_OVERLAP_MIN = 24;
 function fanIncomingEndpoints(edges, nodes) {
   if (edges.length < 2) return;
   const nmap = new Map(nodes.map((n) => [n.id, n]));
+  const \u5E73\u5766\u306A\u533A\u9593 = new Map(edges.map((e) => [e.id, flattenPathSegments(extractPathSegments(e.d))]));
+  const \u8EF8\u306B\u5E73\u884C\u306A\u91CD\u306A\u308A\u9577\u3055 = (\u4E00\u65B9, \u4ED6\u65B9) => {
+    let \u5408\u8A08 = 0;
+    for (const a of \u5E73\u5766\u306A\u533A\u9593.get(\u4E00\u65B9.id) ?? []) {
+      const a\u306F\u6C34\u5E73 = Math.abs(a.y2 - a.y1) <= 1;
+      const a\u306F\u5782\u76F4 = Math.abs(a.x2 - a.x1) <= 1;
+      for (const b of \u5E73\u5766\u306A\u533A\u9593.get(\u4ED6\u65B9.id) ?? []) {
+        const b\u306F\u6C34\u5E73 = Math.abs(b.y2 - b.y1) <= 1;
+        const b\u306F\u5782\u76F4 = Math.abs(b.x2 - b.x1) <= 1;
+        if (a\u306F\u6C34\u5E73 && b\u306F\u6C34\u5E73 && Math.abs(a.y1 - b.y1) <= 1) {
+          \u5408\u8A08 += Math.max(0, Math.min(Math.max(a.x1, a.x2), Math.max(b.x1, b.x2)) - Math.max(Math.min(a.x1, a.x2), Math.min(b.x1, b.x2)));
+        }
+        if (a\u306F\u5782\u76F4 && b\u306F\u5782\u76F4 && Math.abs(a.x1 - b.x1) <= 1) {
+          \u5408\u8A08 += Math.max(0, Math.min(Math.max(a.y1, a.y2), Math.max(b.y1, b.y2)) - Math.max(Math.min(a.y1, a.y2), Math.min(b.y1, b.y2)));
+        }
+      }
+    }
+    return \u5408\u8A08;
+  };
   const \u540C\u3058\u7D44\u306E\u6570 = /* @__PURE__ */ new Map();
   for (const e of edges) \u540C\u3058\u7D44\u306E\u6570.set(`${e.from}->${e.to}`, (\u540C\u3058\u7D44\u306E\u6570.get(`${e.from}->${e.to}`) ?? 0) + 1);
   const \u675F = /* @__PURE__ */ new Map();
+  const \u51FA\u308B\u7DDA = /* @__PURE__ */ new Map();
   for (const e of edges) {
+    if (nmap.has(e.from)) {
+      const key2 = `${e.from}::${e.fromSide}`;
+      const list2 = \u51FA\u308B\u7DDA.get(key2) ?? [];
+      list2.push(e);
+      \u51FA\u308B\u7DDA.set(key2, list2);
+    }
     if (!nmap.has(e.to)) continue;
     if ((\u540C\u3058\u7D44\u306E\u6570.get(`${e.from}->${e.to}`) ?? 0) > 1) continue;
     const key = `${e.to}::${e.toSide}`;
@@ -8410,27 +8506,48 @@ function fanIncomingEndpoints(edges, nodes) {
     list.push(e);
     \u675F.set(key, list);
   }
-  for (const [, list] of \u675F) {
-    if (list.length < 2) continue;
+  for (const [key, list] of \u675F) {
+    const \u4E2D\u592E\u304C\u585E\u304C\u3063\u3066\u3044\u308B = (\u51FA\u308B\u7DDA.get(key) ?? []).some(
+      (\u51FA\u7DDA) => list.some(
+        (\u5165\u7DDA) => !(\u5165\u7DDA.from === \u51FA\u7DDA.to && \u5165\u7DDA.to === \u51FA\u7DDA.from) && \u8EF8\u306B\u5E73\u884C\u306A\u91CD\u306A\u308A\u9577\u3055(\u5165\u7DDA, \u51FA\u7DDA) >= MIXED_ROOT_OVERLAP_MIN
+      )
+    );
+    if (list.length < 2 && !\u4E2D\u592E\u304C\u585E\u304C\u3063\u3066\u3044\u308B) continue;
     const n = nmap.get(list[0].to);
     const \u6A2A = list[0].toSide === "left" || list[0].toSide === "right";
     const \u8FBA\u306E\u9577\u3055 = \u6A2A ? n.h : n.w;
     const \u4F7F\u3048\u308B\u5E452 = \u8FBA\u306E\u9577\u3055 - 2 * ARROW_ENDPOINT_CENTER_TOL;
     if (\u4F7F\u3048\u308B\u5E452 <= 0) continue;
-    const \u9593\u9694 = Math.min(ENDPOINT_FAN_STEP, \u4F7F\u3048\u308B\u5E452 / (list.length - 1));
+    const \u5E2D\u306E\u9593 = \u4E2D\u592E\u304C\u585E\u304C\u3063\u3066\u3044\u308B ? list.length : list.length - 1;
+    const \u9593\u9694 = Math.min(ENDPOINT_FAN_STEP, \u4F7F\u3048\u308B\u5E452 / \u5E2D\u306E\u9593);
     if (\u9593\u9694 < ENDPOINT_FAN_MIN) continue;
-    const \u4E26\u3073 = list.map((e) => ({ e, \u6DF1\u3055: \u8FBA\u304B\u3089\u96E2\u308C\u305F\u5074\u306E\u4F4D\u7F6E(e, \u6A2A) ?? 0 })).sort((a, b) => a.\u6DF1\u3055 - b.\u6DF1\u3055 || (a.e.id < b.e.id ? -1 : 1));
+    const \u8FBA\u306E\u4E2D\u5FC3 = \u6A2A ? n.cy : n.cx;
+    const \u4E26\u3073 = list.map((e) => {
+      const \u533A\u9593 = extractPathSegments(e.d);
+      const last = \u533A\u9593[\u533A\u9593.length - 1];
+      const \u9577\u3044\u52A9\u8D70 = last === void 0 ? 0 : Math.hypot(last.x2 - last.x1, last.y2 - last.y1);
+      const \u4E2D\u5FC3\u3092\u88DC\u3046 = \u4E2D\u592E\u304C\u585E\u304C\u3063\u3066\u3044\u308B || list.length === 2;
+      const \u6DF1\u3055 = \u8FBA\u304B\u3089\u96E2\u308C\u305F\u5074\u306E\u4F4D\u7F6E(e, \u6A2A) ?? (\u4E2D\u5FC3\u3092\u88DC\u3046 ? \u8FBA\u306E\u4E2D\u5FC3 : 0);
+      return { e, \u9577\u3044\u52A9\u8D70, \u6DF1\u3055 };
+    }).sort((a, b) => a.\u6DF1\u3055 - b.\u6DF1\u3055 || (a.e.id < b.e.id ? -1 : 1));
     const \u4E2D\u5FC3 = (\u4E26\u3073.length - 1) * \u9593\u9694 / 2;
+    let \u8CA0\u5074\u306E\u5E2D = 0;
+    let \u6B63\u5074\u306E\u5E2D = 0;
     for (let k = 0; k < \u4E26\u3073.length; k++) {
-      const d = k * \u9593\u9694 - \u4E2D\u5FC3;
+      const d = \u4E2D\u592E\u304C\u585E\u304C\u3063\u3066\u3044\u308B ? \u4E26\u3073[k].\u6DF1\u3055 < \u8FBA\u306E\u4E2D\u5FC3 ? -(++\u8CA0\u5074\u306E\u5E2D * \u9593\u9694) : ++\u6B63\u5074\u306E\u5E2D * \u9593\u9694 : k * \u9593\u9694 - \u4E2D\u5FC3;
       if (Math.abs(d) < 1e-3) continue;
       const e = \u4E26\u3073[k].e;
-      const \u5DEE\u66FF = \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \u6A2A, d, nodes);
-      if (\u5DEE\u66FF === null) continue;
       const \u524D = e.d;
       const \u524D\u306E\u4EA4\u5DEE = countEdgeCrossings(edges).count;
-      e.d = \u5DEE\u66FF;
-      if (countEdgeCrossings(edges).count > \u524D\u306E\u4EA4\u5DEE) e.d = \u524D;
+      const \u9577\u3044\u52A9\u8D70 = \u4E26\u3073[k].\u9577\u3044\u52A9\u8D70;
+      for (const \u52A9\u8D70 of [\u9577\u3044\u52A9\u8D70, ENDPOINT_FAN_RUNUP]) {
+        e.d = \u524D;
+        const \u5DEE\u66FF = \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \u6A2A, d, \u52A9\u8D70, nodes);
+        if (\u5DEE\u66FF === null) continue;
+        e.d = \u5DEE\u66FF;
+        if (countEdgeCrossings(edges).count <= \u524D\u306E\u4EA4\u5DEE) break;
+        e.d = \u524D;
+      }
     }
   }
 }
@@ -8443,7 +8560,7 @@ function \u8FBA\u304B\u3089\u96E2\u308C\u305F\u5074\u306E\u4F4D\u7F6E(e, \u6A2A)
   }
   return null;
 }
-function \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \u6A2A, d, nodes) {
+function \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \u6A2A, d, \u52A9\u8D70, nodes) {
   if ((e.d.match(/M/g) ?? []).length !== 1) return null;
   const segs = extractPathSegments(e.d);
   if (segs.length === 0) return null;
@@ -8456,7 +8573,12 @@ function \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \
   if (\u9577\u3055 < ENDPOINT_FAN_RUNUP + 1) return null;
   const ux = (last.x1 - last.x2) / \u9577\u3055;
   const uy = (last.y1 - last.y2) / \u9577\u3055;
-  const \u6298\u308C1 = { x: last.x2 + ux * ENDPOINT_FAN_RUNUP, y: last.y2 + uy * ENDPOINT_FAN_RUNUP };
+  const head = segs[0];
+  const \u6700\u5F8C\u306E\u533A\u9593\u304C\u8D77\u70B9\u3092\u542B\u3080 = Math.abs(last.x1 - head.x1) <= 0.5 && Math.abs(last.y1 - head.y1) <= 0.5;
+  const \u52A9\u8D70\u4E0A\u9650 = \u6700\u5F8C\u306E\u533A\u9593\u304C\u8D77\u70B9\u3092\u542B\u3080 ? \u9577\u3055 - EDGE_STUB_OUT : \u9577\u3055;
+  const \u4E38\u3081\u305F\u52A9\u8D70 = Math.min(\u52A9\u8D70, \u52A9\u8D70\u4E0A\u9650);
+  if (\u4E38\u3081\u305F\u52A9\u8D70 < ENDPOINT_FAN_RUNUP) return null;
+  const \u6298\u308C1 = { x: last.x2 + ux * \u4E38\u3081\u305F\u52A9\u8D70, y: last.y2 + uy * \u4E38\u3081\u305F\u52A9\u8D70 };
   const \u6298\u308C2 = \u6A2A ? { x: \u6298\u308C1.x, y: \u6298\u308C1.y + d } : { x: \u6298\u308C1.x + d, y: \u6298\u308C1.y };
   const \u7D42\u70B9 = \u6A2A ? { x: last.x2, y: last.y2 + d } : { x: last.x2 + d, y: last.y2 };
   const \u65B0\u533A\u9593 = [
@@ -8467,7 +8589,6 @@ function \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \
   if (nodes.some((n) => n.id !== e.from && n.id !== e.to && segmentsCrossRect(\u65B0\u533A\u9593, nodeRect(n)))) {
     return null;
   }
-  const head = segs[0];
   const parts = [`M ${head.x1} ${head.y1}`];
   for (let i = 0; i < segs.length - 1; i++) {
     const s = segs[i];
@@ -8478,7 +8599,8 @@ function \u672B\u5C3E\u3092\u8FBA\u306B\u6CBF\u3063\u3066\u305A\u3089\u3059(e, \
     }
     parts.push(`L ${s.x2} ${s.y2}`);
   }
-  parts.push(`L ${round1(\u6298\u308C1.x)} ${round1(\u6298\u308C1.y)}`);
+  const \u6298\u308C1\u306F\u76F4\u524D\u306E\u6298\u308C = Math.abs(\u6298\u308C1.x - last.x1) <= 0.5 && Math.abs(\u6298\u308C1.y - last.y1) <= 0.5;
+  if (!\u6298\u308C1\u306F\u76F4\u524D\u306E\u6298\u308C) parts.push(`L ${round1(\u6298\u308C1.x)} ${round1(\u6298\u308C1.y)}`);
   parts.push(`L ${round1(\u6298\u308C2.x)} ${round1(\u6298\u308C2.y)}`);
   parts.push(`L ${round1(\u7D42\u70B9.x)} ${round1(\u7D42\u70B9.y)}`);
   return parts.join(" ");
@@ -8961,6 +9083,7 @@ function layout(diag) {
     diag.edges.filter((e) => e.posX1 !== void 0 && e.posY1 !== void 0 && e.posX2 !== void 0 && e.posY2 !== void 0).map((e) => e.id)
   );
   bowSharedStraightPaths(edges, nodesFinal, positionedEdgeIds);
+  pullOutgoingFirstCorner(edges, nodesFinal);
   fanIncomingEndpoints(edges, nodesFinal);
   separateSharedStraightRuns(edges, nodesFinal);
   hopEdgeCrossings(edges);