@cardenelabs/cdl 0.12.0 → 0.13.0

package/dist/react.cjs

@@ -4859,6 +4859,7 @@ function payloadTexts(node) {
   }
   if (node.mindData) {
     \u8DB3\u3059(node.mindData.rootTitle);
+    \u8DB3\u3059(node.mindData.rootSubtitle);
     for (const b of node.mindData.branches) {
       \u8DB3\u3059(b.title);
       \u8DB3\u3059(b.subtitle);
@@ -6577,9 +6578,10 @@ function resolveTreeData(nodes, values) {
   });
 }
 function resolveMindData(data, values) {
-  const \u8AAD\u3080 = data.rootTitle.includes("{") || data.branches.some((b) => b.title.includes("{") || (b.subtitle?.includes("{") ?? false));
+  const \u8AAD\u3080 = data.rootTitle.includes("{") || (data.rootSubtitle?.includes("{") ?? false) || data.branches.some((b) => b.title.includes("{") || (b.subtitle?.includes("{") ?? false));
   if (!\u8AAD\u3080) return data;
   const root = resolveBoundText(data.rootTitle, values);
+  const rootSubtitle = data.rootSubtitle === void 0 ? void 0 : resolveBoundText(data.rootSubtitle, values);
   const branches = data.branches.map((b) => {
     const title = resolveBoundText(b.title, values);
     const subtitle = b.subtitle === void 0 ? void 0 : resolveBoundText(b.subtitle, values);
@@ -6590,8 +6592,13 @@ function resolveMindData(data, values) {
     };
     return title.ok && (subtitle?.ok ?? true) ? \u89E3\u6C7A\u5F8C2 : { ...\u89E3\u6C7A\u5F8C2, unresolved: true };
   });
-  const \u89E3\u6C7A\u5F8C = { ...data, rootTitle: root.value, branches };
-  return root.ok ? \u89E3\u6C7A\u5F8C : { ...\u89E3\u6C7A\u5F8C, unresolved: true };
+  const \u89E3\u6C7A\u5F8C = {
+    ...data,
+    rootTitle: root.value,
+    ...rootSubtitle ? { rootSubtitle: rootSubtitle.value } : {},
+    branches
+  };
+  return root.ok && (rootSubtitle?.ok ?? true) ? \u89E3\u6C7A\u5F8C : { ...\u89E3\u6C7A\u5F8C, unresolved: true };
 }
 
 // src/kinds/draw-progress.ts
@@ -7302,17 +7309,20 @@ var \u884C\u9001\u308A\u306E\u6BD4 = 1.15;
 var \u5B57\u306E\u9AD8\u3055\u306E\u6BD4 = 0.72;
 var \u4E0A\u4E0B\u306E\u4F59\u767D = 2;
 var \u5DE6\u53F3\u306E\u4F59\u767D = 8;
-function \u5E45\u3067\u5207\u308B(text, fontSize, \u4F7F\u3048\u308B\u5E45, \u6E2C\u308B = textWidth) {
-  if (\u4F7F\u3048\u308B\u5E45 <= 0) return "";
-  if (\u6E2C\u308B(text, fontSize) <= \u4F7F\u3048\u308B\u5E45) return text;
+function \u4F7F\u3048\u308B\u5E45(\u7BB1\u306E\u5E45) {
+  return \u7BB1\u306E\u5E45 - \u5DE6\u53F3\u306E\u4F59\u767D * 2;
+}
+function \u5E45\u3067\u5207\u308B(text, fontSize, \u4F7F\u3048\u308B\u5E452, \u6E2C\u308B = textWidth) {
+  if (\u4F7F\u3048\u308B\u5E452 <= 0) return "";
+  if (\u6E2C\u308B(text, fontSize) <= \u4F7F\u3048\u308B\u5E452) return text;
   const \u7701\u7565 = "\u2026";
   const \u7701\u7565\u306E\u5E45 = \u6E2C\u308B(\u7701\u7565, fontSize);
-  if (\u7701\u7565\u306E\u5E45 > \u4F7F\u3048\u308B\u5E45) return "";
+  if (\u7701\u7565\u306E\u5E45 > \u4F7F\u3048\u308B\u5E452) return "";
   let \u51FA = "";
   let \u5E45 = 0;
   for (const c of \u66F8\u8A18\u7D20\u306B\u5206\u3051\u308B(text)) {
     const \u5B57\u306E\u5E452 = \u6E2C\u308B(c, fontSize);
-    if (\u5E45 + \u5B57\u306E\u5E452 + \u7701\u7565\u306E\u5E45 > \u4F7F\u3048\u308B\u5E45) break;
+    if (\u5E45 + \u5B57\u306E\u5E452 + \u7701\u7565\u306E\u5E45 > \u4F7F\u3048\u308B\u5E452) break;
     \u5E45 += \u5B57\u306E\u5E452;
     \u51FA += c;
   }
@@ -7330,13 +7340,13 @@ function \u7BB1\u306B\u7A4D\u3080(\u884C, \u7BB1\u306E\u5E45, \u7BB1\u306E\u9AD8
   const \u9AD8\u3055 = (rs) => rs.reduce((a, r) => a + r.fontSize * \u884C\u9001\u308A\u306E\u6BD4, 0);
   const \u6B8B\u3059 = [...\u5019\u88DC];
   while (\u6B8B\u3059.length > 1 && \u9AD8\u3055(\u6B8B\u3059) > \u4F7F\u3048\u308B\u9AD8\u3055) \u6B8B\u3059.pop();
-  const \u4F7F\u3048\u308B\u5E45 = \u7BB1\u306E\u5E45 - \u5DE6\u53F3\u306E\u4F59\u767D * 2;
+  const \u5E45 = \u4F7F\u3048\u308B\u5E45(\u7BB1\u306E\u5E45);
   const \u7DCF\u9AD8 = \u9AD8\u3055(\u6B8B\u3059);
   let \u7A4D\u307F = -\u7DCF\u9AD8 / 2;
   return \u6B8B\u3059.map((r) => {
     const dy = \u7A4D\u307F + (\u884C\u9001\u308A\u306E\u6BD4 + \u5B57\u306E\u9AD8\u3055\u306E\u6BD4) / 2 * r.fontSize;
     \u7A4D\u307F += r.fontSize * \u884C\u9001\u308A\u306E\u6BD4;
-    return { ...r, text: \u5E45\u3067\u5207\u308B(r.text, r.fontSize, \u4F7F\u3048\u308B\u5E45), dy };
+    return { ...r, text: \u5E45\u3067\u5207\u308B(r.text, r.fontSize, \u5E45), dy };
   });
 }
 var MIND_TONES = ["accent", "teal", "success", "warning", "info", "error"];
@@ -7433,17 +7443,22 @@ function MindMapNode({
             children: r.text
           },
           r.\u5F79\u5272
-        )) : /* @__PURE__ */ jsxRuntime.jsx(
-          "text",
-          {
-            x: n.x,
-            y: n.y + 5,
-            fontSize: n.isRoot ? 15 : 13,
-            fontWeight: n.isRoot ? 700 : 600,
-            textAnchor: "middle",
-            fill: \u6587\u5B57\u306E\u8272,
-            children: n.title
-          }
+        )) : (
+          // 補足が無くても **幅に収める** (#526)。 `箱に積む` を通らないこの経路だけが
+          // 幅を見ておらず、長い名前がそのまま箱の外へ出て枝の線と重なっていた
+          // (実測 = 中心の箱で文字 163px に対し箱 120px)
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "text",
+            {
+              x: n.x,
+              y: n.y + 5,
+              fontSize: n.isRoot ? 15 : 13,
+              fontWeight: n.isRoot ? 700 : 600,
+              textAnchor: "middle",
+              fill: \u6587\u5B57\u306E\u8272,
+              children: \u5E45\u3067\u5207\u308B(n.title, n.isRoot ? 15 : 13, \u4F7F\u3048\u308B\u5E45(n.w))
+            }
+          )
         )
       ] }, `n-${n.id}`);
     })
@@ -7457,6 +7472,8 @@ function computeMindMapLayout(mindData, cx, cy, canvasW, canvasH) {
   nodes.push({
     id: mindData.rootId,
     title: mindData.rootTitle,
+    // 中心も枝と同じく 2 行に積める (#530)。 高さ 52 に 15px + 9px の 2 行が入る
+    ...mindData.rootSubtitle === void 0 ? {} : { subtitle: mindData.rootSubtitle },
     x: cx,
     y: cy,
     w: rootW,
@@ -8059,17 +8076,21 @@ function TreeNode({
               \u7BB1\u306E\u9AD8\u3055: n.h,
               fill: "var(--cdl-text-on-tone, #ffffff)",
               \u540D\u524D\u306E\u592A\u3055: 700
-            }) : /* @__PURE__ */ jsxRuntime.jsx(
-              "text",
-              {
-                x: n.w / 2,
-                y: n.h / 2 + 5,
-                fontSize: 13,
-                fontWeight: 700,
-                textAnchor: "middle",
-                fill: "var(--cdl-text-on-tone, #ffffff)",
-                children: n.title
-              }
+            }) : (
+              // 補足が無くても幅に収める (#526)。 `箱の文字` を通らないこの経路だけが
+              // 幅を見ておらず、長い名前が箱の外へ出ていた
+              /* @__PURE__ */ jsxRuntime.jsx(
+                "text",
+                {
+                  x: n.w / 2,
+                  y: n.h / 2 + 5,
+                  fontSize: 13,
+                  fontWeight: 700,
+                  textAnchor: "middle",
+                  fill: "var(--cdl-text-on-tone, #ffffff)",
+                  children: \u5E45\u3067\u5207\u308B(n.title, 13, \u4F7F\u3048\u308B\u5E45(n.w))
+                }
+              )
             )
           ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
             /* @__PURE__ */ jsxRuntime.jsx(
@@ -8102,7 +8123,7 @@ function TreeNode({
                 fontWeight: 600,
                 textAnchor: "middle",
                 fill: "var(--cdl-chip-text, #1a1f2a)",
-                children: n.title
+                children: \u5E45\u3067\u5207\u308B(n.title, 12, \u4F7F\u3048\u308B\u5E45(n.w))
               }
             )
           ] })