@cardenelabs/cdl 0.113.0 → 0.115.0

package/dist/react.js

@@ -4910,6 +4910,28 @@ function computeTreeLayout(treeNodes, canvasW, canvasH) {
     const \u8981\u308B = measureTextWidth(\u540D\u524D.text, { fontSize: \u540D\u524D.fontSize}) + (nodeW - \u4F7F\u3048\u308B\u5E45(nodeW));
     return Math.min(Math.max(\u8981\u308B, nodeW), slotW * 0.92);
   };
+  const \u8449\u306E\u4E26\u3073 = [];
+  const \u6BB5\u306E\u8868 = /* @__PURE__ */ new Map();
+  const \u5E45\u306E\u8868 = /* @__PURE__ */ new Map();
+  {
+    const \u898B\u305F = /* @__PURE__ */ new Set();
+    const \u4E0B\u898B = (n, depth) => {
+      \u898B\u305F.add(n.id);
+      \u6BB5\u306E\u8868.set(n.id, depth);
+      \u5E45\u306E\u8868.set(n.id, \u7BB1\u306E\u5E45(n, depth));
+      const kids = (childrenOf.get(n.id) ?? []).filter((k) => !\u898B\u305F.has(k.id));
+      if (kids.length === 0) {
+        \u8449\u306E\u4E26\u3073.push(n.id);
+        return;
+      }
+      for (const k of kids) \u4E0B\u898B(k, depth + 1);
+    };
+    for (const r of roots) if (!\u898B\u305F.has(r.id)) \u4E0B\u898B(r, 0);
+  }
+  const \u8449\u306E\u6570 = Math.max(\u8449\u306E\u4E26\u3073.length, 1);
+  const \u6BB5\u306E\u9699\u9593 = depthGap - nodeH;
+  const \u8449\u306E\u9593\u9694 = Math.min(slotW, nodeW + \u6BB5\u306E\u9699\u9593);
+  const \u8449\u306Ex = (i) => canvasW / 2 - (\u8449\u306E\u6570 - 1) * \u8449\u306E\u9593\u9694 / 2 + i * \u8449\u306E\u9593\u9694;
   const posOf = /* @__PURE__ */ new Map();
   const nodes = [];
   const placed = /* @__PURE__ */ new Set();
@@ -4919,7 +4941,7 @@ function computeTreeLayout(treeNodes, canvasW, canvasH) {
     const kids = (childrenOf.get(n.id) ?? []).filter((k) => !placed.has(k.id));
     let x;
     if (kids.length === 0) {
-      x = leafCursor * slotW + slotW / 2;
+      x = \u8449\u306Ex(leafCursor);
       leafCursor += 1;
     } else {
       const xs = kids.map((k) => place(k, depth + 1));
@@ -4933,7 +4955,7 @@ function computeTreeLayout(treeNodes, canvasW, canvasH) {
       ...n.subtitle !== void 0 ? { subtitle: n.subtitle } : {},
       x,
       y,
-      w: \u7BB1\u306E\u5E45(n, depth),
+      w: \u5E45\u306E\u8868.get(n.id) ?? \u7BB1\u306E\u5E45(n, depth),
       h: nodeH,
       depth,
       ...n.unresolved ? { unresolved: true } : {}
@@ -5120,7 +5142,7 @@ function \u63CF\u304F\u6A2A\u306E\u7AEF(n) {
   if (n.isRoot || !n.isLeaf) return [n.x - n.w / 2, n.x + n.w / 2];
   const \u8D77\u70B9 = n.x + (n.side === "right" ? -n.w / 2 : n.w / 2);
   const \u540D\u524D = \u653E\u5C04\u306E\u884C(n)[0];
-  const \u5E45 = measureTextWidth(\u540D\u524D.text, { fontSize: \u540D\u524D.fontSize});
+  const \u5E45 = textWidth(\u540D\u524D.text, \u540D\u524D.fontSize);
   return n.side === "right" ? [\u8D77\u70B9, \u8D77\u70B9 + \u5E45] : [\u8D77\u70B9 - \u5E45, \u8D77\u70B9];
 }
 function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
@@ -5193,38 +5215,52 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
     if (kids.length === 0) return 1;
     return kids.reduce((sum, k) => sum + leafCountOf(k.id, seen), 0);
   };
-  const maxSubDepth = firstLevel.length > 0 ? Math.max(0, ...firstLevel.map((br) => subDepthOf(br.id, /* @__PURE__ */ new Set()))) : 0;
+  const leftBranches = firstLevel.slice(0, leftCount);
+  const rightBranches = firstLevel.slice(leftCount);
   const minLayer1XOffset = rootW / 2 + branchW / 2 + MIND_BOX_GAP;
   const preferredSubDx = subBranchW + 20;
-  const reserve = maxSubDepth > 0 ? branchW / 2 + maxSubDepth * preferredSubDx : 0;
-  const maxLayer1XOffset = Math.max(minLayer1XOffset, canvasW / 2 - reserve);
-  const \u8449\u306E\u540D\u524D\u306E\u6700\u5927\u5E45 = Math.max(
-    0,
-    ...firstLevel.filter((br) => (childrenOf.get(br.id) ?? []).length === 0).map((br) => {
-      const \u540D\u524D = \u653E\u5C04\u306E\u884C({ title: br.title, isRoot: false })[0];
-      return measureTextWidth(\u540D\u524D.text, { fontSize: \u540D\u524D.fontSize});
-    })
-  );
-  const \u540D\u524D\u3067\u6C7A\u307E\u308B\u4E0A\u9650 = canvasW / 2 + branchW / 2 - \u8449\u306E\u540D\u524D\u306E\u6700\u5927\u5E45;
-  const layer1XOffset = Math.max(minLayer1XOffset, Math.min(\u540D\u524D\u3067\u6C7A\u307E\u308B\u4E0A\u9650, maxLayer1XOffset));
-  const room = canvasW / 2 - layer1XOffset;
   const MIN_SUB_W = 56;
   const PREFERRED_GAP = MIND_BOX_GAP;
-  const gapRoom = maxSubDepth > 0 ? (room - branchW / 2 - maxSubDepth * MIN_SUB_W) / maxSubDepth : 0;
-  const gap = Math.max(8, Math.min(PREFERRED_GAP, gapRoom));
-  const effSubW = maxSubDepth > 0 ? Math.max(1, Math.min(subBranchW, (room - branchW / 2 - maxSubDepth * gap) / maxSubDepth)) : subBranchW;
-  const step1 = (branchW + effSubW) / 2 + gap;
-  const stepN = effSubW + gap;
-  const subOffset = (subDepth) => subDepth <= 0 ? 0 : step1 + (subDepth - 1) * stepN;
-  const leftBranches = firstLevel.slice(0, leftCount);
-  const rightBranches = firstLevel.slice(leftCount);
+  const \u679D\u306E\u540D\u524D\u306E\u5E45 = (title) => {
+    const \u540D\u524D = \u653E\u5C04\u306E\u884C({ title, isRoot: false })[0];
+    return textWidth(\u540D\u524D.text, \u540D\u524D.fontSize);
+  };
+  const \u679D\u306E\u6A2A\u3092\u6C7A\u3081\u308B = (br) => {
+    const maxSubDepth = subDepthOf(br.id, /* @__PURE__ */ new Set());
+    const \u4E0A\u9650 = maxSubDepth > 0 ? canvasW / 2 - (branchW / 2 + maxSubDepth * preferredSubDx) : canvasW / 2 + branchW / 2 - \u679D\u306E\u540D\u524D\u306E\u5E45(br.title);
+    const layer1XOffset = Math.floor(Math.max(minLayer1XOffset, \u4E0A\u9650));
+    const room = canvasW / 2 - layer1XOffset;
+    const gapRoom = maxSubDepth > 0 ? (room - branchW / 2 - maxSubDepth * MIN_SUB_W) / maxSubDepth : 0;
+    const gap = Math.floor(Math.max(8, Math.min(PREFERRED_GAP, gapRoom)));
+    const effSubW = maxSubDepth > 0 ? Math.floor(
+      Math.max(1, Math.min(subBranchW, (room - branchW / 2 - maxSubDepth * gap) / maxSubDepth))
+    ) : subBranchW;
+    const step1 = (branchW + effSubW) / 2 + gap;
+    const stepN = effSubW + gap;
+    return {
+      layer1XOffset,
+      effSubW,
+      subOffset: (subDepth) => subDepth <= 0 ? 0 : step1 + (subDepth - 1) * stepN
+    };
+  };
+  const \u6A2A\u306E\u5272\u4ED8\u8868 = new Map(
+    firstLevel.map((br) => [br.id, \u679D\u306E\u6A2A\u3092\u6C7A\u3081\u308B(br)])
+  );
+  const \u4E00\u756A\u5185\u5074\u306E\u96E2\u308C = Math.min(
+    ...firstLevel.length > 0 ? firstLevel.map((br) => \u6A2A\u306E\u5272\u4ED8\u8868.get(br.id).layer1XOffset) : [minLayer1XOffset]
+  );
   const leavesOfSide = (brs) => Math.max(
     1,
     brs.reduce((sum, br) => sum + leafCountOf(br.id, /* @__PURE__ */ new Set()), 0)
   );
   const sideLaneCount = Math.max(leavesOfSide(leftBranches), leavesOfSide(rightBranches));
   const laneBandH = Math.max(0, canvasH - BRANCH_BOX_H_MAX);
-  const rowGap = sideLaneCount > 1 ? Math.min(laneBandH / (sideLaneCount - 1), \u7E26\u306E\u9593\u9694\u306E\u4E0A\u9650(layer1XOffset)) : subBranchH + 14;
+  const rowGap = sideLaneCount > 1 ? Math.min(
+    laneBandH / (sideLaneCount - 1),
+    // 帯は図で 1 つなので、**一番内側の枝** から上限を取る (#966)。
+    // 外へ出た枝に合わせると、内側に残った枝の傾きが 45 度を超える
+    \u7E26\u306E\u9593\u9694\u306E\u4E0A\u9650(\u4E00\u756A\u5185\u5074\u306E\u96E2\u308C)
+  ) : subBranchH + 14;
   const effSubH = Math.min(SUB_BOX_H_MAX, rowGap * 0.7);
   const effBranchH = Math.min(BRANCH_BOX_H_MAX, rowGap * 0.7);
   const \u7AEF\u306E\u4F59\u308A = Math.max(effSubH, effBranchH) / 2;
@@ -5240,11 +5276,11 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
     const half = nodeHalfW.get(mindData.rootId) ?? rootW / 2;
     return \u4E2D\u5FC3\u306Ex + (isLeft ? -half : half);
   };
-  const placeSubtree = (node, subDepth, isLeft, tone, placed, laneRef) => {
+  const placeSubtree = (node, subDepth, isLeft, tone, placed, laneRef, \u6A2A) => {
     placed.add(node.id);
     const dirX = isLeft ? -1 : 1;
-    const x = cx + dirX * (layer1XOffset + subOffset(subDepth));
-    const w = subDepth === 0 ? branchW : effSubW;
+    const x = cx + dirX * (\u6A2A.layer1XOffset + \u6A2A.subOffset(subDepth));
+    const w = subDepth === 0 ? branchW : \u6A2A.effSubW;
     const h = subDepth === 0 ? effBranchH : effSubH;
     const myTone = node.tone ?? tone;
     const kids = (childrenOf.get(node.id) ?? []).filter((k) => !placed.has(k.id));
@@ -5260,7 +5296,8 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
           isLeft,
           myTone ?? MIND_TONES[i % MIND_TONES.length],
           placed,
-          laneRef
+          laneRef,
+          \u6A2A
         )
       );
       y = (ys[0] + ys[ys.length - 1]) / 2;
@@ -5293,7 +5330,7 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
     const placed = /* @__PURE__ */ new Set();
     brs.forEach((br, i) => {
       const tone = br.tone ?? MIND_TONES[(toneBase + i) % MIND_TONES.length];
-      placeSubtree(br, 0, isLeft, tone, placed, laneRef);
+      placeSubtree(br, 0, isLeft, tone, placed, laneRef, \u6A2A\u306E\u5272\u4ED8\u8868.get(br.id) ?? \u679D\u306E\u6A2A\u3092\u6C7A\u3081\u308B(br));
     });
   };
   placeSide(leftBranches, true, 0);