Skip to content

Commit 6167267

Browse files
refactor(web): the usage chart keeps its caching without "use memo"
Hover state moves into a UsageChartPlot child, and the tooltip into UsageChartTooltip, so the chart build in UsageProviderChart no longer depends on hoverIndex and is cached on its props alone. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent af39520 commit 6167267

1 file changed

Lines changed: 194 additions & 152 deletions

File tree

‎apps/web/src/components/usage/UsageProviderChart.tsx‎

Lines changed: 194 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -223,52 +223,91 @@ function buildChart(
223223
return { columns, scale, stepX, paths: paths.toSorted((a, b) => b.total - a.total) };
224224
}
225225

226-
// Rebuilding the chart walks every period and provider; keep it cached across hover renders.
227-
function useChart(
228-
periods: readonly string[],
229-
totals: readonly DailyTotals[] | readonly HourlyTotals[],
230-
metric: UsageChartMetric,
231-
providers: readonly UsageProviderKind[],
232-
loadingProviders: ReadonlySet<UsageProviderKind>,
233-
) {
234-
"use memo";
235-
const byPeriod = new Map<string, DailyTotals | HourlyTotals>(
236-
totals.map((entry) => ["hourStart" in entry ? entry.hourStart : entry.day, entry]),
226+
function UsageChartTooltip({
227+
tooltipRef,
228+
label,
229+
column,
230+
providers,
231+
loadingProviders,
232+
format,
233+
}: {
234+
readonly tooltipRef: React.Ref<HTMLDivElement>;
235+
readonly label: string;
236+
readonly column: DayColumn | undefined;
237+
readonly providers: readonly UsageProviderKind[];
238+
readonly loadingProviders: ReadonlySet<UsageProviderKind>;
239+
readonly format: (value: number) => string;
240+
}) {
241+
const partial = providers.some((provider) => loadingProviders.has(provider));
242+
return (
243+
<div
244+
ref={tooltipRef}
245+
className="surface-glass pointer-events-none absolute z-10 min-w-36 max-w-full rounded-xl border border-border/50 px-2.5 py-2 text-xs shadow-lg"
246+
style={{
247+
left: "var(--usage-tooltip-left, 0px)",
248+
top: "var(--usage-tooltip-top, 0px)",
249+
}}
250+
>
251+
<div className="mb-1 text-muted-foreground">{label}</div>
252+
{providers.map((provider) => {
253+
const { label: providerLabel, driverKind } = PROVIDER_PRESENTATION[provider];
254+
return (
255+
<div key={provider} className="flex items-center justify-between gap-3">
256+
<span className="flex items-center gap-1.5 text-muted-foreground">
257+
<ProviderInstanceIcon
258+
driverKind={driverKind}
259+
displayName={providerLabel}
260+
iconClassName="size-3"
261+
/>
262+
{providerLabel}
263+
</span>
264+
<span
265+
className={cn(
266+
"tabular-nums",
267+
loadingProviders.has(provider) ? "text-muted-foreground" : "text-foreground",
268+
)}
269+
>
270+
{format(column?.bands.find((band) => band.provider === provider)?.value ?? 0)}
271+
</span>
272+
</div>
273+
);
274+
})}
275+
<div className="mt-1 flex items-center justify-between gap-3 border-t border-border pt-1">
276+
<span className="text-muted-foreground">Total</span>
277+
<span className={cn("tabular-nums", partial ? "text-muted-foreground" : "text-foreground")}>
278+
{format(column?.total ?? 0)}
279+
</span>
280+
</div>
281+
</div>
237282
);
238-
return buildChart(periods, byPeriod, metric, providers, loadingProviders);
239283
}
240284

241-
export function UsageProviderChart({
285+
function UsageChartPlot({
286+
periods,
287+
columns,
288+
stepX,
242289
providers,
243-
loadingProviders = NONE_LOADING,
244-
days,
245-
daily,
246-
hours,
247-
hourly,
248-
metric,
249-
referenceTime,
250-
resolution,
251-
timeZone,
252-
}: UsageProviderChartProps) {
253-
const periods = resolution === "hour" ? hours : days;
254-
const { columns, scale, paths, stepX } = useChart(
255-
periods,
256-
resolution === "hour" ? hourly : daily,
257-
metric,
258-
providers,
259-
loadingProviders,
260-
);
290+
loadingProviders,
291+
format,
292+
formatTooltipPeriod,
293+
ariaLabel,
294+
children,
295+
}: {
296+
readonly periods: readonly string[];
297+
readonly columns: readonly DayColumn[];
298+
readonly stepX: number;
299+
readonly providers: readonly UsageProviderKind[];
300+
readonly loadingProviders: ReadonlySet<UsageProviderKind>;
301+
readonly format: (value: number) => string;
302+
readonly formatTooltipPeriod: (period: string) => string;
303+
readonly ariaLabel: string;
304+
readonly children: React.ReactNode;
305+
}) {
261306
const [hoverIndex, setHoverIndex] = useState<number | null>(null);
262307
const plotRef = useRef<HTMLDivElement | null>(null);
263308
const tooltipRef = useRef<HTMLDivElement | null>(null);
264309
const hoverPositionRef = useRef<{ x: number; y: number } | null>(null);
265310

266-
const toY = (value: number) => valueToY(value, scale.max);
267-
const seriesClassName = (loading: boolean) =>
268-
cn("transition-opacity", loading && "opacity-40 delay-150");
269-
270-
const format = metric === "tokens" ? formatTokens : formatUsd;
271-
272311
const positionTooltip = () => {
273312
const plot = plotRef.current;
274313
const tooltip = tooltipRef.current;
@@ -320,8 +359,82 @@ export function UsageProviderChart({
320359
};
321360

322361
const hoveredPeriod = hoverIndex === null ? undefined : periods[hoverIndex];
323-
const hoveredColumn = hoverIndex === null ? undefined : columns[hoverIndex];
324-
const partial = providers.some((provider) => loadingProviders.has(provider));
362+
363+
return (
364+
<div
365+
ref={plotRef}
366+
className="relative h-56 flex-1"
367+
onMouseMove={handleMove}
368+
onMouseLeave={() => {
369+
hoverPositionRef.current = null;
370+
setHoverIndex(null);
371+
}}
372+
>
373+
<svg
374+
className="h-full w-full"
375+
viewBox={`0 0 ${VIEW_WIDTH} ${VIEW_HEIGHT}`}
376+
preserveAspectRatio="none"
377+
role="img"
378+
aria-label={ariaLabel}
379+
>
380+
{children}
381+
{hoverIndex === null ? null : (
382+
<line
383+
x1={hoverIndex * stepX}
384+
x2={hoverIndex * stepX}
385+
y1={PLOT_TOP}
386+
y2={VIEW_HEIGHT}
387+
stroke="currentColor"
388+
strokeWidth={1}
389+
className="text-muted-foreground"
390+
vectorEffect="non-scaling-stroke"
391+
/>
392+
)}
393+
</svg>
394+
395+
{hoverIndex === null || hoveredPeriod === undefined ? null : (
396+
<UsageChartTooltip
397+
tooltipRef={tooltipRef}
398+
label={formatTooltipPeriod(hoveredPeriod)}
399+
column={columns[hoverIndex]}
400+
providers={providers}
401+
loadingProviders={loadingProviders}
402+
format={format}
403+
/>
404+
)}
405+
</div>
406+
);
407+
}
408+
409+
export function UsageProviderChart({
410+
providers,
411+
loadingProviders = NONE_LOADING,
412+
days,
413+
daily,
414+
hours,
415+
hourly,
416+
metric,
417+
referenceTime,
418+
resolution,
419+
timeZone,
420+
}: UsageProviderChartProps) {
421+
const periods = resolution === "hour" ? hours : days;
422+
const totals: readonly (DailyTotals | HourlyTotals)[] = resolution === "hour" ? hourly : daily;
423+
const byPeriod = new Map(
424+
totals.map((entry) => ["hourStart" in entry ? entry.hourStart : entry.day, entry]),
425+
);
426+
const { columns, scale, paths, stepX } = buildChart(
427+
periods,
428+
byPeriod,
429+
metric,
430+
providers,
431+
loadingProviders,
432+
);
433+
434+
const toY = (value: number) => valueToY(value, scale.max);
435+
const seriesClassName = (loading: boolean) =>
436+
cn("transition-opacity", loading && "opacity-40 delay-150");
437+
const format = metric === "tokens" ? formatTokens : formatUsd;
325438
const formatPeriod = (period: string) =>
326439
resolution === "hour" ? formatHourShort(period, timeZone) : formatDayShort(period);
327440
const formatTooltipPeriod = (period: string) =>
@@ -346,125 +459,54 @@ export function UsageProviderChart({
346459
: null}
347460
</div>
348461

349-
<div
350-
ref={plotRef}
351-
className="relative h-56 flex-1"
352-
onMouseMove={handleMove}
353-
onMouseLeave={() => {
354-
hoverPositionRef.current = null;
355-
setHoverIndex(null);
356-
}}
462+
<UsageChartPlot
463+
periods={periods}
464+
columns={columns}
465+
stepX={stepX}
466+
providers={providers}
467+
loadingProviders={loadingProviders}
468+
format={format}
469+
formatTooltipPeriod={formatTooltipPeriod}
470+
ariaLabel={`${resolution === "hour" ? "Hourly" : "Daily"} ${metric === "tokens" ? "processed tokens" : "cost"} by provider`}
357471
>
358-
<svg
359-
className="h-full w-full"
360-
viewBox={`0 0 ${VIEW_WIDTH} ${VIEW_HEIGHT}`}
361-
preserveAspectRatio="none"
362-
role="img"
363-
aria-label={`${resolution === "hour" ? "Hourly" : "Daily"} ${metric === "tokens" ? "processed tokens" : "cost"} by provider`}
364-
>
365-
{scale.ticks.map((tick) => {
366-
const y = toY(tick);
367-
return (
368-
<line
369-
key={tick}
370-
x1={0}
371-
x2={VIEW_WIDTH}
372-
y1={y}
373-
y2={y}
374-
stroke="currentColor"
375-
strokeWidth={1}
376-
className="text-border"
377-
vectorEffect="non-scaling-stroke"
378-
/>
379-
);
380-
})}
381-
382-
{paths.map(({ provider, loading, area }) => (
383-
<path
384-
key={provider}
385-
d={area}
386-
className={seriesClassName(loading)}
387-
fill={PROVIDER_PRESENTATION[provider].color}
388-
fillOpacity={0.12}
389-
/>
390-
))}
391-
{paths.map(({ provider, loading, line }) => (
392-
<path
393-
key={provider}
394-
d={line}
395-
className={seriesClassName(loading)}
396-
fill="none"
397-
stroke={PROVIDER_PRESENTATION[provider].color}
398-
strokeWidth={2}
399-
vectorEffect="non-scaling-stroke"
400-
/>
401-
))}
402-
403-
{hoverIndex === null ? null : (
472+
{scale.ticks.map((tick) => {
473+
const y = toY(tick);
474+
return (
404475
<line
405-
x1={hoverIndex * stepX}
406-
x2={hoverIndex * stepX}
407-
y1={PLOT_TOP}
408-
y2={VIEW_HEIGHT}
476+
key={tick}
477+
x1={0}
478+
x2={VIEW_WIDTH}
479+
y1={y}
480+
y2={y}
409481
stroke="currentColor"
410482
strokeWidth={1}
411-
className="text-muted-foreground"
483+
className="text-border"
412484
vectorEffect="non-scaling-stroke"
413485
/>
414-
)}
415-
</svg>
416-
417-
{hoveredPeriod === undefined ? null : (
418-
<div
419-
ref={tooltipRef}
420-
className="surface-glass pointer-events-none absolute z-10 min-w-36 max-w-full rounded-xl border border-border/50 px-2.5 py-2 text-xs shadow-lg"
421-
style={{
422-
left: "var(--usage-tooltip-left, 0px)",
423-
top: "var(--usage-tooltip-top, 0px)",
424-
}}
425-
>
426-
<div className="mb-1 text-muted-foreground">{formatTooltipPeriod(hoveredPeriod)}</div>
427-
{providers.map((provider) => {
428-
const { label, driverKind } = PROVIDER_PRESENTATION[provider];
429-
return (
430-
<div key={provider} className="flex items-center justify-between gap-3">
431-
<span className="flex items-center gap-1.5 text-muted-foreground">
432-
<ProviderInstanceIcon
433-
driverKind={driverKind}
434-
displayName={label}
435-
iconClassName="size-3"
436-
/>
437-
{label}
438-
</span>
439-
<span
440-
className={cn(
441-
"tabular-nums",
442-
loadingProviders.has(provider)
443-
? "text-muted-foreground"
444-
: "text-foreground",
445-
)}
446-
>
447-
{format(
448-
hoveredColumn?.bands.find((band) => band.provider === provider)?.value ?? 0,
449-
)}
450-
</span>
451-
</div>
452-
);
453-
})}
454-
<div className="mt-1 flex items-center justify-between gap-3 border-t border-border pt-1">
455-
<span className="text-muted-foreground">Total</span>
456-
<span
457-
className={cn(
458-
"tabular-nums",
459-
partial ? "text-muted-foreground" : "text-foreground",
460-
)}
461-
>
462-
{format(hoveredColumn?.total ?? 0)}
463-
</span>
464-
</div>
465-
</div>
466-
)}
467-
</div>
486+
);
487+
})}
488+
489+
{paths.map(({ provider, loading, area }) => (
490+
<path
491+
key={provider}
492+
d={area}
493+
className={seriesClassName(loading)}
494+
fill={PROVIDER_PRESENTATION[provider].color}
495+
fillOpacity={0.12}
496+
/>
497+
))}
498+
{paths.map(({ provider, loading, line }) => (
499+
<path
500+
key={provider}
501+
d={line}
502+
className={seriesClassName(loading)}
503+
fill="none"
504+
stroke={PROVIDER_PRESENTATION[provider].color}
505+
strokeWidth={2}
506+
vectorEffect="non-scaling-stroke"
507+
/>
508+
))}
509+
</UsageChartPlot>
468510
</div>
469511

470512
<div className="flex justify-between pl-16 text-3xs text-muted-foreground uppercase">

0 commit comments

Comments
 (0)