@x-plat/design-system 0.5.32 → 0.5.33

package/dist/components/Chart/index.cjs

@@ -157,40 +157,28 @@ var useChartAnimation = (containerRef, dataKey) => {
   }, [dataKey]);
   return animate || prefersReducedMotion();
 };
+var TOOLTIP_OFFSET = 12;
 var useChartTooltip = (enabled) => {
   const [tooltip, setTooltip] = import_react.default.useState({
     visible: false,
-    x: 0,
-    y: 0,
+    clientX: 0,
+    clientY: 0,
     content: ""
   });
   const containerRef = import_react.default.useRef(null);
   const rafRef = import_react.default.useRef(0);
   const move = import_react.default.useCallback((e) => {
     if (!enabled) return;
-    const clientX = e.clientX;
-    const clientY = e.clientY;
+    const cx = e.clientX;
+    const cy = e.clientY;
     cancelAnimationFrame(rafRef.current);
     rafRef.current = requestAnimationFrame(() => {
-      const rect = containerRef.current?.getBoundingClientRect();
-      if (!rect) return;
-      setTooltip((prev) => ({
-        ...prev,
-        x: clientX - rect.left,
-        y: clientY - rect.top - 12
-      }));
+      setTooltip((prev) => ({ ...prev, clientX: cx, clientY: cy }));
     });
   }, [enabled]);
   const show = import_react.default.useCallback((e, content) => {
     if (!enabled) return;
-    const rect = containerRef.current?.getBoundingClientRect();
-    if (!rect) return;
-    setTooltip({
-      visible: true,
-      x: e.clientX - rect.left,
-      y: e.clientY - rect.top - 12,
-      content
-    });
+    setTooltip({ visible: true, clientX: e.clientX, clientY: e.clientY, content });
   }, [enabled]);
   const hide = import_react.default.useCallback(() => {
     cancelAnimationFrame(rafRef.current);
@@ -224,14 +212,14 @@ var AxisLabels = import_react.default.memo(({ labels, count, chartW, height }) =
 AxisLabels.displayName = "AxisLabels";
 var useCrosshair = (seriesPoints, entries, labels, chartH) => {
   const [activeIndex, setActiveIndex] = import_react.default.useState(null);
-  const [mouseX, setMouseX] = import_react.default.useState(null);
   const handleMouseMove = import_react.default.useCallback((e) => {
     const svg = e.currentTarget;
     const rect = svg.getBoundingClientRect();
     const mx = (e.clientX - rect.left) / rect.width * svg.viewBox.baseVal.width;
-    setMouseX(mx);
     if (seriesPoints.length === 0 || seriesPoints[0].length === 0) return;
     const points = seriesPoints[0];
+    const step = points.length > 1 ? Math.abs(points[1].x - points[0].x) : 20;
+    const threshold = step / 2;
     let closest = 0;
     let minDist = Math.abs(points[0].x - mx);
     for (let i = 1; i < points.length; i++) {
@@ -241,11 +229,10 @@ var useCrosshair = (seriesPoints, entries, labels, chartH) => {
         closest = i;
       }
     }
-    setActiveIndex(closest);
+    setActiveIndex(minDist <= threshold ? closest : null);
   }, [seriesPoints]);
   const handleMouseLeave = import_react.default.useCallback(() => {
     setActiveIndex(null);
-    setMouseX(null);
   }, []);
   const tooltipContent = import_react.default.useMemo(() => {
     if (activeIndex === null) return "";
@@ -254,7 +241,13 @@ var useCrosshair = (seriesPoints, entries, labels, chartH) => {
       return p ? `${key}: ${p.v}` : "";
     }).filter(Boolean).join(" / ");
   }, [activeIndex, entries, seriesPoints]);
-  return { activeIndex, mouseX, handleMouseMove, handleMouseLeave, tooltipContent };
+  const getTooltipAt = import_react.default.useCallback((idx) => {
+    return entries.map(([key], di) => {
+      const p = seriesPoints[di]?.[idx];
+      return p ? `${key}: ${p.v}` : "";
+    }).filter(Boolean).join(" / ");
+  }, [entries, seriesPoints]);
+  return { activeIndex, handleMouseMove, handleMouseLeave, tooltipContent, getTooltipAt };
 };
 var LineChart = import_react.default.memo(({ data, labels, width, height, animate, onHover, onMove, onLeave }) => {
   const entries = import_react.default.useMemo(() => Object.entries(data), [data]);
@@ -277,7 +270,7 @@ var LineChart = import_react.default.memo(({ data, labels, width, height, animat
   );
   const lineRefs = import_react.default.useRef([]);
   const clipRef = import_react.default.useRef(null);
-  const { activeIndex, mouseX, handleMouseMove, handleMouseLeave, tooltipContent } = useCrosshair(seriesPoints, entries, labels, chartH);
+  const { activeIndex, handleMouseMove, handleMouseLeave, getTooltipAt } = useCrosshair(seriesPoints, entries, labels, chartH);
   import_react.default.useEffect(() => {
     if (!animate) return;
     lineRefs.current.forEach((el) => {
@@ -300,8 +293,7 @@ var LineChart = import_react.default.memo(({ data, labels, width, height, animat
       });
     }
   }, [animate, seriesPoints, width]);
-  const guideX = mouseX != null && mouseX >= PADDING.left && mouseX <= width - PADDING.right ? mouseX : null;
-  const activeX = activeIndex !== null ? seriesPoints[0]?.[activeIndex]?.x : null;
+  const activeX = activeIndex !== null ? seriesPoints[0]?.[activeIndex]?.x ?? null : null;
   const lineClipId = "line-area-clip";
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "svg",
@@ -310,7 +302,26 @@ var LineChart = import_react.default.memo(({ data, labels, width, height, animat
       className: "chart-svg",
       onMouseMove: (e) => {
         handleMouseMove(e);
-        onMove(e);
+        const svg = e.currentTarget;
+        const rect = svg.getBoundingClientRect();
+        const mx = (e.clientX - rect.left) / rect.width * svg.viewBox.baseVal.width;
+        const points = seriesPoints[0];
+        if (!points || points.length === 0) return;
+        const step = points.length > 1 ? Math.abs(points[1].x - points[0].x) : 20;
+        let closest = 0;
+        let minDist = Math.abs(points[0].x - mx);
+        for (let i = 1; i < points.length; i++) {
+          const dist = Math.abs(points[i].x - mx);
+          if (dist < minDist) {
+            minDist = dist;
+            closest = i;
+          }
+        }
+        if (minDist <= step / 2) {
+          onHover(e, `${labels[closest]} \u2014 ${getTooltipAt(closest)}`);
+        } else {
+          onLeave();
+        }
       },
       onMouseLeave: () => {
         handleMouseLeave();
@@ -365,21 +376,16 @@ var LineChart = import_react.default.memo(({ data, labels, width, height, animat
             )
           ] }, di);
         }),
-        guideX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        activeX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           "line",
           {
-            x1: guideX,
+            x1: activeX,
             y1: PADDING.top,
-            x2: guideX,
+            x2: activeX,
             y2: PADDING.top + chartH,
             className: "chart-crosshair"
           }
         ),
-        activeIndex !== null && activeX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("foreignObject", { x: activeX - 100, y: 0, width: "200", height: PADDING.top, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-crosshair-label", children: [
-          labels[activeIndex],
-          " \u2014 ",
-          tooltipContent
-        ] }) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           "rect",
           {
@@ -417,7 +423,7 @@ var CurveChart = import_react.default.memo(({ data, labels, width, height, anima
   );
   const lineRefs = import_react.default.useRef([]);
   const curveClipRef = import_react.default.useRef(null);
-  const { activeIndex, mouseX, handleMouseMove, handleMouseLeave, tooltipContent } = useCrosshair(seriesPoints, entries, labels, chartH);
+  const { activeIndex, handleMouseMove, handleMouseLeave, getTooltipAt } = useCrosshair(seriesPoints, entries, labels, chartH);
   import_react.default.useEffect(() => {
     if (!animate) return;
     lineRefs.current.forEach((el) => {
@@ -440,8 +446,7 @@ var CurveChart = import_react.default.memo(({ data, labels, width, height, anima
       });
     }
   }, [animate, seriesPoints, width]);
-  const guideX = mouseX != null && mouseX >= PADDING.left && mouseX <= width - PADDING.right ? mouseX : null;
-  const activeX = activeIndex !== null ? seriesPoints[0]?.[activeIndex]?.x : null;
+  const activeX = activeIndex !== null ? seriesPoints[0]?.[activeIndex]?.x ?? null : null;
   const curveClipId = "curve-area-clip";
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "svg",
@@ -450,7 +455,26 @@ var CurveChart = import_react.default.memo(({ data, labels, width, height, anima
       className: "chart-svg",
       onMouseMove: (e) => {
         handleMouseMove(e);
-        onMove(e);
+        const svg = e.currentTarget;
+        const rect = svg.getBoundingClientRect();
+        const mx = (e.clientX - rect.left) / rect.width * svg.viewBox.baseVal.width;
+        const points = seriesPoints[0];
+        if (!points || points.length === 0) return;
+        const step = points.length > 1 ? Math.abs(points[1].x - points[0].x) : 20;
+        let closest = 0;
+        let minDist = Math.abs(points[0].x - mx);
+        for (let i = 1; i < points.length; i++) {
+          const dist = Math.abs(points[i].x - mx);
+          if (dist < minDist) {
+            minDist = dist;
+            closest = i;
+          }
+        }
+        if (minDist <= step / 2) {
+          onHover(e, `${labels[closest]} \u2014 ${getTooltipAt(closest)}`);
+        } else {
+          onLeave();
+        }
       },
       onMouseLeave: () => {
         handleMouseLeave();
@@ -505,21 +529,16 @@ var CurveChart = import_react.default.memo(({ data, labels, width, height, anima
             )
           ] }, di);
         }),
-        guideX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        activeX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           "line",
           {
-            x1: guideX,
+            x1: activeX,
             y1: PADDING.top,
-            x2: guideX,
+            x2: activeX,
             y2: PADDING.top + chartH,
             className: "chart-crosshair"
           }
         ),
-        activeIndex !== null && activeX !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("foreignObject", { x: activeX - 100, y: 0, width: "200", height: PADDING.top, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-crosshair-label", children: [
-          labels[activeIndex],
-          " \u2014 ",
-          tooltipContent
-        ] }) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           "rect",
           {
@@ -698,30 +717,70 @@ var PieDonutChart = import_react.default.memo(
   }
 );
 PieDonutChart.displayName = "PieDonutChart";
-var TooltipBubble = ({ x, y, containerWidth, children }) => {
+var ChartTooltipPortal = ({ clientX, clientY, visible, children }) => {
   const ref = import_react.default.useRef(null);
-  const [adjustedX, setAdjustedX] = import_react.default.useState(x);
-  import_react.default.useEffect(() => {
+  const [pos, setPos] = import_react.default.useState({ left: 0, top: 0 });
+  import_react.default.useLayoutEffect(() => {
     const el = ref.current;
     if (!el) return;
     const w = el.offsetWidth;
-    const half = w / 2;
-    const margin = 8;
-    let nx = x;
-    if (x - half < margin) nx = half + margin;
-    else if (x + half > containerWidth - margin) nx = containerWidth - half - margin;
-    setAdjustedX(nx);
-  }, [x, containerWidth]);
+    const h = el.offsetHeight;
+    const vw = window.innerWidth;
+    let left = clientX + TOOLTIP_OFFSET;
+    let top = clientY - h - TOOLTIP_OFFSET;
+    if (left + w > vw - 8) left = clientX - w - TOOLTIP_OFFSET;
+    if (top < 8) top = clientY + TOOLTIP_OFFSET;
+    if (left < 8) left = 8;
+    setPos({ left, top });
+  }, [clientX, clientY]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     "div",
     {
       ref,
-      className: "chart-tooltip",
-      style: { left: adjustedX, top: y },
+      className: `chart-tooltip ${visible ? "chart-tooltip-show" : "chart-tooltip-hide"}`,
+      style: { position: "fixed", left: pos.left, top: pos.top, zIndex: 1100 },
       children
     }
   );
 };
+var ChartLegend = ({ data, labels, type }) => {
+  const entries = Object.entries(data);
+  if (type === "pie" || type === "doughnut") {
+    const values = entries.flatMap(([, v]) => v);
+    const total = values.reduce((a, b) => a + b, 0) || 1;
+    const firstKey = entries[0]?.[0] ?? "";
+    const colorOffset = hashString(firstKey);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "chart-legend", children: values.map((v, i) => {
+      const pct = Math.round(v / total * 100);
+      const color = PIE_COLORS[(i + colorOffset) % PIE_COLORS.length];
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-legend-item", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "chart-legend-dot", style: { backgroundColor: color } }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-legend-text", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "chart-legend-label", children: labels[i] || `${i + 1}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "chart-legend-value", children: [
+            v.toLocaleString(),
+            "(",
+            pct,
+            "%)"
+          ] })
+        ] })
+      ] }, i);
+    }) });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "chart-legend", children: entries.map(([key], di) => {
+    const palette = getPalette(LINE_BAR_PALETTES, di, key);
+    const color = palette[2];
+    const values = entries[di][1];
+    const sum = values.reduce((a, b) => a + b, 0);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-legend-item", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "chart-legend-dot", style: { backgroundColor: color } }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "chart-legend-text", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "chart-legend-label", children: key }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "chart-legend-value", children: sum.toLocaleString() })
+      ] })
+    ] }, di);
+  }) });
+};
 var Chart = import_react.default.memo((props) => {
   const { type, data, labels, tooltip: showTooltip = true } = props;
   const { tooltip, show, hide, move, containerRef } = useChartTooltip(showTooltip);
@@ -737,7 +796,8 @@ var Chart = import_react.default.memo((props) => {
     ready && type === "bar" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BarChart, { data: stableData, labels: stableLabels, width, height, animate, onHover: show, onMove: move, onLeave: hide }),
     ready && type === "pie" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PieDonutChart, { data: stableData, labels: stableLabels, width, height, animate, onHover: show, onMove: move, onLeave: hide }),
     ready && type === "doughnut" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PieDonutChart, { data: stableData, labels: stableLabels, width, height, animate, isDoughnut: true, onHover: show, onMove: move, onLeave: hide }),
-    tooltip.visible && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TooltipBubble, { x: tooltip.x, y: tooltip.y, containerWidth: width, children: tooltip.content })
+    ready && (type === "bar" || type === "pie" || type === "doughnut") && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChartLegend, { data: stableData, labels: stableLabels, type }),
+    tooltip.content && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChartTooltipPortal, { clientX: tooltip.clientX, clientY: tooltip.clientY, visible: tooltip.visible, children: tooltip.content })
   ] });
 });
 Chart.displayName = "Chart";

package/dist/components/Chart/index.css

@@ -75,9 +75,9 @@
   opacity: 1;
 }
 .lib-xplat-chart .chart-crosshair {
-  stroke: var(--semantic-border-subtle);
+  stroke: var(--semantic-border-strong);
   stroke-width: 1;
-  stroke-dasharray: 4 2;
+  stroke-dasharray: 4 3;
   pointer-events: none;
 }
 .lib-xplat-chart .chart-point-active {
@@ -93,18 +93,24 @@
   overflow: visible;
 }
 .lib-xplat-chart .chart-tooltip {
-  position: absolute;
-  transform: translate(-50%, -100%);
-  padding: var(--spacing-space-2) var(--spacing-space-3);
+  padding: var(--spacing-space-3);
   background-color: var(--semantic-surface-neutral-strong);
   color: var(--semantic-text-inverse);
   font-size: 12px;
+  line-height: 18px;
   font-weight: 500;
   border-radius: var(--spacing-radius-md);
-  white-space: nowrap;
+  max-width: 240px;
   pointer-events: none;
-  z-index: 10;
-  animation: chart-tooltip-in 150ms ease-out;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+.lib-xplat-chart .chart-tooltip.chart-tooltip-show {
+  opacity: 1;
+  animation: chart-tooltip-in 120ms ease-out;
+}
+.lib-xplat-chart .chart-tooltip.chart-tooltip-hide {
+  opacity: 0;
+  animation: chart-tooltip-out 80ms ease-in;
 }
 .lib-xplat-chart .chart-bar-animate {
   animation: chart-bar-grow 800ms ease-out both;
@@ -116,6 +122,38 @@
 .lib-xplat-chart .chart-area[style*=animationDelay] {
   animation: chart-fade-in 800ms ease-out both;
 }
+.lib-xplat-chart .chart-legend {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: var(--spacing-space-4);
+  padding: var(--spacing-space-3) 0;
+}
+.lib-xplat-chart .chart-legend-item {
+  display: flex;
+  align-items: flex-start;
+  gap: var(--spacing-space-2);
+}
+.lib-xplat-chart .chart-legend-dot {
+  flex-shrink: 0;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  margin-top: 3px;
+}
+.lib-xplat-chart .chart-legend-text {
+  display: flex;
+  flex-direction: column;
+}
+.lib-xplat-chart .chart-legend-label {
+  font-size: 12px;
+  color: var(--semantic-text-muted);
+}
+.lib-xplat-chart .chart-legend-value {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--semantic-text-strong);
+}
 @keyframes chart-bar-grow {
   from {
     transform: scaleY(0);
@@ -135,11 +173,17 @@
 @keyframes chart-tooltip-in {
   from {
     opacity: 0;
-    transform: translate(-50%, -90%);
   }
   to {
     opacity: 1;
-    transform: translate(-50%, -100%);
+  }
+}
+@keyframes chart-tooltip-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
   }
 }
 @media (prefers-reduced-motion: reduce) {