@cardenelabs/cdl 0.112.0 → 0.114.0

package/dist/react.cjs

@@ -5122,7 +5122,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) {
@@ -5195,30 +5195,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 layer1XOffset = Math.max(minLayer1XOffset, Math.min(canvasW * 0.32, 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;
@@ -5234,11 +5256,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));
@@ -5254,7 +5276,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;
@@ -5287,7 +5310,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);
@@ -5298,7 +5321,8 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
     let maxExtentX = rootW / 2;
     let maxExtentY = rootH / 2;
     for (const n of nodes) {
-      maxExtentX = Math.max(maxExtentX, Math.abs(n.x - cx) + n.w / 2);
+      const [\u5DE6, \u53F3] = \u63CF\u304F\u6A2A\u306E\u7AEF(n);
+      maxExtentX = Math.max(maxExtentX, Math.abs(\u5DE6 - cx), Math.abs(\u53F3 - cx));
       maxExtentY = Math.max(maxExtentY, Math.abs(n.y - cy) + n.h / 2);
     }
     const scale = Math.min(1, drawableHalfW / maxExtentX, drawableHalfH / maxExtentY);