@cardenelabs/cdl 0.21.0 → 0.21.2

package/dist/react.js

@@ -846,6 +846,18 @@ function \u4E2D\u8EAB\u304B\u3089\u51FA\u3059\u9AD8\u3055(kind, \u6E80\u8F09h, \
   return Math.max(MIN_BOX_H, \u6E80\u8F09h - \u5F15\u304F);
 }
 var MIN_BOX_H = 44;
+var CLOUD_CIRCLES = [
+  { cx: -0.8, cy: -0.05 + 0.08, r: 0.32 },
+  { cx: -0.4, cy: -0.05 - 0.05, r: 0.4 },
+  { cx: 0, cy: -0.05 - 0.1, r: 0.46 },
+  { cx: 0.4, cy: -0.05 - 0.05, r: 0.4 },
+  { cx: 0.8, cy: -0.05 + 0.08, r: 0.32 }
+];
+var CLOUD_ART_CENTER_RISE = (() => {
+  const \u4E0A = Math.min(...CLOUD_CIRCLES.map((c) => c.cy - c.r));
+  const \u4E0B = Math.max(...CLOUD_CIRCLES.map((c) => c.cy + c.r));
+  return -(\u4E0A + \u4E0B) / 2;
+})();
 
 // src/layout/footer-shape.ts
 var SHAPE_DRAW_UP_EXTENT = {
@@ -1754,8 +1766,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) {
@@ -1778,16 +1794,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;
+            }
           }
         }
       }
@@ -6816,21 +6865,12 @@ function GenericNode({
     if (shape === "cloud") {
       const cx = w / 2;
       const cy = h / 2;
-      const cloudCenterY = cy - h * 0.05;
-      const usableW = w * 0.85;
-      const halfW = usableW / 2;
-      const circles = [
-        { cx: cx - halfW * 0.8, cy: cloudCenterY + h * 0.08, r: h * 0.32 },
-        // 左端
-        { cx: cx - halfW * 0.4, cy: cloudCenterY - h * 0.05, r: h * 0.4 },
-        // 左
-        { cx, cy: cloudCenterY - h * 0.1, r: h * 0.46 },
-        // 中央 (最大)
-        { cx: cx + halfW * 0.4, cy: cloudCenterY - h * 0.05, r: h * 0.4 },
-        // 右
-        { cx: cx + halfW * 0.8, cy: cloudCenterY + h * 0.08, r: h * 0.32 }
-        // 右端
-      ];
+      const halfW = w * 0.85 / 2;
+      const circles = CLOUD_CIRCLES.map((c) => ({
+        cx: cx + halfW * c.cx,
+        cy: cy + h * c.cy,
+        r: h * c.r
+      }));
       return /* @__PURE__ */ jsxs("g", { children: [
         circles.map((c, i) => /* @__PURE__ */ jsx("circle", { cx: c.cx, cy: c.cy, r: c.r, fill: "var(--cdl-node-fill, #ffffff)" }, `fill-${i}`)),
         circles.map((c, i) => /* @__PURE__ */ jsx(
@@ -6869,11 +6909,12 @@ function GenericNode({
   const textX = centered ? w / 2 : 20;
   const cylinderShift = genericTextShift(node.kind);
   const \u7E70\u308A\u4E0A\u3052 = node.eyebrow || centered ? 0 : \u76EE\u5370\u306A\u3057\u306E\u7E70\u308A\u4E0A\u3052(node.kind, hasRows);
-  const eyebrowY = centered ? h / 2 - 26 : 32 + cylinderShift;
-  const titleY = genericTitleBaselineY(node.kind, h, hasRows) - \u7E70\u308A\u4E0A\u3052;
-  const subtitleY = centered ? h / 2 + 28 : 96 + cylinderShift - \u7E70\u308A\u4E0A\u3052;
+  const \u7D75\u306E\u82AF = centered && STYLES[node.kind]?.shape === "cloud" ? h * CLOUD_ART_CENTER_RISE : 0;
+  const eyebrowY = centered ? h / 2 - 26 - \u7D75\u306E\u82AF : 32 + cylinderShift;
+  const titleY = genericTitleBaselineY(node.kind, h, hasRows) - \u7E70\u308A\u4E0A\u3052 - \u7D75\u306E\u82AF;
+  const subtitleY = centered ? h / 2 + 28 - \u7D75\u306E\u82AF : 96 + cylinderShift - \u7E70\u308A\u4E0A\u3052;
   const iconX = centered ? w / 2 + 40 : w - 48;
-  const iconY = centered ? h / 2 - 44 : 18 + cylinderShift;
+  const iconY = centered ? h / 2 - 44 - \u7D75\u306E\u82AF : 18 + cylinderShift;
   const dominantBaseline = centered ? "middle" : void 0;
   return /* @__PURE__ */ jsxs("g", { transform: `translate(${x} ${y})`, "data-cdl-role": "node-body", children: [
     shapeEl,