Automattic · annacmc · Oct 27, 2025 · Oct 27, 2025 · Oct 27, 2025 · Oct 27, 2025
diff --git a/...es/charts/changelog/charts-41-legends-extract-common-container-logic-into-a-shared-helper b/...es/charts/changelog/charts-41-legends-extract-common-container-logic-into-a-shared-helper
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Charts: legends - extract common container logic to shared helper
diff --git a/projects/js-packages/charts/src/components/bar-chart/bar-chart.module.scss b/projects/js-packages/charts/src/components/bar-chart/bar-chart.module.scss
@@ -1,12 +1,10 @@
 .bar-chart {
-	display: flex;
-	flex-direction: column;
 
 	svg {
 		overflow: visible;
 	}
 
-	&-legend {
+	&__legend {
 		margin-top: 1rem;
 	}
 }
diff --git a/projects/js-packages/charts/src/components/bar-chart/bar-chart.tsx b/projects/js-packages/charts/src/components/bar-chart/bar-chart.tsx
@@ -9,6 +9,7 @@ import {
 	useZeroValueDisplay,
 	useChartMargin,
 	useElementHeight,
+	useLegendLayout,
 } from '../../hooks';
 import {
 	GlobalChartsProvider,
@@ -18,6 +19,7 @@ import {
 	useGlobalChartsTheme,
 	GlobalChartsContext,
 } from '../../providers';
+import containerStyles from '../../styles/chart-container.module.scss';
 import { attachSubComponents } from '../../utils';
 import { Legend, useChartLegendItems } from '../legend';
 import { SingleChartContext } from '../private/single-chart-context';
@@ -276,6 +278,15 @@ const BarChartInternal: FC< BarChartProps > = ( {
 		return generatedStyles;
 	}, [ selectedIndex, data, chartId ] );
 
+	// Use the legend layout hook for consistent calculations
+	const { adjustedChartHeight, adjustedMargin, containerClassName } = useLegendLayout( {
+		height,
+		showLegend,
+		legendPosition,
+		legendHeight,
+		defaultMargin: { ...defaultMargin, ...margin },
+	} );
+
 	// Validate data first
 	const error = validateData( dataSorted );
 	const isDataValid = ! error;
@@ -310,19 +321,23 @@ const BarChartInternal: FC< BarChartProps > = ( {
 			value={ {
 				chartId,
 				chartWidth: width,
-				chartHeight: height - ( showLegend ? legendHeight : 0 ),
+				chartHeight: adjustedChartHeight,
 			} }
 		>
 			<div
-				className={ clsx( 'bar-chart', styles[ 'bar-chart' ], className ) }
+				className={ clsx(
+					'bar-chart',
+					styles[ 'bar-chart' ],
+					containerStyles[ 'chart-container' ],
+					containerStyles[ containerClassName ],
+					className
+				) }
 				data-testid="bar-chart"
 				role="grid"
 				aria-label={ __( 'Bar chart', 'jetpack-charts' ) }
 				style={ {
 					width,
 					height,
-					display: 'flex',
-					flexDirection: showLegend && legendPosition === 'top' ? 'column-reverse' : 'column',
 				} }
 				tabIndex={ 0 }
 				onKeyDown={ onChartKeyDown }
@@ -334,14 +349,8 @@ const BarChartInternal: FC< BarChartProps > = ( {
 				<XYChart
 					theme={ theme }
 					width={ width }
-					height={ height - ( showLegend ? legendHeight : 0 ) }
-					margin={ {
-						...defaultMargin,
-						...margin,
-						...( showLegend && legendPosition === 'top'
-							? { top: ( defaultMargin.top || 0 ) + legendHeight }
-							: {} ),
-					} }
+					height={ adjustedChartHeight }
+					margin={ adjustedMargin }
 					xScale={ chartOptions.xScale }
 					yScale={ chartOptions.yScale }
 					horizontal={ horizontal }
@@ -376,7 +385,7 @@ const BarChartInternal: FC< BarChartProps > = ( {
 					{ allSeriesHidden ? (
 						<text
 							x={ width / 2 }
-							y={ ( height - ( showLegend ? legendHeight : 0 ) ) / 2 }
+							y={ adjustedChartHeight / 2 }
 							textAnchor="middle"
 							fill={ providerTheme.gridStyles?.stroke || '#ccc' }
 							fontSize="14"

diff --git a/projects/js-packages/charts/src/components/leaderboard-chart/leaderboard-chart.tsx b/projects/js-packages/charts/src/components/leaderboard-chart/leaderboard-chart.tsx
@@ -16,6 +16,7 @@ import {
 	useGlobalChartsContext,
 	useGlobalChartsTheme,
 } from '../../providers';
+import containerStyles from '../../styles/chart-container.module.scss';
 import { formatMetricValue, attachSubComponents } from '../../utils';
 import { Legend } from '../legend';
 import { useChartChildren } from '../private/chart-composition';
@@ -234,11 +235,19 @@ const LeaderboardChartInternal: FC< LeaderboardChartProps > = ( {
 			} }
 		>
 			<div
-				className={ clsx( styles.leaderboardChart, loading && styles.loading, className ) }
+				className={ clsx(
+					styles.leaderboardChart,
+					containerStyles[ 'chart-container' ],
+					containerStyles[
+						showLegend && legendPosition === 'top'
+							? 'chart-container--legend-top'
+							: 'chart-container--legend-bottom'
+					],
+					loading && styles.loading,
+					className
+				) }
 				style={ {
 					...style,
-					display: 'flex',
-					flexDirection: showLegend && legendPosition === 'top' ? 'column-reverse' : 'column',
 					gap: showLegend ? '16px' : '0',
 				} }
 			>

diff --git a/projects/js-packages/charts/src/components/line-chart/line-chart.tsx b/projects/js-packages/charts/src/components/line-chart/line-chart.tsx
@@ -12,6 +12,7 @@ import {
 	useChartDataTransform,
 	useChartMargin,
 	useElementHeight,
+	useLegendLayout,
 } from '../../hooks';
 import {
 	GlobalChartsProvider,
@@ -21,6 +22,7 @@ import {
 	useGlobalChartsContext,
 	useGlobalChartsTheme,
 } from '../../providers';
+import containerStyles from '../../styles/chart-container.module.scss';
 import { attachSubComponents } from '../../utils';
 import { Legend, useChartLegendItems } from '../legend';
 import { DefaultGlyph } from '../private/default-glyph';
@@ -379,6 +381,15 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 
 		const defaultMargin = useChartMargin( height, chartOptions, dataSorted, theme );
 
+		// Use the legend layout hook for consistent calculations
+		const { adjustedChartHeight, adjustedMargin, containerClassName } = useLegendLayout( {
+			height,
+			showLegend,
+			legendPosition,
+			legendHeight,
+			defaultMargin: { ...defaultMargin, ...margin },
+		} );
+
 		const error = validateData( dataSorted );
 		const isDataValid = ! error;
 
@@ -433,17 +444,21 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 					chartId,
 					chartRef: internalChartRef,
 					chartWidth: width,
-					chartHeight: height - ( showLegend ? legendHeight : 0 ),
+					chartHeight: adjustedChartHeight,
 				} }
 			>
 				<div
-					className={ clsx( 'line-chart', styles[ 'line-chart' ], className ) }
+					className={ clsx(
+						'line-chart',
+						styles[ 'line-chart' ],
+						containerStyles[ 'chart-container' ],
+						containerStyles[ containerClassName ],
+						className
+					) }
 					data-testid="line-chart"
 					style={ {
 						width,
 						height,
-						display: 'flex',
-						flexDirection: showLegend && legendPosition === 'top' ? 'column-reverse' : 'column',
 						position: 'relative',
 					} }
 				>
@@ -459,14 +474,8 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 						<XYChart
 							theme={ theme }
 							width={ width }
-							height={ height - ( showLegend ? legendHeight : 0 ) }
-							margin={ {
-								...defaultMargin,
-								...margin,
-								...( showLegend && legendPosition === 'top'
-									? { top: ( defaultMargin.top || 0 ) + legendHeight }
-									: {} ),
-							} }
+							height={ adjustedChartHeight }
+							margin={ adjustedMargin }
 							// xScale and yScale could be set in Axis as well, but they are `scale` props there.
 							xScale={ chartOptions.xScale }
 							yScale={ chartOptions.yScale }
@@ -483,7 +492,7 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 							{ allSeriesHidden ? (
 								<text
 									x={ width / 2 }
-									y={ ( height - ( showLegend ? legendHeight : 0 ) ) / 2 }
+									y={ adjustedChartHeight / 2 }
 									textAnchor="middle"
 									fill={ providerTheme.gridStyles?.stroke || '#ccc' }
 									fontSize="14"

diff --git a/projects/js-packages/charts/src/components/pie-chart/pie-chart.tsx b/projects/js-packages/charts/src/components/pie-chart/pie-chart.tsx
@@ -5,7 +5,7 @@ import { useTooltip, useTooltipInPortal } from '@visx/tooltip';
 import { __ } from '@wordpress/i18n';
 import clsx from 'clsx';
 import { useCallback, useContext, useMemo } from 'react';
-import { useElementHeight, useInteractiveLegendData } from '../../hooks';
+import { useElementHeight, useInteractiveLegendData, useLegendLayout } from '../../hooks';
 import {
 	GlobalChartsProvider,
 	useChartId,
@@ -14,6 +14,7 @@ import {
 	useGlobalChartsTheme,
 	GlobalChartsContext,
 } from '../../providers';
+import containerStyles from '../../styles/chart-container.module.scss';
 import { attachSubComponents } from '../../utils';
 import { getStringWidth } from '../../visx/text';
 import { Legend, useChartLegendItems } from '../legend';
@@ -223,6 +224,17 @@ const PieChartInternal = ( {
 		metadata: chartMetadata,
 	} );
 
+	const width = size;
+	const height = size;
+
+	// Use the legend layout hook for consistent calculations
+	const { adjustedChartHeight, containerClassName } = useLegendLayout( {
+		height,
+		showLegend,
+		legendPosition,
+		legendHeight,
+	} );
+
 	if ( ! isValid ) {
 		return (
 			<div className={ clsx( 'pie-chart', styles[ 'pie-chart' ], className ) }>
@@ -231,16 +243,12 @@ const PieChartInternal = ( {
 		);
 	}
 
-	const width = size;
-	const height = size;
-	const adjustedHeight = showLegend && legendPosition === 'top' ? height - legendHeight : height;
-
 	// Calculate radius based on width/height
-	const radius = Math.min( width, adjustedHeight ) / 2;
+	const radius = Math.min( width, adjustedChartHeight ) / 2;
 
 	// Center the chart in the available space
 	const centerX = width / 2;
-	const centerY = adjustedHeight / 2;
+	const centerY = adjustedChartHeight / 2;
 
 	// Calculate the angle between each (use original data length for consistent spacing)
 	const padAngle = gapScale * ( ( 2 * Math.PI ) / data.length );
@@ -273,22 +281,24 @@ const PieChartInternal = ( {
 			value={ {
 				chartId,
 				chartWidth: width,
-				chartHeight: adjustedHeight,
+				chartHeight: adjustedChartHeight,
 			} }
 		>
 			<div
 				ref={ containerRef }
-				className={ clsx( 'pie-chart', styles[ 'pie-chart' ], className ) }
-				style={ {
-					display: 'flex',
-					flexDirection: showLegend && legendPosition === 'top' ? 'column-reverse' : 'column',
-				} }
+				className={ clsx(
+					'pie-chart',
+					styles[ 'pie-chart' ],
+					containerStyles[ 'chart-container' ],
+					containerStyles[ containerClassName ],
+					className
+				) }
 			>
 				<svg
-					viewBox={ `0 0 ${ width } ${ adjustedHeight }` }
+					viewBox={ `0 0 ${ width } ${ adjustedChartHeight }` }
 					preserveAspectRatio="xMidYMid meet"
 					width={ width }
-					height={ adjustedHeight }
+					height={ adjustedChartHeight }
 				>
 					<Group top={ centerY } left={ centerX }>
 						{ allSegmentsHidden ? (

diff --git a/projects/js-packages/charts/src/components/pie-semi-circle-chart/pie-semi-circle-chart.tsx b/projects/js-packages/charts/src/components/pie-semi-circle-chart/pie-semi-circle-chart.tsx
@@ -6,14 +6,15 @@ import { useTooltip, useTooltipInPortal } from '@visx/tooltip';
 import { __ } from '@wordpress/i18n';
 import clsx from 'clsx';
 import { useCallback, useContext, useMemo } from 'react';
-import { useElementHeight, useInteractiveLegendData } from '../../hooks';
+import { useElementHeight, useInteractiveLegendData, useLegendLayout } from '../../hooks';
 import {
 	GlobalChartsProvider,
 	useChartId,
 	useChartRegistration,
 	useGlobalChartsContext,
 	GlobalChartsContext,
 } from '../../providers';
+import containerStyles from '../../styles/chart-container.module.scss';
 import { attachSubComponents } from '../../utils';
 import { Legend, useChartLegendItems } from '../legend';
 import { ChartSVG, ChartHTML, useChartChildren } from '../private/chart-composition';
@@ -249,6 +250,18 @@ const PieSemiCircleChartInternal: FC< PieSemiCircleChartProps > = ( {
 		metadata: chartMetadata,
 	} );
 
+	// Calculate chart dimensions
+	// TODO: we might want to accept height as a prop in the future, because the height of container might not always be enough.
+	const height = width / 2;
+
+	// Use the legend layout hook for consistent calculations
+	const { adjustedChartHeight, containerClassName } = useLegendLayout( {
+		height,
+		showLegend,
+		legendPosition,
+		legendHeight,
+	} );
+
 	if ( ! isValid ) {
 		return (
 			<div className={ styles[ 'pie-semi-circle-chart' ] }>
@@ -260,13 +273,7 @@ const PieSemiCircleChartInternal: FC< PieSemiCircleChartProps > = ( {
 			</div>
 		);
 	}
-
-	// Calculate chart dimensions
-	// TODO: we might want to accept height as a prop in the future, because the height of container might not always be enough.
-	const height = width / 2;
-	// The chart only takes the height minus the legend height.
-	const chartHeight = height - ( showLegend && legendPosition === 'top' ? legendHeight : 0 );
-	const radius = Math.min( width / 2, chartHeight );
+	const radius = Math.min( width / 2, adjustedChartHeight );
 	const innerRadius = radius * ( 1 - thickness );
 
 	// Map data with index for color assignment
@@ -293,21 +300,23 @@ const PieSemiCircleChartInternal: FC< PieSemiCircleChartProps > = ( {
 		>
 			<div
 				ref={ containerRef }
-				className={ clsx( 'pie-semi-circle-chart', styles[ 'pie-semi-circle-chart' ], className ) }
+				className={ clsx(
+					'pie-semi-circle-chart',
+					styles[ 'pie-semi-circle-chart' ],
+					containerStyles[ 'chart-container' ],
+					containerStyles[ containerClassName ],
+					className
+				) }
 				data-testid="pie-chart-container"
-				style={ {
-					display: 'flex',
-					flexDirection: showLegend && legendPosition === 'top' ? 'column-reverse' : 'column',
-				} }
 			>
 				<svg
 					width={ width }
 					height={ radius }
-					viewBox={ `0 0 ${ width } ${ chartHeight }` }
+					viewBox={ `0 0 ${ width } ${ adjustedChartHeight }` }
 					data-testid="pie-chart-svg"
 				>
 					{ /* Main chart group centered horizontally and positioned at bottom */ }
-					<Group top={ chartHeight } left={ width / 2 }>
+					<Group top={ adjustedChartHeight } left={ width / 2 }>
 						{ allSegmentsHidden ? (
 							<text
 								textAnchor="middle"

diff --git a/projects/js-packages/charts/src/hooks/index.ts b/projects/js-packages/charts/src/hooks/index.ts
@@ -7,3 +7,4 @@ export { useElementHeight } from './use-element-height';
 export { useTextTruncation } from './use-text-truncation';
 export { useZeroValueDisplay } from './use-zero-value-display';
 export { useInteractiveLegendData } from './use-interactive-legend-data';
+export { useLegendLayout } from './use-legend-layout';