@automattic/charts 4.8.0 → 4.10.0

package/dist/index.js

@@ -4,7 +4,7 @@ import { AnimatedAreaSeries, AnimatedAreaStack, AreaSeries, Axis, BarGroup, BarS
 import { __, _x, sprintf } from "@wordpress/i18n";
 import clsx from "clsx";
 import * as React from "react";
-import { Children, Fragment, createContext, createContext as createContext$1, createElement, forwardRef, forwardRef as forwardRef$1, isValidElement, memo, useCallback, useCallback as useCallback$1, useContext, useContext as useContext$1, useEffect, useEffect as useEffect$1, useId, useImperativeHandle, useLayoutEffect, useMemo, useMemo as useMemo$1, useRef, useRef as useRef$1, useState, useState as useState$1 } from "react";
+import { Children, Fragment, createContext, createContext as createContext$1, createElement, forwardRef, forwardRef as forwardRef$1, isValidElement, memo, useCallback, useCallback as useCallback$1, useContext, useContext as useContext$1, useEffect, useEffect as useEffect$1, useId, useImperativeHandle, useLayoutEffect, useMemo, useMemo as useMemo$1, useRef, useRef as useRef$1, useState, useState as useState$1, version } from "react";
 import { differenceInHours, differenceInYears, isValid, parse, parseISO } from "date-fns";
 import { tzOffset } from "@date-fns/tz";
 import { Text, getStringWidth } from "@visx/text";
@@ -15,9 +15,9 @@ import { useTooltip } from "@visx/tooltip";
 import { createScale, getTicks, scaleBand, scaleCanBeZeroed, scaleOrdinal, scaleTime } from "@visx/scale";
 import { Group } from "@visx/group";
 import { LegendItem, LegendLabel, LegendOrdinal, LegendShape } from "@visx/legend";
-import { IconButton, Stack, Text as Text$1 } from "@wordpress/ui";
+import { IconButton, Stack, Text as Text$1, VisuallyHidden } from "@wordpress/ui";
 import { ThemeProvider } from "@wordpress/theme";
-import { createPortal } from "react-dom";
+import { createPortal, flushSync } from "react-dom";
 import { LinearGradient } from "@visx/gradient";
 import { curveCatmullRom, curveLinear, curveMonotoneX } from "@visx/curve";
 import { useParentSize } from "@visx/responsive";
@@ -30,7 +30,7 @@ import { __assign } from "tslib";
 import "@babel/runtime/helpers/esm/extends";
 import "@babel/runtime/helpers/extends";
 import { Icon, chevronRight } from "@wordpress/icons";
-import { Pie } from "@visx/shape";
+import { arc, pie } from "@visx/shape";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -669,16 +669,17 @@ function readCustomProperty(varName, styles) {
 }
 //#endregion
 //#region src/utils/resolve-font-size.ts
+const toFontSize = (size) => Number.isFinite(size) && size >= 0 ? size : void 0;
 /**
 * Resolve a theme `fontSize` value into a plain number suitable for
 * canvas-based measurement (e.g. `getStringWidth`).
 *
 * Accepts:
-* - A number — returned as-is
+* - A finite, non-negative number — returned as-is
 * - A pixel string like `"12px"` — parsed and returned as a number
 *
-* Returns `undefined` for any other input (missing value, NaN, or
-* relative units like `rem`/`em`/`%`/`vh`) so callers can fall back to
+* Returns `undefined` for any other input (missing value, a non-finite or
+* negative size, or relative units like `rem`/`em`/`%`/`vh`) so callers can fall back to
 * their own default. Relative units are intentionally rejected because
 * we cannot resolve them to absolute pixels here without a parent
 * computed style, and silently returning the unitless prefix
@@ -688,12 +689,10 @@ function readCustomProperty(varName, styles) {
 * @return Parsed numeric font size in pixels, or `undefined` when unresolvable
 */
 const resolveFontSize = (val) => {
-	if (typeof val === "number") return isNaN(val) ? void 0 : val;
+	if (typeof val === "number") return toFontSize(val);
 	if (typeof val === "string") {
-		const match = val.trim().match(/^(-?\d+\.?\d*|-?\.\d+)(px)?$/);
-		if (!match) return;
-		const parsed = parseFloat(match[1]);
-		return isNaN(parsed) ? void 0 : parsed;
+		const match = val.trim().match(/^\+?((?:\d*\.)?\d+)(px)?$/);
+		return match ? toFontSize(parseFloat(match[1])) : void 0;
 	}
 };
 //#endregion
@@ -1572,6 +1571,20 @@ const useChartScopeElement = () => useContext(ChartScopeContext);
 const useStandaloneScopeClass = () => useContext(GlobalChartsContext) ? void 0 : CHART_SCOPE_CLASS;
 //#endregion
 //#region src/hooks/use-xychart-theme.ts
+const STARTS_LIKE_A_NUMBER = /^[+-]?[\d.]/;
+const NON_NEGATIVE_CSS_NUMBER = /^\+?(?:\d*\.)?\d+(?:e[+-]?\d+)?(?:[a-z]+|%)?$/i;
+const isRenderableFontSize = (fontSize) => {
+	if (typeof fontSize === "number") return resolveFontSize(fontSize) !== void 0;
+	const value = fontSize.trim();
+	if (!STARTS_LIKE_A_NUMBER.test(value)) return true;
+	return NON_NEGATIVE_CSS_NUMBER.test(value) && Number.isFinite(parseFloat(value));
+};
+const withRenderableFontSize = (style) => {
+	if (style?.fontSize === void 0 || isRenderableFontSize(style.fontSize)) return style;
+	const rest = { ...style };
+	delete rest.fontSize;
+	return rest;
+};
 const useXYChartTheme = (data) => {
 	const theme = useGlobalChartsTheme();
 	const scopeElement = useChartScopeElement();
@@ -1602,9 +1615,10 @@ const useXYChartTheme = (data) => {
 			yAxisLineStyles: { stroke: CATALOG_POINTERS.axisY },
 			yTickLineStyles: { stroke: CATALOG_POINTERS.tickY },
 			svgLabelSmall: {
-				...theme.svgLabelSmall,
+				...withRenderableFontSize(theme.svgLabelSmall),
 				fill: CATALOG_POINTERS.labelAxis
-			}
+			},
+			svgLabelBig: withRenderableFontSize(theme.svgLabelBig)
 		});
 	}, [
 		theme,
@@ -2117,7 +2131,7 @@ const getLegendItemAriaLabel = (text, value, visible, interactive) => {
 	if (visible) return;
 	return sprintf(_x("%s: hidden", "hidden non-interactive legend item", "jetpack-charts"), accessibleText);
 };
-const BaseLegend = forwardRef(({ items, className, orientation = "horizontal", alignment = "center", shape = "rect", fill = valueOrIdentityString, size = valueOrIdentityString, labelFormat = valueOrIdentity, labelTransform, itemStyles, itemClassName, labelStyles, labelClassName, shapeStyles, render, interactive = false, chartId }, ref) => {
+const BaseLegend = forwardRef(({ items: allItems, className, orientation = "horizontal", alignment = "center", shape = "rect", fill = valueOrIdentityString, size = valueOrIdentityString, labelFormat = valueOrIdentity, labelTransform, itemStyles, itemClassName, labelStyles, labelClassName, shapeStyles, render, interactive = false, chartId }, ref) => {
 	const { margin: itemMargin = "0", flexDirection: itemDirection = "row" } = itemStyles ?? {};
 	const { justifyContent: labelJustifyContent = "flex-start", flex: labelFlex = "0 0 auto", margin: labelMargin = "0 4px", maxWidth, textOverflow = "wrap" } = labelStyles ?? {};
 	const { width: shapeWidth = 16, height: shapeHeight = 16, margin: shapeMargin = "2px 4px 2px 0" } = shapeStyles ?? {};
@@ -2125,6 +2139,16 @@ const BaseLegend = forwardRef(({ items, className, orientation = "horizontal", a
 	const context = useContext(GlobalChartsContext);
 	const chartInstanceContext = useContext(ChartInstanceContext);
 	const standaloneScopeClass = useStandaloneScopeClass();
+	const isSeriesVisible = useCallback((seriesLabel) => {
+		if (chartInstanceContext?.isSeriesVisible) return chartInstanceContext.isSeriesVisible(seriesLabel);
+		if (!chartId || !context) return true;
+		return context.isSeriesVisible(chartId, seriesLabel);
+	}, [
+		chartId,
+		chartInstanceContext,
+		context
+	]);
+	const items = useMemo(() => allItems.filter((item) => item.interactive !== false || !item.describesSeries || isSeriesVisible(item.describesSeries)), [allItems, isSeriesVisible]);
 	const domain = items.map((item) => item.label);
 	const legendScale = scaleOrdinal({
 		domain,
@@ -2147,15 +2171,6 @@ const BaseLegend = forwardRef(({ items, className, orientation = "horizontal", a
 		chartId,
 		context
 	]);
-	const isSeriesVisible = useCallback((seriesLabel) => {
-		if (chartInstanceContext?.isSeriesVisible) return chartInstanceContext.isSeriesVisible(seriesLabel);
-		if (!chartId || !context) return true;
-		return context.isSeriesVisible(chartId, seriesLabel);
-	}, [
-		chartId,
-		chartInstanceContext,
-		context
-	]);
 	const createClickHandler = useCallback((seriesLabels, itemInteractive) => {
 		if (!itemInteractive) return;
 		return () => handleLegendClick(seriesLabels);
@@ -2430,6 +2445,34 @@ function buildComparisonLegendItem(seriesData, items, label, getElementStyles, l
 	};
 }
 /**
+* Builds one static item per comparison series folded into another series' item, named after
+* that item and styled like the comparison series itself.
+* @param seriesData       - The series data to search for comparison series
+* @param items            - The legend items already built from the series
+* @param formatLabel      - Names an item after the label of the item it was folded into
+* @param getElementStyles - Function to get element styles
+* @param legendShape      - The shape type for legend items (string literal or React component)
+* @return The legend items, in series order
+*/
+function buildPerSeriesComparisonItems(seriesData, items, formatLabel, getElementStyles, legendShape) {
+	return seriesData.flatMap((series, index) => {
+		const owner = items.find((item) => item.seriesLabels?.includes(series.label));
+		if (series.options?.type !== "comparison" || !owner || owner.seriesLabels?.[0] === series.label) return [];
+		const { color, shapeStyles } = getElementStyles({
+			data: series,
+			index,
+			legendShape
+		});
+		return [{
+			label: formatLabel(owner.label),
+			color,
+			shapeStyle: shapeStyles,
+			interactive: false,
+			describesSeries: series.label
+		}];
+	});
+}
+/**
 * Processes point data into legend items
 * @param pointData          - The point data to process
 * @param getElementStyles   - Function to get element styles
@@ -2465,13 +2508,14 @@ function processPointData(pointData, getElementStyles, showValues, legendValueDi
 * @return Array of legend items ready for display
 */
 function useChartLegendItems(data, options = {}, legendShape) {
-	const { showValues = false, legendValueDisplay = "percentage", withGlyph = false, glyphSize = 8, collapseGroups = false, comparisonItem = false, renderGlyph } = options;
+	const { showValues = false, legendValueDisplay = "percentage", withGlyph = false, glyphSize = 8, collapseGroups = false, comparisonItem = false, comparisonSeriesItems, renderGlyph } = options;
 	const { getElementStyles } = useGlobalChartsContext();
 	return useMemo(() => {
 		if (!data || !Array.isArray(data) || data.length === 0) return [];
 		if ("data" in data[0]) {
 			const seriesData = data;
 			const items = processSeriesData(seriesData, getElementStyles, showValues, withGlyph, glyphSize, collapseGroups, renderGlyph, legendShape);
+			if (comparisonSeriesItems) return [...items, ...buildPerSeriesComparisonItems(seriesData, items, comparisonSeriesItems, getElementStyles, legendShape)];
 			const comparison = comparisonItem ? buildComparisonLegendItem(seriesData, items, typeof comparisonItem === "string" ? comparisonItem : __("Comparison period", "jetpack-charts"), getElementStyles, legendShape) : null;
 			return comparison ? [...items, comparison] : items;
 		}
@@ -2485,6 +2529,7 @@ function useChartLegendItems(data, options = {}, legendShape) {
 		glyphSize,
 		collapseGroups,
 		comparisonItem,
+		comparisonSeriesItems,
 		renderGlyph,
 		legendShape
 	]);
@@ -3080,7 +3125,7 @@ const XYChartTooltip = ({ renderTooltip, selectedIndex, tooltipRef, keyboardFocu
 /** @deprecated Use `XYChartTooltip`. */
 const AccessibleTooltip = XYChartTooltip;
 const useKeyboardNavigation = ({ selectedIndex, setSelectedIndex, isNavigating, setIsNavigating, chartRef, totalPoints, onActivate, preventTooltipScroll = false, visibleSeriesKey }) => {
-	const getChartRoot = useCallback(() => chartRef.current?.closest("[role=\"grid\"]") ?? chartRef.current, [chartRef]);
+	const getChartRoot = useCallback(() => chartRef.current?.closest("[role=\"application\"]") ?? chartRef.current, [chartRef]);
 	const focusWithoutScrollIfNeeded = useCallback((element) => {
 		if (preventTooltipScroll) element?.focus({ preventScroll: true });
 		else element?.focus();
@@ -3295,11 +3340,13 @@ function useChartChildren(children, chartType) {
 				}
 				const displayName = child.type?.displayName;
 				if (displayName === `${chartType}.SVG` || displayName === "Chart.SVG") {
-					if (child.props?.children) Children.forEach(child.props.children, (svgChild) => {
+					const { children: svgChildren } = child.props ?? {};
+					if (svgChildren) Children.forEach(svgChildren, (svgChild) => {
 						svg.push(svgChild);
 					});
 				} else if (displayName === `${chartType}.HTML` || displayName === "Chart.HTML") {
-					if (child.props?.children) Children.forEach(child.props.children, (htmlChild) => {
+					const { children: htmlChildren } = child.props ?? {};
+					if (htmlChildren) Children.forEach(htmlChildren, (htmlChild) => {
 						html.push(htmlChild);
 					});
 				} else if (child.type === Group) svg.push(child);
@@ -4121,6 +4168,7 @@ var line_chart_module_default = {
 	"line-chart--animated": "a8ccharts-inuQka-line-chart--animated",
 	"rise": "a8ccharts-inuQka-rise"
 };
+const isReact18 = version.startsWith("18.");
 const CloseIcon = () => /* @__PURE__ */ jsx("svg", {
 	width: "16",
 	height: "16",
@@ -4163,7 +4211,7 @@ const LineChartAnnotationLabelWithPopover = ({ title, subtitle, renderLabel, ren
 		className: line_chart_module_default["line-chart__annotation-label"],
 		children: [/* @__PURE__ */ jsx("button", {
 			ref: buttonRef,
-			popovertarget: popoverId,
+			...isReact18 ? { popovertarget: popoverId } : { popoverTarget: popoverId },
 			className: line_chart_module_default["line-chart__annotation-label-trigger-button"],
 			style: {
 				width: `44px`,
@@ -4191,8 +4239,13 @@ const LineChartAnnotationLabelWithPopover = ({ title, subtitle, renderLabel, ren
 						subtitle
 					})
 				}), /* @__PURE__ */ jsx("button", {
-					popovertarget: popoverId,
-					popovertargetaction: "hide",
+					...isReact18 ? {
+						popovertarget: popoverId,
+						popovertargetaction: "hide"
+					} : {
+						popoverTarget: popoverId,
+						popoverTargetAction: "hide"
+					},
 					className: line_chart_module_default["line-chart__annotation-label-popover-close-button"],
 					"aria-label": __("Close", "jetpack-charts"),
 					children: /* @__PURE__ */ jsx(CloseIcon, {})
@@ -4714,10 +4767,11 @@ const LineChartScalesRef = ({ chartRef, width, height, margin }) => {
 	]);
 	return null;
 };
-const LineChartInternal = forwardRef(({ data, chartId: providedChartId, width, height, className, margin, withTooltips = true, withTooltipCrosshairs, showLegend = false, legend = {}, renderGlyph = defaultRenderGlyph, glyphStyle = {}, withLegendGlyph = false, withGradientFill = false, smoothing = true, curveType, renderTooltip = renderDefaultTooltip, tooltipPlacement, tooltipStyle, withStartGlyphs = false, withEndGlyphs = false, animation, options = {}, onPointerDown = void 0, onPointerUp = void 0, onPointerMove = void 0, onPointerOut = void 0, onDatumActivate = void 0, zoomable = false, rescaleYOnVisibilityChange = true, defaultHiddenSeries, children, gridVisibility, gap = "md" }, ref) => {
+const LineChartInternal = forwardRef(({ data, ariaLabel, chartId: providedChartId, width, height, className, margin, withTooltips = true, withTooltipCrosshairs, showLegend = false, legend = {}, renderGlyph = defaultRenderGlyph, glyphStyle = {}, withLegendGlyph = false, withGradientFill = false, smoothing = true, curveType, renderTooltip = renderDefaultTooltip, tooltipPlacement, tooltipStyle, withStartGlyphs = false, withEndGlyphs = false, animation, options = {}, onPointerDown = void 0, onPointerUp = void 0, onPointerMove = void 0, onPointerOut = void 0, onDatumActivate = void 0, zoomable = false, rescaleYOnVisibilityChange = true, defaultHiddenSeries, children, gridVisibility, gap = "md" }, ref) => {
 	const legendInteractive = legend.interactive ?? false;
 	const legendCollapseGroups = legend.collapseGroups ?? false;
 	const legendComparisonItem = legend.comparisonItem ?? false;
+	const legendComparisonSeriesItems = legend.comparisonSeriesItems;
 	const legendShape = legend.shape ?? "line";
 	const legendPosition = legend.position ?? "bottom";
 	const formatting = useChartFormatting();
@@ -4902,12 +4956,14 @@ const LineChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 		glyphSize: Math.max(0, toNumber(glyphStyle?.radius) ?? 4),
 		collapseGroups: legendCollapseGroups,
 		comparisonItem: legendComparisonItem,
+		comparisonSeriesItems: legendComparisonSeriesItems,
 		renderGlyph
 	}), [
 		withLegendGlyph,
 		glyphStyle?.radius,
 		legendCollapseGroups,
 		legendComparisonItem,
+		legendComparisonSeriesItems,
 		renderGlyph
 	]), legendShape);
 	const chartMetadata = useMemo(() => ({
@@ -4982,8 +5038,8 @@ const LineChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 				const chartHeight = contentHeight > 0 ? contentHeight : height;
 				return /* @__PURE__ */ jsx("div", {
 					ref: chartRef,
-					role: "grid",
-					"aria-label": __("Line chart", "jetpack-charts"),
+					role: "application",
+					"aria-label": ariaLabel ?? __("Line chart", "jetpack-charts"),
 					tabIndex: 0,
 					onKeyDown: onChartKeyDown,
 					onFocus: onChartFocus,
@@ -4991,6 +5047,7 @@ const LineChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 					children: chartHeight > 0 && /* @__PURE__ */ jsxs("div", {
 						className: xy_plot_module_default["xy-plot"],
 						children: [zoomable && zoom.domain && /* @__PURE__ */ jsx(ZoomResetButton, { onClick: zoom.reset }), /* @__PURE__ */ jsxs(XYChart, {
+							accessibilityLabel: "",
 							theme,
 							width,
 							height: chartHeight,
@@ -5231,7 +5288,7 @@ const HoverGlyphs = ({ visibleSeries, stacked, stackOffset, getElementStyles, st
 };
 //#endregion
 //#region src/charts/area-chart/area-chart.tsx
-const AreaChartInternal = forwardRef(({ data, chartId: providedChartId, width, height, className, margin, withTooltips = true, withTooltipCrosshairs, showLegend = false, legend = {}, stacked = true, stackOffset = "none", smoothing = true, curveType, fillOpacity, withStroke, renderTooltip = renderDefaultTooltip, animation, options = {}, onPointerDown, onPointerUp, onPointerMove, onPointerOut, zoomable = false, rescaleYOnVisibilityChange = true, defaultHiddenSeries, children, gridVisibility, gap = "md" }, ref) => {
+const AreaChartInternal = forwardRef(({ data, ariaLabel, chartId: providedChartId, width, height, className, margin, withTooltips = true, withTooltipCrosshairs, showLegend = false, legend = {}, stacked = true, stackOffset = "none", smoothing = true, curveType, fillOpacity, withStroke, renderTooltip = renderDefaultTooltip, animation, options = {}, onPointerDown, onPointerUp, onPointerMove, onPointerOut, zoomable = false, rescaleYOnVisibilityChange = true, defaultHiddenSeries, children, gridVisibility, gap = "md" }, ref) => {
 	const legendInteractive = legend.interactive ?? false;
 	const legendShape = legend.shape ?? "rect";
 	const legendPosition = legend.position ?? "bottom";
@@ -5375,8 +5432,13 @@ const AreaChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 		withGlyph: false,
 		glyphSize: 0,
 		collapseGroups: legend.collapseGroups ?? false,
-		comparisonItem: legend.comparisonItem ?? false
-	}), [legend.collapseGroups, legend.comparisonItem]), legendShape);
+		comparisonItem: legend.comparisonItem ?? false,
+		comparisonSeriesItems: legend.comparisonSeriesItems
+	}), [
+		legend.collapseGroups,
+		legend.comparisonItem,
+		legend.comparisonSeriesItems
+	]), legendShape);
 	const chartMetadata = useMemo(() => ({
 		stacked,
 		stackOffset,
@@ -5502,8 +5564,8 @@ const AreaChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 				const chartHeight = contentHeight > 0 ? contentHeight : height;
 				return /* @__PURE__ */ jsx("div", {
 					ref: chartRef,
-					role: "grid",
-					"aria-label": __("Area chart", "jetpack-charts"),
+					role: "application",
+					"aria-label": ariaLabel ?? __("Area chart", "jetpack-charts"),
 					tabIndex: 0,
 					onKeyDown: onChartKeyDown,
 					onFocus: onChartFocus,
@@ -5511,6 +5573,7 @@ const AreaChartInternal = forwardRef(({ data, chartId: providedChartId, width, h
 					children: chartHeight > 0 && /* @__PURE__ */ jsxs("div", {
 						className: xy_plot_module_default["xy-plot"],
 						children: [zoomable && zoom.domain && /* @__PURE__ */ jsx(ZoomResetButton, { onClick: zoom.reset }), /* @__PURE__ */ jsxs(XYChart, {
+							accessibilityLabel: "",
 							theme,
 							width,
 							height: chartHeight,
@@ -6363,11 +6426,12 @@ const renderTooltipRow = (label, value) => /* @__PURE__ */ jsx("div", {
 	className: bar_chart_module_default["bar-chart__tooltip-row"],
 	children: sprintf(__("%1$s: %2$s", "jetpack-charts"), label, value)
 });
-const BarChartInternal = ({ data, chartId: providedChartId, width, height, className, margin, withTooltips = false, showLegend = false, legend = {}, gridVisibility: gridVisibilityProp, renderTooltip, tooltipPlacement, tooltipAnchorTop, tooltipStyle, barClassName, options = {}, orientation = "vertical", withPatterns = false, showZeroValues = false, withBandHighlight = false, onBandHighlightChange, defaultHiddenSeries, animation, children, gap = "md", onPointerDown, onPointerUp, onDatumActivate }) => {
+const BarChartInternal = ({ data, ariaLabel, chartId: providedChartId, width, height, className, margin, withTooltips = false, showLegend = false, legend = {}, gridVisibility: gridVisibilityProp, renderTooltip, tooltipPlacement, tooltipAnchorTop, tooltipStyle, barClassName, options = {}, orientation = "vertical", withPatterns = false, showZeroValues = false, withBandHighlight = false, onBandHighlightChange, defaultHiddenSeries, animation, children, gap = "md", onPointerDown, onPointerUp, onDatumActivate }) => {
 	if (!withTooltips && (withBandHighlight || onBandHighlightChange)) warnOnce("bar-chart-band-highlight-without-tooltips", "BarChart: withBandHighlight and onBandHighlightChange require withTooltips.");
 	const legendInteractive = legend.interactive ?? false;
 	const legendCollapseGroups = legend.collapseGroups ?? false;
 	const legendComparisonItem = legend.comparisonItem ?? false;
+	const legendComparisonSeriesItems = legend.comparisonSeriesItems;
 	const horizontal = orientation === "horizontal";
 	const chartId = useChartId(providedChartId);
 	const hiddenSeries = useDefaultHiddenSeries(chartId, defaultHiddenSeries);
@@ -6380,8 +6444,13 @@ const BarChartInternal = ({ data, chartId: providedChartId, width, height, class
 	});
 	const legendItems = useChartLegendItems(dataSorted, useMemo(() => ({
 		collapseGroups: legendCollapseGroups,
-		comparisonItem: legendComparisonItem
-	}), [legendCollapseGroups, legendComparisonItem]));
+		comparisonItem: legendComparisonItem,
+		comparisonSeriesItems: legendComparisonSeriesItems
+	}), [
+		legendCollapseGroups,
+		legendComparisonItem,
+		legendComparisonSeriesItems
+	]));
 	const { getElementStyles } = useGlobalChartsContext();
 	const isSeriesRendered = useCallback((series) => isSeriesVisible(series.label), [isSeriesVisible]);
 	const hasWholeNumberValues = useMemo(() => hasOnlyWholeNumbers(dataSorted.filter(isSeriesRendered)), [dataSorted, isSeriesRendered]);
@@ -6671,9 +6740,9 @@ const BarChartInternal = ({ data, chartId: providedChartId, width, height, class
 			children: ({ contentHeight }) => {
 				const chartHeight = contentHeight > 0 ? contentHeight : height;
 				return /* @__PURE__ */ jsx("div", {
-					role: "grid",
+					role: "application",
 					ref: chartRef,
-					"aria-label": __("Bar chart", "jetpack-charts"),
+					"aria-label": ariaLabel ?? __("Bar chart", "jetpack-charts"),
 					tabIndex: 0,
 					onKeyDown: onChartKeyDown,
 					onFocus: onChartFocus,
@@ -6681,6 +6750,7 @@ const BarChartInternal = ({ data, chartId: providedChartId, width, height, class
 					children: chartHeight > 0 && /* @__PURE__ */ jsx("div", {
 						className: xy_plot_module_default["xy-plot"],
 						children: /* @__PURE__ */ jsxs(XYChart, {
+							accessibilityLabel: "",
 							theme,
 							width,
 							height: chartHeight,
@@ -6891,7 +6961,7 @@ const BarListChartInternal = ({ data, width, height, options = {}, margin = {
 	right: 20,
 	bottom: 0,
 	top: 0
-}, className, ...rest }) => {
+}, className, ariaLabel, ...rest }) => {
 	const { getElementStyles } = useGlobalChartsContext();
 	const tintedData = useMemo(() => {
 		if (data.length > 1) return data;
@@ -6966,6 +7036,7 @@ const BarListChartInternal = ({ data, width, height, options = {}, margin = {
 			xScale: chartOptions.xScale,
 			yScale: chartOptions.yScale
 		},
+		ariaLabel: ariaLabel ?? __("Bar list chart", "jetpack-charts"),
 		...rest
 	});
 };
@@ -7041,6 +7112,8 @@ const useFunnelSelection = (hideTooltip) => {
 };
 //#endregion
 //#region src/charts/conversion-funnel-chart/conversion-funnel-chart.tsx
+/** Chart height (px) below which the funnel tightens its gaps so the bars keep their room. */
+const SHORT_CHART_HEIGHT = 180;
 /**
 * Internal ConversionFunnelChart component with chart registration
 *
@@ -7052,6 +7125,7 @@ const useFunnelSelection = (hideTooltip) => {
 * @param props.loading          - Whether the chart is in loading state
 * @param props.animation        - Whether to show chart animation on initial render or not
 * @param props.className        - Additional CSS class name
+* @param props.ariaLabel        - Accessible name for the chart group
 * @param props.height           - Height of the chart container. Falls back to style.height if set, otherwise defaults to "100%".
 * @param props.style            - Custom styling
 * @param props.renderStepLabel  - Custom render function for step labels
@@ -7061,7 +7135,7 @@ const useFunnelSelection = (hideTooltip) => {
 * @param props.tooltipStyle     - Inline styles merged over the tooltip box defaults
 * @return JSX element representing the conversion funnel chart
 */
-const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loading = false, animation, className, chartId: providedChartId, height, style, renderStepLabel, renderStepRate, renderMainMetric, renderTooltip, tooltipStyle }) => {
+const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loading = false, animation, className, ariaLabel, chartId: providedChartId, height, style, renderStepLabel, renderStepRate, renderMainMetric, renderTooltip, tooltipStyle }) => {
 	const chartId = useChartId(providedChartId);
 	const { getElementStyles, isColorPaletteResolved } = useGlobalChartsContext();
 	const chartRef = useRef(null);
@@ -7070,10 +7144,13 @@ const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loadi
 	const { tooltipData, tooltipLeft, tooltipTop, tooltipOpen, showTooltip, hideTooltip } = useTooltip();
 	const { handleBarClick, handleBarKeyDown, clearSelection, getStepState } = useFunnelSelection(hideTooltip);
 	const standaloneScopeClass = useStandaloneScopeClass();
+	const [measureChartRef, , chartHeight] = useElementSize();
+	const gap = chartHeight > 0 && chartHeight < SHORT_CHART_HEIGHT ? "sm" : "xl";
 	const setChartRef = useCallback((node) => {
 		chartRef.current = node;
 		setScopeNode(node);
-	}, []);
+		measureChartRef(node);
+	}, [measureChartRef]);
 	const clearSelectionAndRef = useCallback(() => {
 		clearSelection();
 		selectedBarRef.current = null;
@@ -7221,7 +7298,9 @@ const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loadi
 	const maxRate = Math.max(...steps.map((step) => step.rate));
 	return /* @__PURE__ */ jsxs(Stack, {
 		direction: "column",
-		gap: "xl",
+		gap,
+		role: "group",
+		"aria-label": ariaLabel ?? __("Conversion funnel chart", "jetpack-charts"),
 		ref: setChartRef,
 		className: clsx("conversion-funnel-chart", conversion_funnel_chart_module_default["conversion-funnel-chart"], loading && conversion_funnel_chart_module_default["conversion-funnel-chart--loading"], className),
 		style: {
@@ -7252,7 +7331,7 @@ const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loadi
 					return /* @__PURE__ */ jsxs(Stack, {
 						direction: "column",
 						className: clsx(conversion_funnel_chart_module_default["funnel-step"], isColorPaletteResolved && conversion_funnel_chart_module_default["funnel-step--animated"], isBlurred && conversion_funnel_chart_module_default["funnel-step--blurred"]),
-						gap: "xl",
+						gap,
 						children: [/* @__PURE__ */ jsxs(Stack, {
 							direction: "column",
 							gap: "xs",
@@ -7446,6 +7525,7 @@ function normalizeGeoChartError(eventArgs) {
 *
 * @param props                   - The props for the GeoChart component
 * @param props.data              - Data in Google Charts format (array of arrays with headers)
+* @param props.ariaLabel         - Accessible name of the chart
 * @param props.width             - Width of the chart in pixels
 * @param props.height            - Height of the chart in pixels
 * @param props.region            - Region to display ('world', 'US', or ISO 3166-1 alpha-2 code)
@@ -7457,7 +7537,7 @@ function normalizeGeoChartError(eventArgs) {
 * @param props.renderPlaceholder - Optional render function for the loading placeholder
 * @return A React component displaying an interactive map with data visualization
 */
-const GeoChartInternal = ({ className, data, width, height, region = "world", resolution = "countries", displayMode = "regions", domain, onError, renderPlaceholder }) => {
+const GeoChartInternal = ({ className, data, ariaLabel, width, height, region = "world", resolution = "countries", displayMode = "regions", domain, onError, renderPlaceholder }) => {
 	const { getElementStyles } = useGlobalChartsContext();
 	const scopeElement = useChartScopeElement();
 	const containerRef = useRef(null);
@@ -7545,8 +7625,14 @@ const GeoChartInternal = ({ className, data, width, height, region = "world", re
 		sanitizedData.hasHtmlTooltips
 	]);
 	const chartEvents = useMemo(() => {
-		if (!onError) return;
-		return [{
+		const readyEvent = {
+			eventName: "ready",
+			callback: () => {
+				containerRef.current?.querySelectorAll("svg").forEach((svg) => svg.setAttribute("aria-hidden", "true"));
+			}
+		};
+		if (!onError) return [readyEvent];
+		return [readyEvent, {
 			eventName: "error",
 			callback: ({ eventArgs }) => {
 				onError(normalizeGeoChartError(eventArgs));
@@ -7555,6 +7641,8 @@ const GeoChartInternal = ({ className, data, width, height, region = "world", re
 	}, [onError]);
 	return /* @__PURE__ */ jsx(Center, {
 		ref: containerRef,
+		role: "group",
+		"aria-label": ariaLabel ?? __("Geo chart", "jetpack-charts"),
 		className: clsx("geo-chart", geo_chart_module_default.container, className),
 		style: {
 			width,
@@ -7686,6 +7774,7 @@ var heatmap_chart_module_default = {
 	"heatmap-chart__legend-label": "a8ccharts-O3YMOW-heatmap-chart__legend-label",
 	"heatmap-chart__legend-scale--bar": "a8ccharts-O3YMOW-heatmap-chart__legend-scale--bar",
 	"heatmap-chart__legend-swatch": "a8ccharts-O3YMOW-heatmap-chart__legend-swatch",
+	"heatmap-chart__legend-swatch--empty": "a8ccharts-O3YMOW-heatmap-chart__legend-swatch--empty",
 	"heatmap-chart__row": "a8ccharts-O3YMOW-heatmap-chart__row",
 	"heatmap-chart__row-label": "a8ccharts-O3YMOW-heatmap-chart__row-label",
 	"heatmap-chart--height-capped": "a8ccharts-O3YMOW-heatmap-chart--height-capped"
@@ -7783,8 +7872,9 @@ const HeatmapLegend = ({ steps = 5, variant = "swatches", lessLabel, moreLabel }
 	const context = useContext(HeatmapContext);
 	const { legend } = useGlobalChartsTheme();
 	if (!context) return null;
-	const { fillVars } = context;
+	const { extent, fillVars } = context;
 	const labelStyle = legend.labelStyles;
+	const showsEmptyCell = isEmptyValue(0, extent);
 	return /* @__PURE__ */ jsxs(Stack, {
 		direction: "row",
 		gap: "xs",
@@ -7796,12 +7886,12 @@ const HeatmapLegend = ({ steps = 5, variant = "swatches", lessLabel, moreLabel }
 				style: labelStyle,
 				children: lessLabel ?? __("Less", "jetpack-charts")
 			}),
-			/* @__PURE__ */ jsx(Stack, {
+			/* @__PURE__ */ jsxs(Stack, {
 				direction: "row",
 				gap: variant === "bar" ? void 0 : "xs",
 				"aria-hidden": "true",
 				className: variant === "bar" ? heatmap_chart_module_default["heatmap-chart__legend-scale--bar"] : void 0,
-				children: Array.from({ length: steps }, (_, index) => {
+				children: [showsEmptyCell && /* @__PURE__ */ jsx("span", { className: clsx(heatmap_chart_module_default["heatmap-chart__legend-swatch"], heatmap_chart_module_default["heatmap-chart__legend-swatch--empty"]) }), Array.from({ length: steps }, (_, index) => {
 					const intensity = steps <= 1 ? 1 : index / (steps - 1);
 					return /* @__PURE__ */ jsx("span", {
 						className: heatmap_chart_module_default["heatmap-chart__legend-swatch"],
@@ -7810,7 +7900,7 @@ const HeatmapLegend = ({ steps = 5, variant = "swatches", lessLabel, moreLabel }
 							"--a8c-charts-heatmap-cell-intensity": intensity
 						}
 					}, index);
-				})
+				})]
 			}),
 			/* @__PURE__ */ jsx(Text$1, {
 				variant: "body-sm",
@@ -7836,9 +7926,11 @@ const resolveColumnGroups = (groups, columnCount, firstLine) => {
 	const ungrouped = () => ({
 		columns: Array.from({ length: columnCount }, (_, index) => ({
 			line: firstLine + index,
+			band: 0,
 			gapBefore: false
 		})),
-		groups: []
+		groups: [],
+		bands: 1
 	});
 	if (!groups || groups.length === 0 || columnCount === 0) return ungrouped();
 	const spans = groups.map((group) => group.span);
@@ -7854,11 +7946,13 @@ const resolveColumnGroups = (groups, columnCount, firstLine) => {
 		if (groupIndex > 0) line += 1;
 		laidOut.push({
 			...group,
-			line
+			line,
+			band: 0
 		});
 		for (let offset = 0; offset < group.span; offset++) {
 			columns.push({
 				line,
+				band: 0,
 				gapBefore: groupIndex > 0 && offset === 0,
 				group: groupIndex
 			});
@@ -7868,13 +7962,99 @@ const resolveColumnGroups = (groups, columnCount, firstLine) => {
 	while (columns.length < columnCount) {
 		columns.push({
 			line,
+			band: 0,
 			gapBefore: false
 		});
 		line += 1;
 	}
 	return {
 		columns,
-		groups: laidOut
+		groups: laidOut,
+		bands: 1
+	};
+};
+/**
+* Wraps the groups onto bands of equal group count, each band starting back at
+* the first data line so the groups line up in slots down the bands.
+*
+* @param layout - The unwrapped layout from `resolveColumnGroups`.
+* @param bands  - Bands to aim for; the groups split as evenly as whole bands allow.
+* @return The wrapped layout, or null when there is nothing to wrap: one band, one group, or a column outside every group.
+*/
+const wrapColumnGroups = (layout, bands) => {
+	const { columns, groups } = layout;
+	if (bands < 2 || groups.length < 2 || columns.some((column) => column.group === void 0)) return null;
+	const perBand = Math.ceil(groups.length / bands);
+	const slotSpans = Array(perBand).fill(0);
+	groups.forEach((group, index) => {
+		const slot = index % perBand;
+		slotSpans[slot] = Math.max(slotSpans[slot], group.span);
+	});
+	const slotLines = [];
+	let line = columns[0].line;
+	slotSpans.forEach((span, slot) => {
+		if (slot > 0) line += 1;
+		slotLines.push(line);
+		line += span;
+	});
+	const wrappedGroups = groups.map((group, index) => ({
+		...group,
+		line: slotLines[index % perBand],
+		band: Math.floor(index / perBand)
+	}));
+	return {
+		columns: columns.map((column) => {
+			const group = column.group;
+			const offset = column.line - groups[group].line;
+			return {
+				...column,
+				line: wrappedGroups[group].line + offset,
+				band: wrappedGroups[group].band,
+				gapBefore: offset === 0 && group % perBand > 0
+			};
+		}),
+		groups: wrappedGroups,
+		bands: Math.ceil(groups.length / perBand),
+		slotSpans
+	};
+};
+//#endregion
+//#region src/charts/heatmap-chart/private/fit-compact-cells.ts
+/**
+* Largest whole-pixel square cell, and the band count giving it, for a compact grid in a box.
+*
+* @param input - The box, the grid's layout, and its fixed gaps and label sizes.
+* @return The fit; one band at `minCellSize` when no band count reaches it.
+*/
+const fitCompactCells = (input) => {
+	const { width, height, layout, rows, cellGap, groupGap, minCellSize } = input;
+	const columns = layout.columns.length;
+	if (columns === 0 || rows === 0) return {
+		bands: 1,
+		cellSize: minCellSize
+	};
+	const maxBands = Math.max(1, layout.groups.length);
+	const labelHeights = (input.columnLabelHeight ?? 0) + (input.groupLabelHeight ?? 0);
+	const bandTracks = (input.columnLabelHeight === null ? 0 : 1) + rows + (input.groupLabelHeight === null ? 0 : 1);
+	let best = null;
+	for (let target = 1; target <= maxBands; target++) {
+		const wrapped = target > 1 ? wrapColumnGroups(layout, target) : null;
+		const { bands } = wrapped ?? layout;
+		const cellColumns = wrapped ? wrapped.slotSpans.reduce((sum, span) => sum + span, 0) : columns;
+		const gapTracks = wrapped ? wrapped.slotSpans.length - 1 : layout.columns.filter((column) => column.gapBefore).length;
+		const columnTracks = 1 + cellColumns + gapTracks;
+		const byWidth = (width - input.rowLabelWidth - gapTracks * groupGap - (columnTracks - 1) * cellGap) / cellColumns;
+		const rowTracks = bands * bandTracks + (bands - 1);
+		const byHeight = (height - (bands * labelHeights + (bands - 1) * groupGap + (rowTracks - 1) * cellGap)) / (bands * rows);
+		const cellSize = Math.floor(Math.min(byWidth, byHeight));
+		if (cellSize >= minCellSize && (!best || cellSize > best.cellSize)) best = {
+			bands,
+			cellSize
+		};
+	}
+	return best ?? {
+		bands: 1,
+		cellSize: minCellSize
 	};
 };
 //#endregion
@@ -8017,18 +8197,32 @@ const CELL_VALUE_MODIFIER = {
 	white: heatmap_chart_module_default["heatmap-chart__cell-value--white"]
 };
 const NO_ROW_LABELS = [];
-const TOOLTIP_BOX_STYLE = { zIndex: 3 };
+const TOOLTIP_BOX_STYLE$1 = { zIndex: 3 };
+const largest = (root, selector, size) => Math.max(0, ...Array.from(root.querySelectorAll(selector), (el) => el[size]));
+const gridBox = (chart, grid) => {
+	let height = chart.clientHeight;
+	const rowGap = parseFloat(getComputedStyle(chart).rowGap) || 0;
+	Array.from(chart.children).forEach((child) => {
+		const { display, position } = getComputedStyle(child);
+		if (child === grid || display === "none" || position === "absolute" || position === "fixed") return;
+		height -= child.offsetHeight + rowGap;
+	});
+	return {
+		width: chart.clientWidth,
+		height
+	};
+};
 const cellName = (info) => info.cellLabel || [
 	info.groupLabel,
 	info.columnLabel,
 	info.rowLabel
 ].filter(Boolean).join(" ");
-const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, height = 0, className, compact = false, showValues, maxCellWidth, maxCellHeight, minCellWidth, minCellHeight, rowLabels = NO_ROW_LABELS, columnGroups, keyboardNavigation = "grid", ariaLabel, primaryColor, gap = "md", withTooltips = false, renderTooltip, tooltipStyle, children }) => {
+const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, height = 0, className, compact = false, fitCells = false, showValues, maxCellWidth, maxCellHeight, minCellWidth, minCellHeight, rowLabels = NO_ROW_LABELS, columnGroups, keyboardNavigation = "grid", ariaLabel, primaryColor, gap = "md", withTooltips = false, renderTooltip, tooltipStyle, children }) => {
 	const chartId = useChartId(providedChartId);
 	const tooltipBoxStyle = tooltipStyle ? {
-		...TOOLTIP_BOX_STYLE,
+		...TOOLTIP_BOX_STYLE$1,
 		...tooltipStyle
-	} : TOOLTIP_BOX_STYLE;
+	} : TOOLTIP_BOX_STYLE$1;
 	const { getElementStyles, theme } = useGlobalChartsContext();
 	const scopeElement = useChartScopeElement();
 	const { heatmapChart: heatmapChartSettings } = theme;
@@ -8037,8 +8231,9 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 	const { tooltipOpen, tooltipLeft, tooltipTop, tooltipData, showTooltip, hideTooltip } = useTooltip();
 	const standaloneScopeClass = useStandaloneScopeClass();
 	const containerRef = useRef(null);
+	const chartRef = useRef(null);
 	const [labelRoles, setLabelRoles] = useState(null);
-	const getTooltipOrigin = useCallback(() => containerRef.current?.closest(`[data-chart-id="heatmap-chart-${chartId}"]`)?.getBoundingClientRect() ?? null, [chartId]);
+	const getTooltipOrigin = useCallback(() => chartRef.current?.getBoundingClientRect() ?? null, []);
 	const { color: primaryColorHex } = getElementStyles({
 		index: 0,
 		overrideColor: primaryColor
@@ -8080,6 +8275,49 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 	const groupLayout = useMemo(() => resolveColumnGroups(columnGroups, columns, 2), [columnGroups, columns]);
 	const { compactCellGap, compactCellSize, groupGap } = heatmapChartSettings;
 	const drawValues = showValues ?? !compact;
+	const hasColumnLabels = data.some((column) => Boolean(column.label));
+	const hasGroups = groupLayout.groups.length > 0;
+	const [fit, setFit] = useState(null);
+	const hasSummary = data.some((column) => column.summary);
+	const fitting = compact && fitCells && !hasSummary;
+	if (fitCells && !fitting) warnOnce("heatmap:fitCells", "fitCells applies only in compact mode without summary columns, so the cells keep their size.");
+	useIsomorphicLayoutEffect(() => {
+		const chart = chartRef.current;
+		const grid = containerRef.current;
+		if (!fitting || !chart || !grid) {
+			setFit(null);
+			return;
+		}
+		const measure = () => {
+			const next = fitCompactCells({
+				...gridBox(chart, grid),
+				layout: groupLayout,
+				rows,
+				cellGap: compactCellGap,
+				groupGap,
+				rowLabelWidth: largest(grid, `.${heatmap_chart_module_default["heatmap-chart__row-label"]}`, "offsetWidth"),
+				columnLabelHeight: hasColumnLabels ? largest(grid, `.${heatmap_chart_module_default["heatmap-chart__col-label"]}`, "offsetHeight") : null,
+				groupLabelHeight: hasGroups ? largest(grid, `.${heatmap_chart_module_default["heatmap-chart__group-label"]}`, "offsetHeight") : null,
+				minCellSize: compactCellSize
+			});
+			setFit((previous) => (0, import_fast_deep_equal.default)(previous, next) ? previous : next);
+		};
+		measure();
+		if (typeof ResizeObserver === "undefined") return;
+		const observer = new ResizeObserver(() => flushSync(measure));
+		observer.observe(chart);
+		return () => observer.disconnect();
+	}, [
+		fitting,
+		groupLayout,
+		rows,
+		hasColumnLabels,
+		hasGroups,
+		compactCellGap,
+		compactCellSize,
+		groupGap
+	]);
+	const wrapped = useMemo(() => fit ? wrapColumnGroups(groupLayout, fit.bands) : null, [fit, groupLayout]);
 	const buildTooltipData = useCallback((columnIndex, rowIndex) => {
 		const cell = data[columnIndex]?.data[rowIndex];
 		const group = groupLayout.columns[columnIndex]?.group;
@@ -8219,21 +8457,25 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 	});
 	const columnTrack = compact ? "var(--a8c-charts-dimension-heatmap-cell-size)" : `minmax(${minCellWidth ?? 0}px, ${maxCellWidth ? `${maxCellWidth}px` : "1fr"})`;
 	const rowTrack = compact ? "var(--a8c-charts-dimension-heatmap-cell-size)" : `minmax(${minCellHeight ?? 0}px, ${maxCellHeight ? `${maxCellHeight}px` : "1fr"})`;
-	const hasColumnLabels = data.some((column) => Boolean(column.label));
-	const hasGroups = groupLayout.groups.length > 0;
-	const columnLine = (columnIndex) => groupLayout.columns[columnIndex].line;
-	const firstDataRow = hasColumnLabels ? 2 : 1;
+	const placed = wrapped ?? groupLayout;
+	const columnLine = (columnIndex) => placed.columns[columnIndex].line;
+	const bandOf = (columnIndex) => placed.columns[columnIndex].band;
+	const { bands } = placed;
+	const bandRowCount = (hasColumnLabels ? 1 : 0) + rows + (hasGroups ? 1 : 0) + 1;
+	const labelRowOf = (band) => 1 + band * bandRowCount;
+	const dataRowOf = (band, rowIndex) => labelRowOf(band) + (hasColumnLabels ? 1 : 0) + rowIndex;
 	const dataTrack = (column) => column.summary ? "minmax(auto, max-content)" : columnTrack;
 	const gapTrack = compact ? `minmax(${groupGap}px, 1fr)` : `${groupGap}px`;
-	const columnTracks = data.map((column, columnIndex) => groupLayout.columns[columnIndex].gapBefore ? `${gapTrack} ${dataTrack(column)}` : dataTrack(column)).join(" ");
+	const columnTracks = wrapped ? wrapped.slotSpans.map((span, slot) => [...slot > 0 ? [gapTrack] : [], ...Array(span).fill(columnTrack)].join(" ")).join(" ") : data.map((column, columnIndex) => groupLayout.columns[columnIndex].gapBefore ? `${gapTrack} ${dataTrack(column)}` : dataTrack(column)).join(" ");
+	const bandTracks = `${hasColumnLabels ? "auto " : ""}repeat(${rows}, ${rowTrack})${hasGroups ? " auto" : ""}`;
 	const gridStyle = {
 		...fillVars,
 		gridTemplateColumns: `auto ${columnTracks}`,
-		gridTemplateRows: `${hasColumnLabels ? "auto " : ""}repeat(${rows}, ${rowTrack})${hasGroups ? " auto" : ""}`
+		gridTemplateRows: Array(bands).fill(bandTracks).join(` ${groupGap}px `)
 	};
 	if (compact) {
 		gridStyle["--a8c-charts-dimension-heatmap-cell-gap"] = `${compactCellGap}px`;
-		gridStyle["--a8c-charts-dimension-heatmap-cell-size"] = `${compactCellSize}px`;
+		gridStyle["--a8c-charts-dimension-heatmap-cell-size"] = `${fit?.cellSize ?? compactCellSize}px`;
 	}
 	const summaryGaps = (columnIndex) => {
 		if (!data[columnIndex]?.summary) return {};
@@ -8253,6 +8495,7 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 				legendChildren: [],
 				trailingContent: nonLegendChildren,
 				gap,
+				rootRef: chartRef,
 				className: clsx("heatmap-chart", heatmap_chart_module_default["heatmap-chart"], className, { [heatmap_chart_module_default["heatmap-chart--height-capped"]]: heightCapped }),
 				style: {
 					width: width || void 0,
@@ -8282,11 +8525,11 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 							className: heatmap_chart_module_default["heatmap-chart__row"],
 							children: [/* @__PURE__ */ jsx("span", { style: {
 								gridColumn: 1,
-								gridRow: 1
+								gridRow: labelRowOf(0)
 							} }), data.map((column, columnIndex) => /* @__PURE__ */ jsx("span", {
 								style: {
 									gridColumn: columnLine(columnIndex),
-									gridRow: 1
+									gridRow: labelRowOf(bandOf(columnIndex))
 								},
 								className: clsx(heatmap_chart_module_default["heatmap-chart__col-label"], {
 									[heatmap_chart_module_default["heatmap-chart__col-label--summary"]]: column.summary,
@@ -8297,24 +8540,23 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 						}),
 						Array.from({ length: rows }).map((_row, rowIndex) => {
 							const labelVisible = !compact || rowIndex % 2 === 0;
-							const gridRow = firstDataRow + rowIndex;
 							return /* @__PURE__ */ jsxs("div", {
 								role: "row",
 								"aria-rowindex": rowIndex + 1,
 								className: heatmap_chart_module_default["heatmap-chart__row"],
-								children: [/* @__PURE__ */ jsx("span", {
+								children: [Array.from({ length: bands }).map((_band, band) => /* @__PURE__ */ jsx("span", {
 									"aria-hidden": "true",
 									className: heatmap_chart_module_default["heatmap-chart__row-label"],
 									style: {
 										gridColumn: 1,
-										gridRow
+										gridRow: dataRowOf(band, rowIndex)
 									},
 									children: labelVisible ? rowLabels[rowIndex] ?? "" : ""
-								}), data.map((column, columnIndex) => {
+								}, `row-label-${band}`)), data.map((column, columnIndex) => {
 									const cell = column.data[rowIndex];
 									const placement = {
 										gridColumn: columnLine(columnIndex),
-										gridRow
+										gridRow: dataRowOf(bandOf(columnIndex), rowIndex)
 									};
 									if (cell?.hidden) return /* @__PURE__ */ jsx("div", {
 										"aria-hidden": "true",
@@ -8364,11 +8606,11 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 							role: "row",
 							"aria-hidden": "true",
 							className: heatmap_chart_module_default["heatmap-chart__row"],
-							children: groupLayout.groups.map((group, groupIndex) => /* @__PURE__ */ jsx("span", {
+							children: placed.groups.map((group, groupIndex) => /* @__PURE__ */ jsx("span", {
 								className: heatmap_chart_module_default["heatmap-chart__group-label"],
 								style: {
 									gridColumn: `${group.line} / span ${group.span}`,
-									gridRow: firstDataRow + rows
+									gridRow: dataRowOf(group.band, rows)
 								},
 								children: group.label
 							}, `group-${groupIndex}`))
@@ -11105,8 +11347,8 @@ const SUBPIXEL_TOLERANCE = .5;
 * depends on `--a8c-charts-dimension-leaderboard-row-gap`, label wrapping, and
 * whatever a caller renders as a label, so any restated number would drift.
 *
-* Every row is a direct grid child marked with `data-row-index`; interactive rows
-* use a button wrapper and non-interactive rows use a div wrapper.
+* Every row is a `listitem` div, a direct grid child marked with `data-row-index`;
+* interactive rows hold a button inside it.
 *
 * @param enabled  - Whether to measure at all. When false every row fits.
 * @param rowCount - Total number of rows rendered.
@@ -11238,6 +11480,7 @@ var leaderboard_chart_module_default = {
 	"interactiveRow": "a8ccharts-GovfoW-interactiveRow",
 	"is-overlay": "a8ccharts-GovfoW-is-overlay",
 	"label": "a8ccharts-GovfoW-label",
+	"layeredRow": "a8ccharts-GovfoW-layeredRow",
 	"leaderboardChart": "a8ccharts-GovfoW-leaderboardChart",
 	"leaderboardChart__content": "a8ccharts-GovfoW-leaderboardChart__content",
 	"leaderboardChart__content--fit": "a8ccharts-GovfoW-leaderboardChart__content--fit",
@@ -11246,6 +11489,8 @@ var leaderboard_chart_module_default = {
 	"overlap": "a8ccharts-GovfoW-overlap",
 	"overlayLabel": "a8ccharts-GovfoW-overlayLabel",
 	"row": "a8ccharts-GovfoW-row",
+	"rowButton": "a8ccharts-GovfoW-rowButton",
+	"rowItem": "a8ccharts-GovfoW-rowItem",
 	"stretch": "a8ccharts-GovfoW-stretch",
 	"valueContainer": "a8ccharts-GovfoW-valueContainer"
 };
@@ -11296,6 +11541,16 @@ const defaultDeltaFormatter = (value) => {
 const getBarWidth = (share) => `calc(${share}% - var(--a8c-charts-dimension-leaderboard-bar-hover-inset, 0px) * ${share} / 100)`;
 const hasPreviousValue = (entry) => entry.previousValue != null && entry.previousShare != null;
 const hasDeltaValue = (entry) => hasPreviousValue(entry) && entry.delta != null;
+/**
+* A layered row's cell that takes pointer events of its own (a value tooltip)
+* sits above the row button; pass its clicks on so they still drill down.
+*
+* @param event - The click on the row.
+*/
+function forwardCellClickToRowButton(event) {
+	if (event.target.closest("a, button")) return;
+	event.currentTarget.querySelector(":scope > button")?.click();
+}
 const BarLabel = ({ label }) => /* @__PURE__ */ jsx(Fragment$1, { children: typeof label === "string" ? /* @__PURE__ */ jsx(Text$1, {
 	className: leaderboard_chart_module_default.label,
 	children: label
@@ -11348,9 +11603,10 @@ const BarWithLabel = ({ entry, withComparison, withOverlayLabel, primaryColor, s
 * @param props.children         - Child components for composition API
 * @param props.className        - Additional CSS class name
 * @param props.style            - Custom styling for the chart container
+* @param props.ariaLabel        - Accessible name for the list, defaulting to "Leaderboard chart"
 * @return JSX element representing the leaderboard chart
 */
-const LeaderboardChartInternal = ({ data, chartId: providedChartId, width: propWidth, height: propHeight, withComparison = false, withOverlayLabel = false, primaryColor, secondaryColor, valueFormatter = defaultValueFormatter, deltaFormatter = defaultDeltaFormatter, animation, loading = false, fitRows = false, showLegend = false, legend = {}, legendLabels, gap = "md", className, style, children }) => {
+const LeaderboardChartInternal = ({ data, chartId: providedChartId, width: propWidth, height: propHeight, withComparison = false, withOverlayLabel = false, primaryColor, secondaryColor, valueFormatter = defaultValueFormatter, deltaFormatter = defaultDeltaFormatter, animation, loading = false, fitRows = false, showLegend = false, legend = {}, legendLabels, gap = "md", ariaLabel, className, style, children }) => {
 	const legendInteractive = legend.interactive ?? false;
 	const legendPosition = legend.position ?? "bottom";
 	const chartId = useChartId(providedChartId);
@@ -11481,6 +11737,8 @@ const LeaderboardChartInternal = ({ data, chartId: providedChartId, width: propW
 					className: leaderboard_chart_module_default.emptyState,
 					children: getAllHiddenMessage(legendInteractive, "series")
 				}) : /* @__PURE__ */ jsx(component_default, {
+					role: "list",
+					"aria-label": ariaLabel ?? __("Leaderboard chart", "jetpack-charts"),
 					templateColumns: "minmax(0, 1fr) auto",
 					rowGap: ROW_GAP,
 					columnGap: COLUMN_GAP,
@@ -11528,20 +11786,49 @@ const LeaderboardChartInternal = ({ data, chartId: providedChartId, width: propW
 								})
 							]
 						})] });
-						if (entry.onClick) return /* @__PURE__ */ jsxs("button", {
-							type: "button",
+						if (entry.onClick && entry.hasInteractiveLabel) return /* @__PURE__ */ jsx("div", {
+							role: "listitem",
 							"data-row-index": rowIndex,
 							style: rowStyle,
-							className: clsx(leaderboard_chart_module_default.row, leaderboard_chart_module_default.interactiveRow),
-							onClick: entry.onClick,
-							"aria-label": entry.ariaLabel,
-							children: [rowCells, /* @__PURE__ */ jsx(Icon, {
-								className: leaderboard_chart_module_default.chevron,
-								icon: chevronRight,
-								size: 24
-							})]
+							className: leaderboard_chart_module_default.rowItem,
+							children: /* @__PURE__ */ jsxs("div", {
+								className: clsx(leaderboard_chart_module_default.row, leaderboard_chart_module_default.interactiveRow, leaderboard_chart_module_default.layeredRow),
+								onClick: forwardCellClickToRowButton,
+								children: [
+									rowCells,
+									/* @__PURE__ */ jsx("button", {
+										type: "button",
+										className: leaderboard_chart_module_default.rowButton,
+										onClick: entry.onClick,
+										"aria-label": entry.ariaLabel
+									}),
+									/* @__PURE__ */ jsx(Icon, {
+										className: leaderboard_chart_module_default.chevron,
+										icon: chevronRight,
+										size: 24
+									})
+								]
+							})
+						}, entry.id);
+						if (entry.onClick) return /* @__PURE__ */ jsx("div", {
+							role: "listitem",
+							"data-row-index": rowIndex,
+							style: rowStyle,
+							className: leaderboard_chart_module_default.rowItem,
+							children: /* @__PURE__ */ jsxs("button", {
+								type: "button",
+								className: clsx(leaderboard_chart_module_default.row, leaderboard_chart_module_default.interactiveRow),
+								onClick: entry.onClick,
+								"aria-label": entry.ariaLabel,
+								children: [rowCells, /* @__PURE__ */ jsx(Icon, {
+									className: leaderboard_chart_module_default.chevron,
+									icon: chevronRight,
+									size: 24
+								})]
+							})
 						}, entry.id);
 						return /* @__PURE__ */ jsx("div", {
+							role: "listitem",
 							"data-row-index": rowIndex,
 							style: rowStyle,
 							className: leaderboard_chart_module_default.row,
@@ -11561,6 +11848,212 @@ LeaderboardChartWithProvider.displayName = "LeaderboardChart";
 const LeaderboardChart = attachSubComponents(LeaderboardChartWithProvider, { Legend });
 const LeaderboardChartResponsive = attachSubComponents(withResponsive(LeaderboardChartWithProvider), { Legend });
 //#endregion
+//#region src/charts/private/pie-keyboard-navigation/order-arcs-for-navigation.ts
+/**
+* Orders arcs the way they appear: clockwise from 12 o'clock, which for a semi-circle is left to right.
+*
+* @param arcs - Arcs from visx's `pie` factory, in data order.
+* @return A copy of `arcs` sorted by angular midpoint.
+*/
+const orderArcsForNavigation = (arcs) => [...arcs].sort((a, b) => a.startAngle + a.endAngle - (b.startAngle + b.endAngle));
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/pie-selection-announcement.tsx
+const PieSelectionAnnouncement = ({ data }) => /* @__PURE__ */ jsx(VisuallyHidden, {
+	role: "status",
+	"aria-atomic": "true",
+	children: data && /* @__PURE__ */ jsx(LabelValueContent, { data })
+});
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/pie-tooltip.tsx
+const TOOLTIP_BOX_STYLE = { zIndex: 3 };
+const PieTooltip = ({ top, left, selectedIndex, tooltipRef, children }) => {
+	const standaloneScopeClass = useStandaloneScopeClass();
+	return /* @__PURE__ */ jsx(BoundedTooltip, {
+		top,
+		left,
+		style: TOOLTIP_BOX_STYLE,
+		children: selectedIndex === void 0 ? /* @__PURE__ */ jsx("div", {
+			className: standaloneScopeClass,
+			role: "tooltip",
+			children
+		}) : /* @__PURE__ */ jsx("div", {
+			ref: tooltipRef,
+			tabIndex: -1,
+			role: "tooltip",
+			"aria-atomic": "true",
+			className: standaloneScopeClass,
+			children
+		}, `chart-tooltip-${selectedIndex}`)
+	});
+};
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/pie-selection-output.tsx
+/**
+* Reports the selected segment: a focused tooltip for a keyboard selection, a pointer tooltip on hover, or a screen reader announcement without tooltips.
+*
+* @param {PieSelectionOutputProps} props - Component props
+* @return {JSX.Element} The announcement region and the tooltip, if any
+*/
+const PieSelectionOutput = ({ withTooltips, selectedIndex, selectedData, keyboardTooltipAnchor, pointerTooltip, chartRef, svgRef, tooltipRef, renderTooltip }) => {
+	const [svgOffset, setSvgOffset] = useState({
+		top: 0,
+		left: 0
+	});
+	const showKeyboardTooltip = withTooltips && selectedData && keyboardTooltipAnchor;
+	useLayoutEffect(() => {
+		const chartBounds = chartRef.current?.getBoundingClientRect();
+		const svgBounds = svgRef.current?.getBoundingClientRect();
+		if (!showKeyboardTooltip || !chartBounds || !svgBounds) return;
+		const top = svgBounds.top - chartBounds.top;
+		const left = svgBounds.left - chartBounds.left;
+		setSvgOffset((current) => current.top === top && current.left === left ? current : {
+			top,
+			left
+		});
+	});
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+		/* @__PURE__ */ jsx(PieSelectionAnnouncement, { data: withTooltips ? void 0 : selectedData }),
+		showKeyboardTooltip && /* @__PURE__ */ jsx(PieTooltip, {
+			top: svgOffset.top + keyboardTooltipAnchor.top,
+			left: svgOffset.left + keyboardTooltipAnchor.left,
+			selectedIndex,
+			tooltipRef,
+			children: renderTooltip({ tooltipData: selectedData })
+		}),
+		withTooltips && !selectedData && pointerTooltip?.data && /* @__PURE__ */ jsx(PieTooltip, {
+			top: pointerTooltip.top,
+			left: pointerTooltip.left,
+			children: renderTooltip({ tooltipData: pointerTooltip.data })
+		})
+	] });
+};
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/pie-keyboard-navigation.module.scss
+var pie_keyboard_navigation_module_default = {
+	"selected-ring__contrast": "a8ccharts-V2HDKq-selected-ring__contrast",
+	"selected-ring__focus": "a8ccharts-V2HDKq-selected-ring__focus"
+};
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/selected-segment-ring.tsx
+/**
+* Encodes `value` for an SVG id, losslessly so distinct chart ids never share a clip path.
+*
+* @param value - Any string.
+* @return `value` with each character outside `[A-Za-z0-9-]` written as `_<hex code point>_`.
+*/
+const toSvgId = (value) => Array.from(value, (character) => /[A-Za-z0-9-]/.test(character) ? character : `_${character.codePointAt(0)?.toString(16)}_`).join("");
+/**
+* Marks the selected segment with a two-tone ring drawn inside its edge, so the SVG edge cannot cut it off.
+*
+* @param {SelectedSegmentRingProps} props - Component props
+* @return {JSX.Element} The ring
+*/
+const SelectedSegmentRing = ({ chartId, d }) => {
+	const clipId = `pie-selected-ring-clip-${toSvgId(chartId)}`;
+	const clipPath = `url(#${clipId})`;
+	return /* @__PURE__ */ jsxs("g", {
+		pointerEvents: "none",
+		"aria-hidden": "true",
+		children: [
+			/* @__PURE__ */ jsx("clipPath", {
+				id: clipId,
+				children: /* @__PURE__ */ jsx("path", { d })
+			}),
+			/* @__PURE__ */ jsx("path", {
+				d,
+				clipPath,
+				className: pie_keyboard_navigation_module_default["selected-ring__contrast"]
+			}),
+			/* @__PURE__ */ jsx("path", {
+				d,
+				clipPath,
+				className: pie_keyboard_navigation_module_default["selected-ring__focus"]
+			})
+		]
+	});
+};
+//#endregion
+//#region src/charts/private/pie-keyboard-navigation/use-pie-keyboard-navigation.ts
+const usePieKeyboardNavigation = ({ navigationArcs, withTooltips, tooltipOffsetX, tooltipOffsetY }) => {
+	const chartRef = useRef(null);
+	const svgRef = useRef(null);
+	const [selectedIndex, setSelectedIndex] = useState(void 0);
+	const [isNavigating, setIsNavigating] = useState(false);
+	const { tooltipOpen, tooltipLeft, tooltipTop, tooltipData, hideTooltip, showTooltip } = useTooltip();
+	const { tooltipRef: focusTooltip, onChartFocus, onChartBlur, onChartKeyDown, onChartPointerMove } = useKeyboardNavigation({
+		selectedIndex,
+		setSelectedIndex,
+		isNavigating,
+		setIsNavigating,
+		chartRef,
+		totalPoints: navigationArcs.length,
+		visibleSeriesKey: JSON.stringify(navigationArcs.map((arcDatum) => arcDatum.data.label))
+	});
+	const selectedArc = selectedIndex === void 0 ? void 0 : navigationArcs[selectedIndex];
+	const keyboardTooltip = useRef(null);
+	const tooltipLostFocus = useRef(false);
+	const tooltipRef = useCallback((element) => {
+		if (element) {
+			keyboardTooltip.current = element;
+			focusTooltip(element);
+		} else if (keyboardTooltip.current?.ownerDocument.activeElement === keyboardTooltip.current) tooltipLostFocus.current = true;
+	}, [focusTooltip]);
+	useLayoutEffect(() => {
+		if (!tooltipLostFocus.current) return;
+		tooltipLostFocus.current = false;
+		const { activeElement, body } = chartRef.current?.ownerDocument ?? document;
+		if (activeElement === null || activeElement === body) chartRef.current?.focus();
+	});
+	const getSegmentHandlers = (data, navigationIndex) => ({
+		onMouseMove: (event) => {
+			onChartPointerMove(navigationIndex);
+			if (!withTooltips) return;
+			const bounds = chartRef.current?.getBoundingClientRect();
+			if (!bounds) return;
+			showTooltip({
+				tooltipData: data,
+				tooltipLeft: event.clientX - bounds.left + tooltipOffsetX,
+				tooltipTop: event.clientY - bounds.top + tooltipOffsetY
+			});
+		},
+		onMouseLeave: withTooltips ? hideTooltip : void 0
+	});
+	return {
+		chartRef,
+		svgRef,
+		selectedArc,
+		getSegmentHandlers,
+		getKeyboardTooltipAnchor: useCallback((originX, originY, [x, y]) => withTooltips ? {
+			left: originX + x + tooltipOffsetX,
+			top: originY + y + tooltipOffsetY
+		} : void 0, [
+			withTooltips,
+			tooltipOffsetX,
+			tooltipOffsetY
+		]),
+		selectionOutputProps: {
+			withTooltips,
+			selectedIndex,
+			selectedData: selectedArc?.data,
+			chartRef,
+			svgRef,
+			tooltipRef,
+			pointerTooltip: tooltipOpen ? {
+				data: tooltipData,
+				left: tooltipLeft || 0,
+				top: tooltipTop || 0
+			} : void 0
+		},
+		chartProps: {
+			role: "application",
+			tabIndex: 0,
+			onKeyDown: onChartKeyDown,
+			onFocus: onChartFocus,
+			onBlur: onChartBlur
+		}
+	};
+};
+//#endregion
 //#region src/charts/private/radial-wipe-animation/radial-wipe-animation.tsx
 /**
 * Renders a SVG mask that creates a radial wipe animation effect.
@@ -11601,6 +12094,7 @@ function RadialWipeAnimation({ id, radius, innerRadius = 0, durationMs = 1e3, wi
 //#endregion
 //#region src/charts/pie-chart/pie-chart.module.scss
 var pie_chart_module_default = {
+	"pie-chart": "a8ccharts-gnszbG-pie-chart",
 	"pie-chart__label-plate": "a8ccharts-gnszbG-pie-chart__label-plate",
 	"pie-chart__label-text": "a8ccharts-gnszbG-pie-chart__label-text",
 	"pie-chart__label-text--black": "a8ccharts-gnszbG-pie-chart__label-text--black",
@@ -11656,20 +12150,13 @@ const LABEL_TEXT_MODIFIER = {
 * @param {PieChartProps} props - Component props
 * @return {JSX.Element} The rendered chart component
 */
-const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false, className, showLegend = false, legend = {}, width: propWidth, height: propHeight, size, animation, thickness = 1, padding = 0, gapScale = 0, cornerScale = 0, showLabels = true, legendValueDisplay = "percentage", children = null, tooltipOffsetX = 0, tooltipOffsetY = -15, renderTooltip = renderDefaultPieTooltip, gap = "md" }) => {
+const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false, className, showLegend = false, legend = {}, width: propWidth, height: propHeight, size, animation, thickness = 1, padding = 0, gapScale = 0, cornerScale = 0, showLabels = true, legendValueDisplay = "percentage", children = null, tooltipOffsetX = 0, tooltipOffsetY = -15, renderTooltip = renderDefaultPieTooltip, ariaLabel, gap = "md" }) => {
 	const legendInteractive = legend.interactive ?? false;
 	const legendPosition = legend.position ?? "bottom";
 	const providerTheme = useGlobalChartsTheme();
 	const chartId = useChartId(providedChartId);
-	const { tooltipOpen, tooltipLeft, tooltipTop, tooltipData, hideTooltip, showTooltip } = useTooltip();
-	const standaloneScopeClass = useStandaloneScopeClass();
-	const containerRef = useRef(null);
 	const rootRef = useRef(null);
 	const [labelRoles, setLabelRoles] = useState(null);
-	const onMouseLeave = useCallback(() => {
-		if (!withTooltips) return;
-		hideTooltip();
-	}, [withTooltips, hideTooltip]);
 	const { getElementStyles, isSeriesVisible, isColorPaletteResolved } = useGlobalChartsContext();
 	const { isValid, message } = validateData$1(data);
 	useLayoutEffect(() => {
@@ -11713,13 +12200,7 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 		metadata: chartMetadata
 	});
 	const prefersReducedMotion = usePrefersReducedMotion();
-	if (!isValid) return /* @__PURE__ */ jsx("div", {
-		className: clsx("pie-chart", pie_chart_module_default["pie-chart"], className),
-		children: /* @__PURE__ */ jsx("div", {
-			className: pie_chart_module_default["error-message"],
-			children: message
-		})
-	});
+	const wipeMask = animation && !prefersReducedMotion ? `url(#radial-wipe-${chartId})` : null;
 	const padAngle = gapScale * (2 * Math.PI / data.length);
 	const dataWithIndex = visibleData.map((d) => {
 		const originalIndex = data.findIndex((item) => item.label === d.label);
@@ -11737,6 +12218,24 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 			}).color;
 		}
 	};
+	const arcs = pie({
+		value: accessors.value,
+		padAngle
+	})(dataWithIndex);
+	const navigationArcs = orderArcsForNavigation(arcs);
+	const { chartRef, svgRef, selectedArc, getSegmentHandlers, getKeyboardTooltipAnchor, selectionOutputProps, chartProps } = usePieKeyboardNavigation({
+		navigationArcs,
+		withTooltips,
+		tooltipOffsetX,
+		tooltipOffsetY
+	});
+	if (!isValid) return /* @__PURE__ */ jsx("div", {
+		className: clsx("pie-chart", pie_chart_module_default["pie-chart"], className),
+		children: /* @__PURE__ */ jsx("div", {
+			className: pie_chart_module_default["error-message"],
+			children: message
+		})
+	});
 	const legendElement = showLegend && /* @__PURE__ */ jsx(Legend, {
 		orientation: legend.orientation ?? "horizontal",
 		position: legendPosition,
@@ -11775,102 +12274,96 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 				const innerRadius = thickness === 0 ? 0 : outerRadius * (1 - thickness);
 				const maxCornerRadius = (outerRadius - innerRadius) / 2;
 				const cornerRadius = cornerScale ? Math.min(cornerScale * outerRadius, maxCornerRadius) : 0;
+				const path = arc({
+					innerRadius,
+					outerRadius,
+					cornerRadius
+				});
+				const svgLabelSmall = providerTheme.svgLabelSmall;
+				const fontSize = resolveFontSize(svgLabelSmall?.fontSize) ?? 12;
+				const renderLabel = (arcDatum, index) => {
+					if (arcDatum.endAngle - arcDatum.startAngle < .25) return null;
+					const [centroidX, centroidY] = path.centroid(arcDatum);
+					const backgroundWidth = getStringWidth$1(arcDatum.data.label, {
+						fontSize,
+						fontFamily: svgLabelSmall?.fontFamily,
+						fontWeight: svgLabelSmall?.fontWeight
+					}) + 12;
+					const backgroundHeight = fontSize + 12;
+					return /* @__PURE__ */ jsxs("g", { children: [/* @__PURE__ */ jsx("rect", {
+						className: pie_chart_module_default["pie-chart__label-plate"],
+						x: centroidX - backgroundWidth / 2,
+						y: centroidY - backgroundHeight / 2,
+						width: backgroundWidth,
+						height: backgroundHeight,
+						rx: 4,
+						ry: 4,
+						pointerEvents: "none"
+					}), /* @__PURE__ */ jsx("text", {
+						className: clsx(pie_chart_module_default["pie-chart__label-text"], LABEL_TEXT_MODIFIER[pickLabelTextColor(accessors.fill(arcDatum.data), labelRoles, "label-inverse")]),
+						x: centroidX,
+						y: centroidY,
+						dy: ".33em",
+						fontSize,
+						textAnchor: "middle",
+						pointerEvents: "none",
+						children: arcDatum.data.label
+					})] }, `label-${index}`);
+				};
 				return /* @__PURE__ */ jsxs(Center, {
-					ref: containerRef,
+					ref: chartRef,
 					className: pie_chart_module_default["pie-chart__plot"],
+					...chartProps,
+					"aria-label": ariaLabel ?? __("Pie chart", "jetpack-charts"),
 					children: [/* @__PURE__ */ jsxs("svg", {
+						ref: svgRef,
 						viewBox: `0 0 ${width} ${height}`,
 						preserveAspectRatio: "xMidYMid meet",
 						width,
 						height,
-						children: [/* @__PURE__ */ jsx("defs", { children: /* @__PURE__ */ jsx(RadialWipeAnimation, {
-							id: `radial-wipe-${chartId}`,
-							radius: outerRadius,
-							innerRadius
-						}) }), /* @__PURE__ */ jsxs(Group, {
-							top: centerY,
-							left: centerX,
-							mask: animation && !prefersReducedMotion ? `url(#radial-wipe-${chartId})` : null,
-							children: [allSegmentsHidden ? /* @__PURE__ */ jsx(SvgEmptyState, {
-								x: 0,
-								y: 0,
-								width,
-								height,
-								children: getAllHiddenMessage(legendInteractive, "segments")
-							}) : /* @__PURE__ */ jsx(Pie, {
-								data: dataWithIndex,
-								pieValue: accessors.value,
-								outerRadius,
-								innerRadius,
-								padAngle,
-								cornerRadius,
-								children: (pie) => {
-									return pie.arcs.map((arc, index) => {
-										const [centroidX, centroidY] = pie.path.centroid(arc);
-										const hasSpaceForLabel = arc.endAngle - arc.startAngle >= .25;
-										const handleMouseMove = (event) => {
-											if (!withTooltips) return;
-											const bounds = containerRef.current?.getBoundingClientRect();
-											if (!bounds) return;
-											showTooltip({
-												tooltipData: arc.data,
-												tooltipLeft: event.clientX - bounds.left + tooltipOffsetX,
-												tooltipTop: event.clientY - bounds.top + tooltipOffsetY
-											});
-										};
-										const fill = accessors.fill(arc.data);
-										const pathProps = {
-											d: pie.path(arc) || "",
-											fill,
-											"data-testid": "pie-segment"
-										};
-										const groupProps = {};
-										if (withTooltips) {
-											groupProps.onMouseMove = handleMouseMove;
-											groupProps.onMouseLeave = onMouseLeave;
-										}
-										const svgLabelSmall = providerTheme.svgLabelSmall;
-										const fontSize = resolveFontSize(svgLabelSmall?.fontSize) ?? 12;
-										const backgroundWidth = getStringWidth$1(arc.data.label, {
-											fontSize,
-											fontFamily: svgLabelSmall?.fontFamily,
-											fontWeight: svgLabelSmall?.fontWeight
-										}) + 12;
-										const backgroundHeight = fontSize + 12;
-										return /* @__PURE__ */ jsxs("g", {
-											...groupProps,
-											children: [/* @__PURE__ */ jsx("path", { ...pathProps }), showLabels && hasSpaceForLabel && /* @__PURE__ */ jsxs("g", { children: [/* @__PURE__ */ jsx("rect", {
-												className: pie_chart_module_default["pie-chart__label-plate"],
-												x: centroidX - backgroundWidth / 2,
-												y: centroidY - backgroundHeight / 2,
-												width: backgroundWidth,
-												height: backgroundHeight,
-												rx: 4,
-												ry: 4,
-												pointerEvents: "none"
-											}), /* @__PURE__ */ jsx("text", {
-												className: clsx(pie_chart_module_default["pie-chart__label-text"], LABEL_TEXT_MODIFIER[pickLabelTextColor(fill, labelRoles, "label-inverse")]),
-												x: centroidX,
-												y: centroidY,
-												dy: ".33em",
-												fontSize,
-												textAnchor: "middle",
-												pointerEvents: "none",
-												children: arc.data.label
-											})] })]
-										}, `arc-${index}`);
-									});
-								}
-							}), !allSegmentsHidden && svgChildren]
-						})]
-					}), withTooltips && tooltipOpen && tooltipData && /* @__PURE__ */ jsx(BoundedTooltip, {
-						top: tooltipTop || 0,
-						left: tooltipLeft || 0,
-						children: /* @__PURE__ */ jsx("div", {
-							className: standaloneScopeClass,
-							role: "tooltip",
-							children: renderTooltip({ tooltipData })
-						})
+						children: [
+							/* @__PURE__ */ jsx("defs", { children: /* @__PURE__ */ jsx(RadialWipeAnimation, {
+								id: `radial-wipe-${chartId}`,
+								radius: outerRadius,
+								innerRadius
+							}) }),
+							/* @__PURE__ */ jsx(Group, {
+								top: centerY,
+								left: centerX,
+								mask: wipeMask,
+								children: allSegmentsHidden ? /* @__PURE__ */ jsx(SvgEmptyState, {
+									x: 0,
+									y: 0,
+									width,
+									height,
+									children: getAllHiddenMessage(legendInteractive, "segments")
+								}) : arcs.map((arcDatum, index) => /* @__PURE__ */ jsx("g", {
+									...getSegmentHandlers(arcDatum.data, navigationArcs.indexOf(arcDatum)),
+									children: /* @__PURE__ */ jsx("path", {
+										d: path(arcDatum) || "",
+										fill: accessors.fill(arcDatum.data)
+									})
+								}, `arc-${index}`))
+							}),
+							selectedArc && /* @__PURE__ */ jsx(Group, {
+								top: centerY,
+								left: centerX,
+								children: /* @__PURE__ */ jsx(SelectedSegmentRing, {
+									chartId,
+									d: path(selectedArc) || ""
+								})
+							}),
+							!allSegmentsHidden && /* @__PURE__ */ jsxs(Group, {
+								top: centerY,
+								left: centerX,
+								mask: wipeMask,
+								children: [showLabels && arcs.map(renderLabel), svgChildren]
+							})
+						]
+					}), /* @__PURE__ */ jsx(PieSelectionOutput, {
+						...selectionOutputProps,
+						keyboardTooltipAnchor: selectedArc && getKeyboardTooltipAnchor(centerX, centerY, path.centroid(selectedArc)),
+						renderTooltip
 					})]
 				});
 			}
@@ -11938,32 +12431,10 @@ const validateData = (data) => {
 		message: ""
 	};
 };
-const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: propWidth, height: propHeight, thickness = .4, clockwise = true, withTooltips = false, showLegend = false, legend = {}, legendValueDisplay = "percentage", label, animation, note, className, children, tooltipOffsetX = 0, tooltipOffsetY = -15, renderTooltip = renderDefaultPieSemiCircleTooltip, gap = "md" }) => {
+const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: propWidth, height: propHeight, thickness = .4, clockwise = true, withTooltips = false, showLegend = false, legend = {}, legendValueDisplay = "percentage", label, animation, note, className, children, tooltipOffsetX = 0, tooltipOffsetY = -15, renderTooltip = renderDefaultPieSemiCircleTooltip, ariaLabel, gap = "md" }) => {
 	const legendInteractive = legend.interactive ?? false;
 	const legendPosition = legend.position ?? "bottom";
 	const chartId = useChartId(providedChartId);
-	const { tooltipOpen, tooltipLeft, tooltipTop, tooltipData, hideTooltip, showTooltip } = useTooltip();
-	const standaloneScopeClass = useStandaloneScopeClass();
-	const containerRef = useRef(null);
-	const handleMouseMove = useCallback((event, arc) => {
-		const bounds = containerRef.current?.getBoundingClientRect();
-		if (!bounds) return;
-		showTooltip({
-			tooltipData: arc.data,
-			tooltipLeft: event.clientX - bounds.left + tooltipOffsetX,
-			tooltipTop: event.clientY - bounds.top + tooltipOffsetY
-		});
-	}, [
-		showTooltip,
-		tooltipOffsetX,
-		tooltipOffsetY
-	]);
-	const handleMouseLeave = useCallback(() => {
-		hideTooltip();
-	}, [hideTooltip]);
-	const handleArcMouseMove = useCallback((arc) => (event) => {
-		handleMouseMove(event, arc);
-	}, [handleMouseMove]);
 	const { isValid, message } = validateData(data);
 	const { getElementStyles, isSeriesVisible } = useGlobalChartsContext();
 	const dataWithPercentages = useDataWithPercentages(data);
@@ -11997,7 +12468,31 @@ const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: pro
 		metadata: chartMetadata
 	});
 	const prefersReducedMotion = usePrefersReducedMotion();
+	const wipeMask = animation && !prefersReducedMotion ? `url(#radial-wipe-${chartId})` : null;
 	const effectiveWidth = propWidth || DEFAULT_WIDTH$1;
+	const dataWithIndex = visibleData.map((d) => {
+		const originalIndex = data.findIndex((item) => item.label === d.label);
+		return {
+			...d,
+			index: originalIndex >= 0 ? originalIndex : 0
+		};
+	});
+	const startAngle = clockwise ? -Math.PI / 2 : Math.PI / 2;
+	const endAngle = clockwise ? Math.PI / 2 : -Math.PI / 2;
+	const arcs = pie({
+		value: accessors.value,
+		sort: accessors.sort,
+		padAngle: PAD_ANGLE,
+		startAngle,
+		endAngle
+	})(dataWithIndex);
+	const navigationArcs = orderArcsForNavigation(arcs);
+	const { chartRef, svgRef, selectedArc, getSegmentHandlers, getKeyboardTooltipAnchor, selectionOutputProps, chartProps } = usePieKeyboardNavigation({
+		navigationArcs,
+		withTooltips,
+		tooltipOffsetX,
+		tooltipOffsetY
+	});
 	if (!isValid) {
 		const errorWidth = propHeight ? Math.min(propWidth || propHeight * 2, propHeight * 2) : effectiveWidth;
 		const errorHeight = errorWidth / 2;
@@ -12016,15 +12511,6 @@ const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: pro
 			})
 		});
 	}
-	const dataWithIndex = visibleData.map((d) => {
-		const originalIndex = data.findIndex((item) => item.label === d.label);
-		return {
-			...d,
-			index: originalIndex >= 0 ? originalIndex : 0
-		};
-	});
-	const startAngle = clockwise ? -Math.PI / 2 : Math.PI / 2;
-	const endAngle = clockwise ? Math.PI / 2 : -Math.PI / 2;
 	const legendElement = showLegend && /* @__PURE__ */ jsx(Legend, {
 		orientation: legend.orientation ?? "horizontal",
 		position: legendPosition,
@@ -12057,52 +12543,60 @@ const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: pro
 				const height = width / 2;
 				const radius = height;
 				const innerRadius = radius * (1 - thickness);
+				const path = arc({
+					innerRadius,
+					outerRadius: radius,
+					cornerRadius: 3
+				});
 				return /* @__PURE__ */ jsxs(Center, {
-					ref: containerRef,
+					ref: chartRef,
 					className: pie_semi_circle_chart_module_default["pie-semi-circle-chart__plot"],
+					...chartProps,
+					"aria-label": ariaLabel ?? __("Semi-circle chart", "jetpack-charts"),
 					children: [/* @__PURE__ */ jsxs("svg", {
+						ref: svgRef,
 						width,
 						height,
 						viewBox: `0 0 ${width} ${height}`,
-						children: [/* @__PURE__ */ jsx("defs", { children: /* @__PURE__ */ jsx(RadialWipeAnimation, {
-							id: `radial-wipe-${chartId}`,
-							radius,
-							innerRadius,
-							startAngle: "-180deg",
-							wipePercentage: 50
-						}) }), /* @__PURE__ */ jsx(Group, {
-							top: height,
-							left: width / 2,
-							mask: animation && !prefersReducedMotion ? `url(#radial-wipe-${chartId})` : null,
-							children: allSegmentsHidden ? /* @__PURE__ */ jsx(SvgEmptyState, {
-								x: 0,
-								y: -radius / 2,
-								width,
-								height,
-								children: getAllHiddenMessage(legendInteractive, "segments")
-							}) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
-								/* @__PURE__ */ jsx(Pie, {
-									data: dataWithIndex,
-									pieValue: accessors.value,
-									outerRadius: radius,
-									innerRadius,
-									cornerRadius: 3,
-									padAngle: PAD_ANGLE,
-									startAngle,
-									endAngle,
-									pieSort: accessors.sort,
-									children: (pie) => {
-										return pie.arcs.map((arc) => /* @__PURE__ */ jsx("g", {
-											onMouseMove: withTooltips ? handleArcMouseMove(arc) : void 0,
-											onMouseLeave: withTooltips ? handleMouseLeave : void 0,
-											children: /* @__PURE__ */ jsx("path", {
-												d: pie.path(arc) || "",
-												fill: accessors.fill(arc.data)
-											})
-										}, arc.data.label));
-									}
-								}),
-								/* @__PURE__ */ jsxs(Group, { children: [/* @__PURE__ */ jsx(Text, {
+						children: [
+							/* @__PURE__ */ jsx("defs", { children: /* @__PURE__ */ jsx(RadialWipeAnimation, {
+								id: `radial-wipe-${chartId}`,
+								radius,
+								innerRadius,
+								startAngle: "-180deg",
+								wipePercentage: 50
+							}) }),
+							/* @__PURE__ */ jsx(Group, {
+								top: height,
+								left: width / 2,
+								mask: wipeMask,
+								children: allSegmentsHidden ? /* @__PURE__ */ jsx(SvgEmptyState, {
+									x: 0,
+									y: -radius / 2,
+									width,
+									height,
+									children: getAllHiddenMessage(legendInteractive, "segments")
+								}) : arcs.map((arcDatum) => /* @__PURE__ */ jsx("g", {
+									...getSegmentHandlers(arcDatum.data, navigationArcs.indexOf(arcDatum)),
+									children: /* @__PURE__ */ jsx("path", {
+										d: path(arcDatum) || "",
+										fill: accessors.fill(arcDatum.data)
+									})
+								}, arcDatum.data.label))
+							}),
+							selectedArc && /* @__PURE__ */ jsx(Group, {
+								top: height,
+								left: width / 2,
+								children: /* @__PURE__ */ jsx(SelectedSegmentRing, {
+									chartId,
+									d: path(selectedArc) || ""
+								})
+							}),
+							!allSegmentsHidden && /* @__PURE__ */ jsxs(Group, {
+								top: height,
+								left: width / 2,
+								mask: wipeMask,
+								children: [/* @__PURE__ */ jsxs(Group, { children: [/* @__PURE__ */ jsx(Text, {
 									textAnchor: "middle",
 									verticalAnchor: "start",
 									y: -40,
@@ -12114,18 +12608,13 @@ const PieSemiCircleChartInternal = ({ data, chartId: providedChartId, width: pro
 									y: -20,
 									className: pie_semi_circle_chart_module_default.note,
 									children: note
-								})] }),
-								!allSegmentsHidden && svgChildren
-							] })
-						})]
-					}), withTooltips && tooltipOpen && tooltipData && /* @__PURE__ */ jsx(BoundedTooltip, {
-						top: tooltipTop || 0,
-						left: tooltipLeft || 0,
-						children: /* @__PURE__ */ jsx("div", {
-							className: standaloneScopeClass,
-							role: "tooltip",
-							children: renderTooltip({ tooltipData })
-						})
+								})] }), svgChildren]
+							})
+						]
+					}), /* @__PURE__ */ jsx(PieSelectionOutput, {
+						...selectionOutputProps,
+						keyboardTooltipAnchor: selectedArc && getKeyboardTooltipAnchor(width / 2, height, path.centroid(selectedArc)),
+						renderTooltip
 					})]
 				});
 			}