@cardenelabs/cdl 0.39.0 → 0.40.1

package/dist/react.cjs

@@ -9529,7 +9529,8 @@ var DRAW_KINDS = /* @__PURE__ */ new Set([
   "funnel-stages",
   "chart-gauge",
   "chart-radial",
-  "chart-stacked-bar"
+  "chart-stacked-bar",
+  "chart-waffle"
 ]);
 var KINDS = new Set(NODE_KINDS);
 var ENG_BANNED = /\b(FUNCTION|STORAGE|EVENT LOG|BALANCES MAPPING|READ|WRITE|EMIT|CALL)\b/;
@@ -12763,7 +12764,9 @@ function \u5370\u306E\u5272\u4ED8(\u5024) {
 function ChartWaffleNode({
   node,
   active,
-  stateValues = {}
+  stateValues = {},
+  drawing = false,
+  progress = 1
 }) {
   const x0 = node.cx - node.w / 2;
   const y0 = node.cy - node.h / 2;
@@ -12792,6 +12795,7 @@ function ChartWaffleNode({
   \u914D\u5206.forEach((n, idx) => {
     for (let k = 0; k < n; k++) \u6301\u3061\u4E3B.push(idx);
   });
+  const \u57CB\u307E\u3063\u305F = Math.round(\u9032\u307F\u3092\u7573\u3080(drawing, progress) * WAFFLE_TOTAL);
   const \u4E00\u89A7\u306E\u59CB\u307E\u308A = PAD + (\u4F7F\u3048\u308B\u9AD8\u3055 - \u884C\u306E\u9AD8\u3055 * data.length) / 2 + \u884C\u306E\u9AD8\u3055 / 2;
   return /* @__PURE__ */ jsxRuntime.jsxs("g", { transform: `translate(${x0} ${y0})`, children: [
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -12812,6 +12816,7 @@ function ChartWaffleNode({
       const \u884C = Math.floor(k / WAFFLE_COLS);
       const \u5217 = k % WAFFLE_COLS;
       const owner = \u6301\u3061\u4E3B[k];
+      const \u57CB\u307E\u3063\u3066\u3044\u308B = owner !== void 0 && k < \u57CB\u307E\u3063\u305F;
       return /* @__PURE__ */ jsxRuntime.jsx(
         "rect",
         {
@@ -12822,8 +12827,8 @@ function ChartWaffleNode({
           width: \u5370,
           height: \u5370,
           rx: 2,
-          fill: owner === void 0 ? "var(--cdl-divider, #d4d4d8)" : \u5370\u306E\u82722(data[owner].tone, owner),
-          fillOpacity: owner === void 0 ? 0.35 : 1
+          fill: \u57CB\u307E\u3063\u3066\u3044\u308B ? \u5370\u306E\u82722(data[owner].tone, owner) : "var(--cdl-divider, #d4d4d8)",
+          fillOpacity: \u57CB\u307E\u3063\u3066\u3044\u308B ? 1 : 0.35
         },
         `cell-${k}`
       );
@@ -13024,6 +13029,36 @@ function \u4E00\u89A7\u306E\u4E26\u3073(data, \u5DE6, \u53F3\u7AEF, \u7D1A) {
   return out;
 }
 var \u7DDA\u306E\u6700\u5C0F\u5E45 = 120;
+function \u540D\u672D\u306E\u6BB5\u3092\u307B\u3069\u304F(\u771F\u306Ey, \u9593\u9694, \u4E0A\u9650, \u4E0B\u9650) {
+  const \u4EF6\u6570 = \u771F\u306Ey.length;
+  if (\u4EF6\u6570 === 0) return [];
+  const \u4E26\u3073 = \u771F\u306Ey.map((y, i) => ({ y, i })).sort((a, b) => a.y - b.y || a.i - b.i);
+  const \u7D50\u679C = new Array(\u4EF6\u6570);
+  if (\u9593\u9694 * (\u4EF6\u6570 - 1) > \u4E0B\u9650 - \u4E0A\u9650) {
+    \u4E26\u3073.forEach((e, k) => {
+      \u7D50\u679C[e.i] = \u4EF6\u6570 > 1 ? \u4E0A\u9650 + (\u4E0B\u9650 - \u4E0A\u9650) / (\u4EF6\u6570 - 1) * k : (\u4E0A\u9650 + \u4E0B\u9650) / 2;
+    });
+    return \u7D50\u679C;
+  }
+  const \u584A\u305F\u3061 = [];
+  \u4E26\u3073.forEach((e, k) => {
+    \u584A\u305F\u3061.push({ \u5408\u8A08: e.y - \u9593\u9694 * k, \u4EF6\u6570: 1 });
+    while (\u584A\u305F\u3061.length >= 2) {
+      const \u5F8C = \u584A\u305F\u3061[\u584A\u305F\u3061.length - 1];
+      const \u524D = \u584A\u305F\u3061[\u584A\u305F\u3061.length - 2];
+      if (\u524D.\u5408\u8A08 / \u524D.\u4EF6\u6570 <= \u5F8C.\u5408\u8A08 / \u5F8C.\u4EF6\u6570) break;
+      \u584A\u305F\u3061.splice(\u584A\u305F\u3061.length - 2, 2, { \u5408\u8A08: \u524D.\u5408\u8A08 + \u5F8C.\u5408\u8A08, \u4EF6\u6570: \u524D.\u4EF6\u6570 + \u5F8C.\u4EF6\u6570 });
+    }
+  });
+  const \u307B\u3069\u3044\u305F = [];
+  \u584A\u305F\u3061.forEach((\u584A) => {
+    const \u5E73\u5747 = \u584A.\u5408\u8A08 / \u584A.\u4EF6\u6570;
+    for (let j = 0; j < \u584A.\u4EF6\u6570; j++) \u307B\u3069\u3044\u305F.push(\u5E73\u5747 + \u9593\u9694 * \u307B\u3069\u3044\u305F.length);
+  });
+  const \u305A\u308C = Math.max(0, \u4E0A\u9650 - \u307B\u3069\u3044\u305F[0]) - Math.max(0, \u307B\u3069\u3044\u305F[\u4EF6\u6570 - 1] - \u4E0B\u9650);
+  \u4E26\u3073.forEach((e, k) => \u7D50\u679C[e.i] = \u307B\u3069\u3044\u305F[k] + \u305A\u308C);
+  return \u7D50\u679C;
+}
 function ChartSlopeNode({
   node,
   active,
@@ -13089,6 +13124,15 @@ function ChartSlopeNode({
   const \u53F3\u8EF8x = \u524D\u3042\u308A ? Math.min(node.w - PAD, Math.max(node.w - PAD - \u53F3\u306E\u4F59\u767D, node.w / 2 + \u7DDA\u306E\u6700\u5C0F\u5E45 / 2)) : \u5DE6\u8EF8x;
   const \u4F38\u3073 = \u9032\u307F\u3092\u7573\u3080(drawing, progress);
   const \u53F3\u3092\u51FA\u3059 = !drawing || \u4F38\u3073 >= 1;
+  const \u5DE6\u306E\u70B9y = \u7CFB\u5217\u305F\u3061.map(
+    (s, i) => \u5F62 === "rank" ? \u6BB5\u306Ey\u3092\u53D6\u308B(\u524D\u306E\u9806\u4F4D[i]) : y\u3092\u53D6\u308B(s.\u524D)
+  );
+  const \u53F3\u306E\u70B9y = \u7CFB\u5217\u305F\u3061.map(
+    (s, i) => \u5F62 === "rank" ? \u6BB5\u306Ey\u3092\u53D6\u308B(\u4ECA\u306E\u9806\u4F4D[i]) : y\u3092\u53D6\u308B(s.\u4ECA)
+  );
+  const \u540D\u672D\u306E\u884C = Math.max(\u5024\u306E\u7D1A, \u540D\u524D\u306E\u7D1A) + 4;
+  const \u5DE6\u306E\u540D\u672Dy = \u524D\u3042\u308A ? \u540D\u672D\u306E\u6BB5\u3092\u307B\u3069\u304F(\u5DE6\u306E\u70B9y, \u540D\u672D\u306E\u884C, \u4E0A\u7AEF, \u4E0B\u7AEF) : \u5DE6\u306E\u70B9y;
+  const \u53F3\u306E\u540D\u672Dy = \u540D\u672D\u306E\u6BB5\u3092\u307B\u3069\u304F(\u53F3\u306E\u70B9y, \u540D\u672D\u306E\u884C, \u4E0A\u7AEF, \u4E0B\u7AEF);
   return /* @__PURE__ */ jsxRuntime.jsxs("g", { transform: `translate(${x0} ${y0})`, children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       "rect",
@@ -13146,8 +13190,10 @@ function ChartSlopeNode({
       )
     ] }),
     \u7CFB\u5217\u305F\u3061.map((s, i) => {
-      const \u5DE6y = \u5F62 === "rank" ? \u6BB5\u306Ey\u3092\u53D6\u308B(\u524D\u306E\u9806\u4F4D[i]) : y\u3092\u53D6\u308B(s.\u524D);
-      const \u53F3y = \u5F62 === "rank" ? \u6BB5\u306Ey\u3092\u53D6\u308B(\u4ECA\u306E\u9806\u4F4D[i]) : y\u3092\u53D6\u308B(s.\u4ECA);
+      const \u5DE6y = \u5DE6\u306E\u70B9y[i];
+      const \u53F3y = \u53F3\u306E\u70B9y[i];
+      const \u5DE6\u672Dy = \u5DE6\u306E\u540D\u672Dy[i];
+      const \u53F3\u672Dy = \u53F3\u306E\u540D\u672Dy[i];
       const \u672A\u89E3\u6C7A = s.\u672A\u89E3\u6C7A ? "true" : void 0;
       return /* @__PURE__ */ jsxRuntime.jsxs("g", { children: [
         \u524D\u3042\u308A && /* @__PURE__ */ jsxRuntime.jsx(
@@ -13191,7 +13237,7 @@ function ChartSlopeNode({
             {
               "data-cdl-role": "chart-slope-value",
               x: \u5DE6\u8EF8x - \u8EF8\u304B\u3089\u5024\u307E\u3067,
-              y: \u5DE6y + 5,
+              y: \u5DE6\u672Dy + 5,
               textAnchor: "end",
               fontSize: \u5024\u306E\u7D1A,
               fontWeight: 600,
@@ -13204,7 +13250,7 @@ function ChartSlopeNode({
             {
               "data-cdl-role": "chart-slope-name",
               x: \u5DE6\u8EF8x - \u8EF8\u304B\u3089\u5024\u307E\u3067 - \u5DE6\u5024\u5E45 - \u5024\u304B\u3089\u540D\u524D\u307E\u3067,
-              y: \u5DE6y + 5,
+              y: \u5DE6\u672Dy + 5,
               textAnchor: "end",
               fontSize: \u540D\u524D\u306E\u7D1A,
               fill: s.\u8272,
@@ -13216,7 +13262,7 @@ function ChartSlopeNode({
           {
             "data-cdl-role": "chart-slope-name",
             x: \u5DE6\u8EF8x - \u8EF8\u304B\u3089\u5024\u307E\u3067,
-            y: \u53F3y + 5,
+            y: \u53F3\u672Dy + 5,
             textAnchor: "end",
             fontSize: \u540D\u524D\u306E\u7D1A,
             fill: s.\u8272,
@@ -13229,7 +13275,7 @@ function ChartSlopeNode({
             {
               "data-cdl-role": \u5F62 === "delta" ? "chart-slope-delta" : "chart-slope-value",
               x: \u53F3\u8EF8x + \u8EF8\u304B\u3089\u5024\u307E\u3067,
-              y: \u53F3y + 5,
+              y: \u53F3\u672Dy + 5,
               fontSize: \u5024\u306E\u7D1A,
               fontWeight: 600,
               fill: "var(--cdl-text, #1a1f2a)",
@@ -13241,7 +13287,7 @@ function ChartSlopeNode({
             {
               "data-cdl-role": "chart-slope-name",
               x: \u53F3\u8EF8x + \u8EF8\u304B\u3089\u5024\u307E\u3067 + \u53F3\u5024\u5E45 + \u5024\u304B\u3089\u540D\u524D\u307E\u3067,
-              y: \u53F3y + 5,
+              y: \u53F3\u672Dy + 5,
               fontSize: \u540D\u524D\u306E\u7D1A,
               fill: s.\u8272,
               children: s.\u540D\u524D
@@ -17971,7 +18017,16 @@ function CdlNodeView({
           }
         );
       case "chart-waffle":
-        return /* @__PURE__ */ jsxRuntime.jsx(ChartWaffleNode, { node: resolvedNode, active, stateValues });
+        return /* @__PURE__ */ jsxRuntime.jsx(
+          ChartWaffleNode,
+          {
+            node: resolvedNode,
+            active,
+            stateValues,
+            drawing,
+            progress
+          }
+        );
       case "chart-stat":
         return /* @__PURE__ */ jsxRuntime.jsx(ChartStatNode, { node: resolvedNode, active, stateValues });
       case "chart-radial":