Skip to content

fix: Optimises initial chart rendering when using bottom legend #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jsilll wants to merge 2 commits into from
Closed

fix: Optimises initial chart rendering when using bottom legend #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d369030
fix: hide chart during footer measurement when using bottom legend
jsilll Apr 28, 2026
07ef104
refactor: remove unused effectiveChartHeight parameter
jsilll Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/core/chart-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function ChartContainer({
const withMinHeight = (height: number) => Math.max(chartMinHeight ?? DEFAULT_CHART_MIN_HEIGHT, height) - heightOffset;
const measuredChartHeight = withMinHeight(measures.chart - measures.header - measures.footer);
const effectiveChartHeight = fitHeight ? measuredChartHeight : withMinHeight(chartHeight ?? DEFAULT_CHART_HEIGHT);
const hasLegend = primaryLegend || secondaryLegend;
const hasLegend = !!(primaryLegend || secondaryLegend);
return (
<div
ref={refs.chart}
Expand Down Expand Up @@ -99,8 +99,14 @@ export function ChartContainer({
</div>
) : (
<div
style={chartMinWidth !== undefined ? { minInlineSize: chartMinWidth } : {}}
className={clsx(styles["chart-plot-wrapper"], testClasses["chart-plot-wrapper"])}
style={getChartPlotWrapperStyles({
measures,
fitHeight,
hasLegend,
chartMinWidth,
legendPosition,
})}
>
{verticalAxisTitle}
{chart(effectiveChartHeight)}
Expand All @@ -125,10 +131,37 @@ export function ChartContainer({
);
}

/**
* Computes the styles for the chart plot wrapper in the bottom/no-legend layout case.
* Includes visibility hiding when waiting for footer measurements with bottom legend.
* When fitHeight is enabled with a bottom legend, we must wait for the footer measurements to complete before
* we can compute the correct chart height. During this time, the chart is rendered but hidden with CSS.
*/
function getChartPlotWrapperStyles({
measures,
fitHeight,
hasLegend,
chartMinWidth,
legendPosition,
}: {
hasLegend: boolean;
fitHeight?: boolean;
chartMinWidth?: number;
legendPosition: "bottom" | "side";
measures: { header: number; footer: number; chart: number };
}): React.CSSProperties {
const needsFooterMeasure =
fitHeight && hasLegend && legendPosition !== "side" && measures.footer === 0 && measures.chart > 0;
return {
...(needsFooterMeasure && { visibility: "hidden" }),
...(chartMinWidth !== undefined && { minInlineSize: chartMinWidth }),
};
}

// This hook combines 3 resize observer and does a small optimization to batch their updates in a single set-state.
function useContainerQueries() {
const [measuresState, setMeasuresState] = useState({ ready: false, chart: 0, header: 0, footer: 0 });
const measuresRef = useRef({ ready: false, chart: 0, header: 0, footer: 0 });
const [measuresState, setMeasuresState] = useState({ chart: 0, header: 0, footer: 0 });
const measuresRef = useRef({ chart: 0, header: 0, footer: 0 });
const measureDebounce = useRef(new DebouncedCall()).current;
const setMeasure = (type: "chart" | "header" | "footer", value: number) => {
measuresRef.current[type] = value;
Expand Down
Loading