@automattic/charts 4.5.0 → 4.7.0

package/dist/index.cjs

@@ -41,6 +41,7 @@ let _visx_scale = require("@visx/scale");
 let _visx_group = require("@visx/group");
 let _visx_legend = require("@visx/legend");
 let _wordpress_ui = require("@wordpress/ui");
+let _wordpress_theme = require("@wordpress/theme");
 let react_dom = require("react-dom");
 let _visx_gradient = require("@visx/gradient");
 let _visx_curve = require("@visx/curve");
@@ -562,7 +563,8 @@ const relativeLuminance = (hex) => {
 * Whether light text reads better than dark text on the given background, using the W3C
 * luminance threshold (0.179) that maximizes contrast against black vs white.
 *
-* @param backgroundHex - Hex background color
+* @deprecated Assumes black and white text, so it ignores label role overrides and cannot guarantee AA; charts no longer use it, and it will be removed in a future major version.
+* @param      backgroundHex - Hex background color
 * @return true if light text should be used; false (dark text) for malformed colors
 */
 const prefersLightText = (backgroundHex) => {
@@ -881,14 +883,27 @@ const PROTANOPIA = [
 const DEGREES = Math.PI / 180;
 const toLinear = (channel) => channel <= .04045 ? channel / 12.92 : Math.pow((channel + .055) / 1.055, 2.4);
 const fromLinear = (channel) => channel <= .0031308 ? 12.92 * channel : 1.055 * Math.pow(channel, 1 / 2.4) - .055;
-const hexToLinear = (hex) => {
+/**
+* The sRGB channels of a hex color.
+*
+* @param  hex - A six-digit hex color.
+* @return Channels from 0 to 255.
+* @throws {Error} if the hex string is malformed
+*/
+const hexToRgb = (hex) => {
 	validateHexColor(hex);
-	return [
+	const [r, g, b] = [
 		1,
 		3,
 		5
-	].map((start) => toLinear(parseInt(hex.slice(start, start + 2), 16) / 255));
+	].map((start) => parseInt(hex.slice(start, start + 2), 16));
+	return [
+		r,
+		g,
+		b
+	];
 };
+const hexToLinear = (hex) => hexToRgb(hex).map((channel) => toLinear(channel / 255));
 const linearToHex = (linear) => "#" + linear.map((channel) => Math.round(Math.min(1, Math.max(0, fromLinear(channel))) * 255).toString(16).padStart(2, "0")).join("");
 const simulate = (matrix, [r, g, b]) => [
 	0,
@@ -1014,6 +1029,35 @@ const hexToOklch = (hex) => {
 	};
 };
 /**
+* `foreground` over `background` at `weight`, left unrounded as CSS `color-mix` and alpha compositing leave it.
+*
+* A mix rounded to hex can land on the other side of a contrast threshold from the fill the browser paints.
+*
+* @param foreground - The color weighted by `weight`.
+* @param background - The color it is mixed over.
+* @param weight     - Share of `foreground`, from 0 to 1.
+* @return The mixed channels.
+*/
+const blendRgb = (foreground, background, weight) => {
+	const share = Math.min(1, Math.max(0, weight));
+	const [r, g, b] = foreground.map((channel, i) => background[i] + (channel - background[i]) * share);
+	return [
+		r,
+		g,
+		b
+	];
+};
+/**
+* WCAG relative luminance of unrounded sRGB channels.
+*
+* @param rgb - Channels from 0 to 255.
+* @return Relative luminance from 0 to 1.
+*/
+const rgbLuminance = (rgb) => {
+	const [r, g, b] = rgb.map((channel) => toLinear(channel / 255));
+	return .2126 * r + .7152 * g + .0722 * b;
+};
+/**
 * WCAG contrast ratio between two relative luminances.
 *
 * @param first  - First relative luminance.
@@ -1021,15 +1065,6 @@ const hexToOklch = (hex) => {
 * @return Ratio from 1 to 21.
 */
 const luminanceContrastRatio = (first, second) => (Math.max(first, second) + .05) / (Math.min(first, second) + .05);
-/**
-* WCAG contrast ratio between two hex colors.
-*
-* @param  first  - First hex color.
-* @param  second - Second hex color.
-* @return Ratio from 1 to 21.
-* @throws {Error} if either hex string is malformed
-*/
-const contrastRatio = (first, second) => luminanceContrastRatio(relativeLuminance(first), relativeLuminance(second));
 /** WCAG 1.4.3 text contrast, which a label drawn on a fill needs from at least one label color. */
 const MIN_LABEL_CONTRAST = 4.5;
 /** Degrees of hue one unit of OKLCH chroma is worth when ranking candidates by hue. */
@@ -1534,15 +1569,13 @@ const useXYChartTheme = (data) => {
 		const resolve = createCssVariableResolver(scopeElement);
 		const resolveColor = (value) => value ? resolve(value) ?? value : value;
 		const paletteColors = [...JSON.parse(seriesColorKey), ...CATALOG_POINTERS.series].map((color) => resolveColor(color)).filter((color) => Boolean(color) && !color.includes("var("));
-		const resolvedLabelColor = resolveColor(CATALOG_POINTERS.labelAxis);
-		const htmlLabelColor = resolvedLabelColor ? normalizeColorToHex(resolvedLabelColor) || resolvedLabelColor : resolvedLabelColor;
 		return (0, _visx_xychart.buildChartTheme)({
 			...theme,
 			gridColor: "",
 			gridColorDark: "",
 			colors: paletteColors,
 			backgroundColor: resolveColor(CATALOG_POINTERS.background),
-			htmlLabel: htmlLabelColor ? { color: htmlLabelColor } : void 0,
+			htmlLabel: { color: CATALOG_POINTERS.labelAxis },
 			gridStyles: {
 				...theme.gridStyles,
 				stroke: CATALOG_POINTERS.grid
@@ -1977,6 +2010,9 @@ function usePrefersReducedMotion() {
 	return prefersReducedMotion;
 }
 //#endregion
+//#region src/hooks/use-isomorphic-layout-effect.ts
+const useIsomorphicLayoutEffect = typeof window !== "undefined" ? react.useLayoutEffect : react.useEffect;
+//#endregion
 //#region src/providers/chart-context/hooks/use-chart-registration.ts
 const useChartRegistration = ({ chartId, legendItems, chartType, isDataValid, metadata }) => {
 	const { registerChart, unregisterChart } = useGlobalChartsContext();
@@ -2449,6 +2485,30 @@ var base_tooltip_module_default = {
 	"tooltip": "a8ccharts--zY0xG-tooltip"
 };
 //#endregion
+//#region src/components/tooltip/private/tooltip-theme.tsx
+const DEFAULT_SURFACE = "#1e1e1e";
+const TOOLTIP_SURFACE = `var(--a8c-charts-color-tooltip-surface, ${DEFAULT_SURFACE})`;
+const toSeed = (value) => {
+	const parsed = value ? (0, _visx_vendor_d3_color.color)(value) : null;
+	return parsed && parsed.opacity === 1 ? parsed.formatHex() : DEFAULT_SURFACE;
+};
+/**
+* Themes the tooltip box for its dark surface, as `@wordpress/ui`'s Tooltip themes its popup. The box re-declares the catalog under this theme, so every role it reads is tuned for the surface, whatever theme the chart is in.
+*
+* @param props          - Component props.
+* @param props.children - The tooltip box.
+* @return The themed box.
+*/
+const TooltipTheme = ({ children }) => {
+	const scopeElement = useChartScopeElement();
+	const color = (0, react.useMemo)(() => ({ background: toSeed(resolveCssVariable(TOOLTIP_SURFACE, scopeElement)) }), [scopeElement]);
+	if (!_wordpress_theme.ThemeProvider) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children });
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_wordpress_theme.ThemeProvider, {
+		color,
+		children
+	});
+};
+//#endregion
 //#region src/components/tooltip/base-tooltip.tsx
 const DefaultTooltipContent = ({ data }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 	data?.label,
@@ -2460,10 +2520,9 @@ const BaseTooltip = ({ data, top, left, component: Component = DefaultTooltipCon
 		data,
 		className
 	});
-	const standaloneScopeClass = useStandaloneScopeClass();
 	if (!renderContainer) return content;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-		className: (0, clsx.default)(standaloneScopeClass, base_tooltip_module_default.tooltip),
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipTheme, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		className: (0, clsx.default)(CHART_SCOPE_CLASS, base_tooltip_module_default.tooltip),
 		style: {
 			top,
 			left,
@@ -2471,7 +2530,7 @@ const BaseTooltip = ({ data, top, left, component: Component = DefaultTooltipCon
 		},
 		role: "tooltip",
 		children: content
-	});
+	}) });
 };
 //#endregion
 //#region src/components/tooltip/private/bounded-tooltip.tsx
@@ -2486,6 +2545,11 @@ const isClipping = (element) => {
 		overflowY
 	].some((value) => value && value !== "visible");
 };
+const findLayoutParent = (node) => {
+	let element = node.parentElement;
+	while (element && getComputedStyle(element).display === "contents") element = element.parentElement;
+	return element;
+};
 const findClippingAncestor = (wrapper) => {
 	let element = wrapper.parentElement;
 	while (element && element !== document.body) {
@@ -2560,19 +2624,20 @@ const getBoundedPosition = ({ left, top, offsetLeft, offsetTop, box, wrapper, bo
 * @param props.top        - Anchor y, in wrapper coordinates.
 * @param props.offsetLeft - Gap between the anchor and the box, horizontally.
 * @param props.offsetTop  - Gap between the anchor and the box, vertically.
-* @param props.style      - Box styles; visx's defaults unless `unstyled`.
-* @param props.unstyled   - Skip `style` and leave the box bare.
+* @param props.style      - Inline overrides on the surface; ignored when `unstyled`.
+* @param props.unstyled   - Drop the surface and `style`, leaving the box bare.
+* @param props.className  - Extra classes beside the surface.
 * @param props.children   - Box content.
 * @param props.placement  - Below-axis, beside without vertical flipping, or automatic flipping.
 * @return The tooltip box.
 */
-const BoundedTooltip = ({ left = 0, top = 0, offsetLeft = DEFAULT_OFFSET, offsetTop = DEFAULT_OFFSET, style = _visx_tooltip.defaultStyles, unstyled = false, children, placement = "auto", ...rest }) => {
+const BoundedTooltip = ({ left = 0, top = 0, offsetLeft = DEFAULT_OFFSET, offsetTop = DEFAULT_OFFSET, style, unstyled = false, className, children, placement = "auto", ...rest }) => {
 	const nodeRef = (0, react.useRef)(null);
 	const clipRef = (0, react.useRef)(null);
 	const [position, setPosition] = (0, react.useState)(null);
 	(0, react.useLayoutEffect)(() => {
 		const node = nodeRef.current;
-		const wrapper = node?.parentElement;
+		const wrapper = node && findLayoutParent(node);
 		if (!node || !wrapper) return;
 		if (clipRef.current?.wrapper !== wrapper) clipRef.current = {
 			wrapper,
@@ -2620,8 +2685,9 @@ const BoundedTooltip = ({ left = 0, top = 0, offsetLeft = DEFAULT_OFFSET, offset
 	]);
 	const x = position?.x ?? left + offsetLeft;
 	const y = position?.y ?? top + (placement === "below-axis" ? POINTER_HEIGHT : offsetTop);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_visx_tooltip.Tooltip, {
+	const box = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_visx_tooltip.Tooltip, {
 		ref: nodeRef,
+		className: (0, clsx.default)(!unstyled && ["a8c-charts-tooltip-scope", base_tooltip_module_default.surface], className),
 		style: {
 			position: "absolute",
 			left: 0,
@@ -2637,13 +2703,14 @@ const BoundedTooltip = ({ left = 0, top = 0, offsetLeft = DEFAULT_OFFSET, offset
 				left: left - x - POINTER_HEIGHT,
 				top: -6,
 				width: 12,
-				height: POINTER_HEIGHT,
+				height: 7,
 				background: "inherit",
-				clipPath: "polygon(50% 0, 100% 100%, 0 100%)",
+				clipPath: `polygon(50% 0, 100% ${POINTER_HEIGHT}px, 100% 100%, 0 100%, 0 ${POINTER_HEIGHT}px)`,
 				pointerEvents: "none"
 			}
 		}), children]
 	});
+	return unstyled ? box : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipTheme, { children: box });
 };
 //#endregion
 //#region src/components/tooltip/xy-chart-tooltip.tsx
@@ -2750,13 +2817,20 @@ const XyChartTooltipContent = ({ tooltipContext, container, renderTooltip, rende
 	const marginLeft = margin?.left ?? 0;
 	const TooltipComponent = detectBounds || tooltipPlacement !== "auto" ? BoundedTooltip : _visx_tooltip.Tooltip;
 	const boxStyle = {
-		..._visx_tooltip.defaultStyles,
 		zIndex,
-		backgroundColor: theme?.backgroundColor ?? "white",
-		boxShadow: `0 1px 2px ${isValidHexColor(theme?.htmlLabel?.color) ? `${theme.htmlLabel.color}55` : "#22222255"}`,
-		...theme?.htmlLabel,
 		...style
 	};
+	const themesOwnBox = TooltipComponent === _visx_tooltip.Tooltip && !tooltipProps.unstyled;
+	const box = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipComponent, {
+		left: tooltipLeft,
+		top: tooltipPlacement === "below-axis" ? marginTop + innerHeight + (margin?.bottom ?? 0) : tooltipAnchorTop ?? tooltipTop,
+		style: boxStyle,
+		applyPositionStyle: true,
+		...tooltipProps,
+		className: (0, clsx.default)(themesOwnBox && ["a8c-charts-scope", base_tooltip_module_default.surface], tooltipProps.className),
+		...tooltipPlacement !== "auto" && { placement: tooltipPlacement },
+		children: tooltipContent
+	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("g", {
 		className: "visx-tooltip-overlay",
 		pointerEvents: "none",
@@ -2783,15 +2857,7 @@ const XyChartTooltipContent = ({ tooltipContext, container, renderTooltip, rende
 			}),
 			glyphs
 		]
-	}), container && (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipComponent, {
-		left: tooltipLeft,
-		top: tooltipPlacement === "below-axis" ? marginTop + innerHeight + (margin?.bottom ?? 0) : tooltipAnchorTop ?? tooltipTop,
-		style: boxStyle,
-		applyPositionStyle: true,
-		...tooltipProps,
-		...tooltipPlacement !== "auto" && { placement: tooltipPlacement },
-		children: tooltipContent
-	}), container)] });
+	}), container && (0, react_dom.createPortal)(themesOwnBox ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipTheme, { children: box }) : box, container)] });
 };
 /**
 * In-tree replacement for `@visx/xychart`'s `Tooltip`.
@@ -3058,7 +3124,6 @@ const useKeyboardNavigation = ({ selectedIndex, setSelectedIndex, isNavigating,
 };
 //#endregion
 //#region src/providers/chart-context/hooks/use-default-hidden-series.ts
-const useIsomorphicLayoutEffect$1 = typeof window !== "undefined" ? react.useLayoutEffect : react.useEffect;
 /**
 * Seeds a chart's hidden series once per chart ID, the first time the provider
 * sees that ID.
@@ -3079,7 +3144,7 @@ const useDefaultHiddenSeries = (chartId, seriesLabels) => {
 	labelsRef.current = seriesLabels;
 	const hasSeriesLabels = seriesLabels !== void 0;
 	const shouldUseDefaults = hasSeriesLabels && !hasSeededChart(chartId);
-	useIsomorphicLayoutEffect$1(() => {
+	useIsomorphicLayoutEffect(() => {
 		if (labelsRef.current === void 0) return;
 		seedChartHiddenSeries(chartId, labelsRef.current);
 	}, [
@@ -3704,7 +3769,6 @@ var with_responsive_module_default = {
 };
 //#endregion
 //#region src/charts/private/with-responsive/with-responsive.tsx
-const useIsomorphicLayoutEffect = typeof window !== "undefined" ? react.useLayoutEffect : react.useEffect;
 /**
 * A higher-order component that provides responsive dimensions
 * to the wrapped chart component using useParentSize from `@visx/responsive`.
@@ -3988,10 +4052,8 @@ var line_chart_module_default = {
 	"line-chart__annotation-label-popover-content": "a8ccharts-inuQka-line-chart__annotation-label-popover-content",
 	"line-chart__annotation-label-trigger-button": "a8ccharts-inuQka-line-chart__annotation-label-trigger-button",
 	"line-chart__annotations-overlay": "a8ccharts-inuQka-line-chart__annotations-overlay",
-	"line-chart__tooltip": "a8ccharts-inuQka-line-chart__tooltip",
 	"line-chart__tooltip-date": "a8ccharts-inuQka-line-chart__tooltip-date",
 	"line-chart__tooltip-label": "a8ccharts-inuQka-line-chart__tooltip-label",
-	"line-chart__tooltip-row": "a8ccharts-inuQka-line-chart__tooltip-row",
 	"line-chart--animated": "a8ccharts-inuQka-line-chart--animated",
 	"rise": "a8ccharts-inuQka-rise"
 };
@@ -4518,11 +4580,10 @@ const TooltipDate = ({ date, displayResolution }) => {
 * one row per visible series (label + formatted value), sorted descending by
 * value. Reused by AreaChart, which has the same multi-series shape.
 *
-* @param params       - visx tooltip data and the chart's optional `bucketInfo`.
-* @param contentStyle - Explicit tooltip content color overrides.
+* @param params - visx tooltip data and the chart's optional `bucketInfo`.
 * @return Tooltip JSX, or `null` when no datum is hovered.
 */
-const renderDefaultTooltip = (params, contentStyle) => {
+const renderDefaultTooltip = (params) => {
 	const { tooltipData, bucketInfo } = params;
 	const nearestDatum = tooltipData?.nearestDatum?.datum;
 	if (!nearestDatum) return null;
@@ -4535,29 +4596,24 @@ const renderDefaultTooltip = (params, contentStyle) => {
 		if (b.value === null) return -1;
 		return b.value - a.value;
 	});
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: line_chart_module_default["line-chart__tooltip"],
-		style: contentStyle,
-		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-			className: line_chart_module_default["line-chart__tooltip-date"],
-			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipDate, {
-				date: nearestDatum.date,
-				displayResolution: bucketInfo?.displayResolution ?? "day"
-			})
-		}), tooltipPoints.map((point) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_wordpress_ui.Stack, {
-			direction: "row",
-			align: "center",
-			justify: "space-between",
-			className: line_chart_module_default["line-chart__tooltip-row"],
-			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-				className: line_chart_module_default["line-chart__tooltip-label"],
-				children: [point.key, ":"]
-			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: line_chart_module_default["line-chart__tooltip-value"],
-				children: formatReading(point.value)
-			})]
-		}, point.key))]
-	});
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		className: line_chart_module_default["line-chart__tooltip-date"],
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TooltipDate, {
+			date: nearestDatum.date,
+			displayResolution: bucketInfo?.displayResolution ?? "day"
+		})
+	}), tooltipPoints.map((point) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_wordpress_ui.Stack, {
+		direction: "row",
+		align: "center",
+		justify: "space-between",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: line_chart_module_default["line-chart__tooltip-label"],
+			children: [point.key, ":"]
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: line_chart_module_default["line-chart__tooltip-value"],
+			children: formatReading(point.value)
+		})]
+	}, point.key))] });
 };
 const validateData$4 = (data) => {
 	if (!data?.length) return (0, _wordpress_i18n.__)("No data available", "jetpack-charts");
@@ -4817,29 +4873,10 @@ const LineChartInternal = (0, react.forwardRef)(({ data, chartId: providedChartI
 		xAccessor: (d) => d?.date,
 		yAccessor: (d) => d?.value
 	};
-	const resolvedTooltipStyle = (0, react.useMemo)(() => {
-		if (renderTooltip !== renderDefaultTooltip || !tooltipStyle) return tooltipStyle;
-		if (!tooltipStyle.color || tooltipStyle.background || tooltipStyle.backgroundColor) return tooltipStyle;
-		return {
-			backgroundColor: "var(--a8c-charts-color-tooltip-surface, rgb(0 0 0 / 85%))",
-			...tooltipStyle
-		};
-	}, [renderTooltip, tooltipStyle]);
-	const tooltipRenderer = (0, react.useMemo)(() => (params) => renderTooltip === renderDefaultTooltip ? renderDefaultTooltip({
-		...params,
-		bucketInfo
-	}, {
-		color: tooltipStyle?.color,
-		background: tooltipStyle?.background,
-		backgroundColor: tooltipStyle?.backgroundColor
-	}) : renderTooltip({
+	const tooltipRenderer = (0, react.useMemo)(() => (params) => renderTooltip({
 		...params,
 		bucketInfo
-	}), [
-		renderTooltip,
-		bucketInfo,
-		tooltipStyle
-	]);
+	}), [renderTooltip, bucketInfo]);
 	if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 		className: (0, clsx.default)("line-chart", line_chart_module_default["line-chart"]),
 		children: error
@@ -4987,7 +5024,7 @@ const LineChartInternal = (0, react.forwardRef)(({ data, chartId: providedChartI
 									detectBounds: true,
 									snapTooltipToDatumX: true,
 									tooltipPlacement,
-									style: resolvedTooltipStyle,
+									style: tooltipStyle,
 									snapTooltipToDatumY: true,
 									showSeriesGlyphs: true,
 									renderTooltip: tooltipRenderer,
@@ -6895,8 +6932,7 @@ var conversion_funnel_chart_module_default = {
 	"step-rate": "a8ccharts-mGEVca-step-rate",
 	"stretch": "a8ccharts-mGEVca-stretch",
 	"tooltip-content": "a8ccharts-mGEVca-tooltip-content",
-	"tooltip-title": "a8ccharts-mGEVca-tooltip-title",
-	"tooltip-wrapper": "a8ccharts-mGEVca-tooltip-wrapper"
+	"tooltip-title": "a8ccharts-mGEVca-tooltip-title"
 };
 //#endregion
 //#region src/charts/conversion-funnel-chart/private/use-funnel-selection.ts
@@ -6957,9 +6993,10 @@ const useFunnelSelection = (hideTooltip) => {
 * @param props.renderStepRate   - Custom render function for step rates
 * @param props.renderMainMetric - Custom render function for the entire main metric section
 * @param props.renderTooltip    - Custom render function for tooltip content
+* @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 }) => {
+const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loading = false, animation, className, chartId: providedChartId, height, style, renderStepLabel, renderStepRate, renderMainMetric, renderTooltip, tooltipStyle }) => {
 	const chartId = useChartId(providedChartId);
 	const { getElementStyles, isColorPaletteResolved } = useGlobalChartsContext();
 	const chartRef = (0, react.useRef)(null);
@@ -7194,14 +7231,14 @@ const ConversionFunnelChartInternal = ({ mainRate, changeIndicator, steps, loadi
 				step: tooltipData,
 				index: steps.findIndex((s) => s.id === tooltipData.id),
 				top: tooltipTop,
-				left: tooltipLeft,
-				className: conversion_funnel_chart_module_default["tooltip-wrapper"]
+				left: tooltipLeft
 			}) : renderDefaultTooltip(tooltipData);
 			if (!tooltipContent) return null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(BoundedTooltip, {
 				top: tooltipTop,
 				left: tooltipLeft,
-				className: (0, clsx.default)(standaloneScopeClass, conversion_funnel_chart_module_default["tooltip-wrapper"]),
+				className: standaloneScopeClass,
+				style: tooltipStyle,
 				children: tooltipContent
 			});
 		})()]
@@ -7345,13 +7382,14 @@ function normalizeGeoChartError(eventArgs) {
 * @param props.height            - Height of the chart in pixels
 * @param props.region            - Region to display ('world', 'US', or ISO 3166-1 alpha-2 code)
 * @param props.resolution        - Resolution level ('countries', 'provinces', or 'metros')
+* @param props.displayMode       - Plot rows as shaded areas ('regions') or markers ('markers')
 * @param props.domain            - Country code whose viewpoint sets the disputed borders
 * @param props.onError           - Optional callback for Google Charts errors
 * @param props.className         - Additional CSS class name for the chart container
 * @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", domain, onError, renderPlaceholder }) => {
+const GeoChartInternal = ({ className, data, width, height, region = "world", resolution = "countries", displayMode = "regions", domain, onError, renderPlaceholder }) => {
 	const { getElementStyles } = useGlobalChartsContext();
 	const scopeElement = useChartScopeElement();
 	const containerRef = (0, react.useRef)(null);
@@ -7415,6 +7453,7 @@ const GeoChartInternal = ({ className, data, width, height, region = "world", re
 	const options = (0, react.useMemo)(() => ({
 		...region !== "world" && { region },
 		...resolution !== "countries" && { resolution },
+		...displayMode !== "regions" && { displayMode },
 		...domain && { domain },
 		colorAxis: { colors: [lightColorHex, fullColorHex] },
 		backgroundColor: backgroundColorHex,
@@ -7429,6 +7468,7 @@ const GeoChartInternal = ({ className, data, width, height, region = "world", re
 	}), [
 		region,
 		resolution,
+		displayMode,
 		domain,
 		lightColorHex,
 		fullColorHex,
@@ -7484,6 +7524,73 @@ let GoogleDataTableColumnRoleType = /* @__PURE__ */ function(GoogleDataTableColu
 	GoogleDataTableColumnRoleType["domain"] = "domain";
 	return GoogleDataTableColumnRoleType;
 }({});
+const resolveRole = (pointer, resolve) => {
+	const raw = resolve(pointer);
+	const parsed = raw ? (0, _visx_vendor_d3_color.color)(raw) : null;
+	if (!parsed) return {
+		kind: "unreadable",
+		raw
+	};
+	const { r, g, b } = parsed.opacity > 0 ? parsed.rgb() : {
+		r: 0,
+		g: 0,
+		b: 0
+	};
+	return {
+		kind: "color",
+		rgb: [
+			r,
+			g,
+			b
+		],
+		alpha: parsed.opacity
+	};
+};
+/**
+* Reads both label roles at the element the label text inherits from, so JS and CSS agree on what paints.
+*
+* @param resolve - A CSS variable resolver bound to that element.
+* @return The resolved label roles.
+*/
+const resolveLabelRoles = (resolve) => ({
+	label: resolveRole(CATALOG_POINTERS.label, resolve),
+	labelInverse: resolveRole(CATALOG_POINTERS.labelInverse, resolve)
+});
+const roleContrast = (role, fill, fillLuminance) => {
+	if (role.kind === "unreadable") return 0;
+	return luminanceContrastRatio(fillLuminance, rgbLuminance(blendRgb(role.rgb, fill, role.alpha)));
+};
+/**
+* Picks the label color for text drawn on a fill: the role that contrasts more, or black/white when neither reaches AA.
+*
+* Both roles set to one color is a host's choice to keep that color, so it never falls back.
+*
+* @param fill        - The fill the text sits on, as unrounded sRGB channels.
+* @param roles       - The label roles resolved at the chart's element, or null before they are read.
+* @param defaultRole - The role the chart's stylesheet paints when nothing can be decided.
+* @return The color the label should paint with.
+*/
+const pickLabelTextColorForFill = (fill, roles, defaultRole) => {
+	if (!roles || (0, import_fast_deep_equal.default)(roles.label, roles.labelInverse)) return defaultRole;
+	const fillLuminance = rgbLuminance(fill);
+	const labelContrast = roleContrast(roles.label, fill, fillLuminance);
+	const inverseContrast = roleContrast(roles.labelInverse, fill, fillLuminance);
+	if (Math.max(labelContrast, inverseContrast) >= 4.55) return labelContrast > inverseContrast ? "label" : "label-inverse";
+	return luminanceContrastRatio(fillLuminance, 0) > luminanceContrastRatio(fillLuminance, 1) ? "black" : "white";
+};
+/**
+* `pickLabelTextColorForFill` for a fill given as a color.
+*
+* @param fill        - The fill, in any color syntax `normalizeColorToHex` reads.
+* @param roles       - The label roles resolved at the chart's element, or null before they are read.
+* @param defaultRole - The role the chart's stylesheet paints when nothing can be decided.
+* @return The color the label should paint with.
+*/
+const pickLabelTextColor = (fill, roles, defaultRole) => {
+	const fillHex = normalizeColorToHex(fill);
+	if (!isValidHexColor(fillHex)) return defaultRole;
+	return pickLabelTextColorForFill(hexToRgb(fillHex), roles, defaultRole);
+};
 //#endregion
 //#region src/charts/heatmap-chart/heatmap-chart.module.scss
 var heatmap_chart_module_default = {
@@ -7493,9 +7600,11 @@ var heatmap_chart_module_default = {
 	"heatmap-chart__cell--hidden": "a8ccharts-O3YMOW-heatmap-chart__cell--hidden",
 	"heatmap-chart__cell--placeholder": "a8ccharts-O3YMOW-heatmap-chart__cell--placeholder",
 	"heatmap-chart__cell--selected": "a8ccharts-O3YMOW-heatmap-chart__cell--selected",
-	"heatmap-chart__cell--strong": "a8ccharts-O3YMOW-heatmap-chart__cell--strong",
 	"heatmap-chart__cell--summary": "a8ccharts-O3YMOW-heatmap-chart__cell--summary",
 	"heatmap-chart__cell-value": "a8ccharts-O3YMOW-heatmap-chart__cell-value",
+	"heatmap-chart__cell-value--black": "a8ccharts-O3YMOW-heatmap-chart__cell-value--black",
+	"heatmap-chart__cell-value--inverse": "a8ccharts-O3YMOW-heatmap-chart__cell-value--inverse",
+	"heatmap-chart__cell-value--white": "a8ccharts-O3YMOW-heatmap-chart__cell-value--white",
 	"heatmap-chart__col-label": "a8ccharts-O3YMOW-heatmap-chart__col-label",
 	"heatmap-chart__col-label--summary": "a8ccharts-O3YMOW-heatmap-chart__col-label--summary",
 	"heatmap-chart__empty": "a8ccharts-O3YMOW-heatmap-chart__empty",
@@ -7789,25 +7898,25 @@ const stepCalendarCell = (grid, blocks, from, key) => {
 //#endregion
 //#region src/charts/heatmap-chart/heatmap-chart.tsx
 const CELL_MIX_FLOOR = .15;
-const NO_ROW_LABELS = [];
-const TOOLTIP_BOX_STYLES = {
-	light: {
-		..._visx_tooltip.defaultStyles,
-		zIndex: 3
-	},
-	dark: { zIndex: 3 }
+const CELL_VALUE_MODIFIER = {
+	label: void 0,
+	"label-inverse": heatmap_chart_module_default["heatmap-chart__cell-value--inverse"],
+	black: heatmap_chart_module_default["heatmap-chart__cell-value--black"],
+	white: heatmap_chart_module_default["heatmap-chart__cell-value--white"]
 };
+const NO_ROW_LABELS = [];
+const TOOLTIP_BOX_STYLE = { zIndex: 3 };
 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, tooltipVariant = "light", tooltipStyle, children }) => {
+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 chartId = useChartId(providedChartId);
 	const tooltipBoxStyle = tooltipStyle ? {
-		...TOOLTIP_BOX_STYLES[tooltipVariant],
+		...TOOLTIP_BOX_STYLE,
 		...tooltipStyle
-	} : TOOLTIP_BOX_STYLES[tooltipVariant];
+	} : TOOLTIP_BOX_STYLE;
 	const { getElementStyles, theme } = useGlobalChartsContext();
 	const scopeElement = useChartScopeElement();
 	const { heatmapChart: heatmapChartSettings } = theme;
@@ -7816,6 +7925,7 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 	const { tooltipOpen, tooltipLeft, tooltipTop, tooltipData, showTooltip, hideTooltip } = (0, _visx_tooltip.useTooltip)();
 	const standaloneScopeClass = useStandaloneScopeClass();
 	const containerRef = (0, react.useRef)(null);
+	const [labelRoles, setLabelRoles] = (0, react.useState)(null);
 	const getTooltipOrigin = (0, react.useCallback)(() => containerRef.current?.closest(`[data-chart-id="heatmap-chart-${chartId}"]`)?.getBoundingClientRect() ?? null, [chartId]);
 	const { color: primaryColorHex } = getElementStyles({
 		index: 0,
@@ -7823,7 +7933,21 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 	});
 	const chartBackgroundHex = normalizeColorToHex(CATALOG_POINTERS.background, scopeElement, resolveCssVariable);
 	const primaryHex = normalizeColorToHex(primaryColorHex);
-	const cellHasLightText = (intensity) => isValidHexColor(primaryHex) && isValidHexColor(chartBackgroundHex) && prefersLightText(mixHexColors(primaryHex, chartBackgroundHex, 1 - (CELL_MIX_FLOOR + .85 * intensity)));
+	const cellMix = isValidHexColor(primaryHex) && isValidHexColor(chartBackgroundHex) ? {
+		primary: hexToRgb(primaryHex),
+		background: hexToRgb(chartBackgroundHex)
+	} : null;
+	const cellTextColor = (intensity) => cellMix ? pickLabelTextColorForFill(blendRgb(cellMix.primary, cellMix.background, CELL_MIX_FLOOR + .85 * intensity), labelRoles, "label") : "label";
+	useIsomorphicLayoutEffect(() => {
+		if (!containerRef.current) return;
+		const next = resolveLabelRoles(createCssVariableResolver(containerRef.current));
+		setLabelRoles((previous) => (0, import_fast_deep_equal.default)(previous, next) ? previous : next);
+	}, [
+		data,
+		className,
+		primaryColorHex,
+		chartBackgroundHex
+	]);
 	const extent = (0, react.useMemo)(() => getValueExtent(data), [data]);
 	const heatmapContext = (0, react.useMemo)(() => ({
 		extent,
@@ -8095,7 +8219,6 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 										"data-row": rowIndex,
 										className: (0, clsx.default)(heatmap_chart_module_default["heatmap-chart__cell"], {
 											[heatmap_chart_module_default["heatmap-chart__cell--filled"]]: filled,
-											[heatmap_chart_module_default["heatmap-chart__cell--strong"]]: filled && cellHasLightText(normalized),
 											[heatmap_chart_module_default["heatmap-chart__cell--summary"]]: column.summary,
 											...summaryGaps(columnIndex),
 											[heatmap_chart_module_default["heatmap-chart__cell--selected"]]: selected?.column === columnIndex && selected?.row === rowIndex
@@ -8107,7 +8230,7 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 										onMouseMove: handleCellMouseMove,
 										onMouseLeave: handleCellMouseLeave,
 										children: (drawValues || column.summary) && present && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: heatmap_chart_module_default["heatmap-chart__cell-value"],
+											className: (0, clsx.default)(heatmap_chart_module_default["heatmap-chart__cell-value"], filled && CELL_VALUE_MODIFIER[cellTextColor(normalized)]),
 											children: (0, _automattic_number_formatters.formatNumberCompact)(value)
 										})
 									}, `cell-${columnIndex}-${rowIndex}`);
@@ -8131,7 +8254,6 @@ const HeatmapChartInternal = ({ data, chartId: providedChartId, width = 0, heigh
 				}), withTooltips && tooltipOpen && tooltipData && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(BoundedTooltip, {
 					top: tooltipTop,
 					left: tooltipLeft,
-					className: tooltipVariant === "dark" ? base_tooltip_module_default.surface : void 0,
 					style: tooltipBoxStyle,
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: standaloneScopeClass,
@@ -11723,7 +11845,9 @@ function RadialWipeAnimation({ id, radius, innerRadius = 0, durationMs = 1e3, wi
 var pie_chart_module_default = {
 	"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",
 	"pie-chart__label-text--on-light": "a8ccharts-gnszbG-pie-chart__label-text--on-light",
+	"pie-chart__label-text--white": "a8ccharts-gnszbG-pie-chart__label-text--white",
 	"pie-chart__plot": "a8ccharts-gnszbG-pie-chart__plot",
 	"pie-chart--responsive": "a8ccharts-gnszbG-pie-chart--responsive"
 };
@@ -11767,24 +11891,11 @@ const validateData$1 = (data) => {
 		message: ""
 	};
 };
-/**
-* Whether a pie slice's label should use the dark `label` role instead of the default `label-inverse` role.
-*
-* A label plate always wins: the text sits on the plate, not the slice fill, so it never flips.
-* Otherwise the role that contrasts more with the resolved slice fill wins. `null` pointers (not
-* yet resolved, or labels off) keep the default inverse role.
-*
-* @param fill     - The slice's resolved fill color.
-* @param pointers - The label pointers, resolved at the chart's own root element.
-* @return Whether the label needs dark text.
-*/
-const labelNeedsDarkText = (fill, pointers) => {
-	if (!pointers || pointers.hasPlate) return false;
-	const fillHex = normalizeColorToHex(fill);
-	if (!isValidHexColor(fillHex) || !isValidHexColor(pointers.labelHex)) return false;
-	if (pointers.isInverseSeeThrough) return true;
-	if (!isValidHexColor(pointers.labelInverseHex)) return false;
-	return contrastRatio(fillHex, pointers.labelHex) > contrastRatio(fillHex, pointers.labelInverseHex);
+const LABEL_TEXT_MODIFIER = {
+	label: pie_chart_module_default["pie-chart__label-text--on-light"],
+	"label-inverse": void 0,
+	black: pie_chart_module_default["pie-chart__label-text--black"],
+	white: pie_chart_module_default["pie-chart__label-text--white"]
 };
 /**
 * Renders a pie or donut chart using the provided data.
@@ -11801,7 +11912,7 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 	const standaloneScopeClass = useStandaloneScopeClass();
 	const containerRef = (0, react.useRef)(null);
 	const rootRef = (0, react.useRef)(null);
-	const [labelPointers, setLabelPointers] = (0, react.useState)(null);
+	const [labelRoles, setLabelRoles] = (0, react.useState)(null);
 	const onMouseLeave = (0, react.useCallback)(() => {
 		if (!withTooltips) return;
 		hideTooltip();
@@ -11812,18 +11923,9 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 		if (!showLabels || !rootRef.current) return;
 		const resolve = createCssVariableResolver(rootRef.current);
 		const rawLabelBackground = resolve(CATALOG_POINTERS.labelBackground);
-		const rawLabel = resolve(CATALOG_POINTERS.label);
-		const isLabelOpaque = rawLabel ? (0, _visx_vendor_d3_color.color)(rawLabel)?.opacity === 1 : false;
-		const rawLabelInverse = resolve(CATALOG_POINTERS.labelInverse);
-		const labelInverseColor = rawLabelInverse ? (0, _visx_vendor_d3_color.color)(rawLabelInverse) : null;
 		const plateColor = rawLabelBackground ? (0, _visx_vendor_d3_color.color)(rawLabelBackground) : null;
-		const next = {
-			hasPlate: rawLabelBackground ? !plateColor || plateColor.opacity > 0 : false,
-			labelHex: isLabelOpaque ? normalizeColorToHex(CATALOG_POINTERS.label, null, resolve) : "",
-			labelInverseHex: normalizeColorToHex(CATALOG_POINTERS.labelInverse, null, resolve),
-			isInverseSeeThrough: labelInverseColor ? labelInverseColor.opacity < 1 : false
-		};
-		setLabelPointers((previous) => previous && previous.hasPlate === next.hasPlate && previous.labelHex === next.labelHex && previous.labelInverseHex === next.labelInverseHex && previous.isInverseSeeThrough === next.isInverseSeeThrough ? previous : next);
+		const next = (rawLabelBackground ? !plateColor || plateColor.opacity > 0 : false) ? null : resolveLabelRoles(resolve);
+		setLabelRoles((previous) => (0, import_fast_deep_equal.default)(previous, next) ? previous : next);
 	}, [
 		showLabels,
 		className,
@@ -11994,7 +12096,7 @@ const PieChartInternal = ({ data, chartId: providedChartId, withTooltips = false
 												ry: 4,
 												pointerEvents: "none"
 											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("text", {
-												className: (0, clsx.default)(pie_chart_module_default["pie-chart__label-text"], { [pie_chart_module_default["pie-chart__label-text--on-light"]]: labelNeedsDarkText(fill, labelPointers) }),
+												className: (0, clsx.default)(pie_chart_module_default["pie-chart__label-text"], LABEL_TEXT_MODIFIER[pickLabelTextColor(fill, labelRoles, "label-inverse")]),
 												x: centroidX,
 												y: centroidY,
 												dy: ".33em",