diff --git a/client-di2/src/pages/calculations.tsx b/client-di2/src/pages/calculations.tsx index 0ab5f6a..bacfeb7 100644 --- a/client-di2/src/pages/calculations.tsx +++ b/client-di2/src/pages/calculations.tsx @@ -595,12 +595,19 @@ function formatQuarterLabel(q: string): string { return `${q.slice(0, 4)} Q${quarter}`; } -function ChartTooltip({ active, payload, label, formatValue }: any) { +function ChartTooltip({ active, payload, label, formatValue, seriesOrder }: any) { if (!active || !payload?.length) return null; + const items = seriesOrder + ? [...payload].sort((a: any, b: any) => { + const ia = seriesOrder.indexOf(a.dataKey); + const ib = seriesOrder.indexOf(b.dataKey); + return (ia === -1 ? 999 : ia) - (ib === -1 ? 999 : ib); + }) + : payload; return (
{label}
- {payload.map((entry: any) => ( + {items.map((entry: any) => (