Skip to content

fix: chart hover finds the nearest point, so the live range shows its tooltip #25

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
AmrMsCLL wants to merge 1 commit into from
Closed

fix: chart hover finds the nearest point, so the live range shows its tooltip #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions app/src/web/components/Chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,19 @@ function useWidth() {
return { ref, width };
}

function Breakdown({ lines, at, metric, total, format }: { lines: Series[]; at: number; metric: Metric; total: number; format: (value: number) => string }) {
function near(points: Series['points'], at: number, step: number) {
let best: Series['points'][number] | undefined;
for (const point of points) {
if (Math.abs(point.at - at) <= step / 2 && (!best || Math.abs(point.at - at) < Math.abs(best.at - at))) {
best = point;
}
}
return best;
}

function Breakdown({ lines, at, step, metric, total, format }: { lines: Series[]; at: number; step: number; metric: Metric; total: number; format: (value: number) => string }) {
const parts = lines
.map((line) => ({ name: line.name, value: line.points.find((point) => point.at === at)?.[metric] ?? 0 }))
.map((line) => ({ name: line.name, value: near(line.points, at, step)?.[metric] ?? 0 }))
.filter((part) => part.value > 0)
.sort((a, b) => b.value - a.value);
const rest = total - parts.reduce((sum, part) => sum + part.value, 0);
Expand Down Expand Up @@ -94,7 +104,7 @@ export function Chart({ label, series, metric, span, step, now, format, max, bre

const values = hover
? plotted
.map((line) => ({ name: line.name, point: line.points.find((point) => point.at === hover.at) }))
.map((line) => ({ name: line.name, point: near(line.points, hover.at, step) }))
.filter((entry): entry is { name: string; point: Series['points'][number] } => entry.point !== undefined)
.sort((a, b) => b.point[metric] - a.point[metric])
: [];
Expand All @@ -105,10 +115,10 @@ export function Chart({ label, series, metric, span, step, now, format, max, bre
const pointerY = event.clientY - bounds.top;
const at = Math.round((start + ((pointerX - pad.left) / Math.max(1, width - pad.left - pad.right)) * span) / step) * step;
const nearest = plotted
.map((line) => ({ name: line.name, point: line.points.find((point) => point.at === at) }))
.map((line) => ({ name: line.name, point: near(line.points, at, step) }))
.filter((entry) => entry.point)
.sort((a, b) => Math.abs(y(a.point![metric]) - pointerY) - Math.abs(y(b.point![metric]) - pointerY))[0];
setHover(at >= start && at <= now ? { at, name: nearest?.name, x: x(at) } : undefined);
setHover(at >= start - step / 2 && at <= now + step / 2 ? { at, name: nearest?.name, x: x(at) } : undefined);
};

const ticks = (width < 480 ? [0, 0.5, 1] : [0, 0.25, 0.5, 0.75, 1]).map((fraction) => start + fraction * span);
Expand Down Expand Up @@ -185,7 +195,7 @@ export function Chart({ label, series, metric, span, step, now, format, max, bre
<span className={name === hover.name ? 'font-semibold' : ''}>{format(point[metric])}</span>
</p>
))}
{breakdown && <Breakdown at={hover.at} format={format} lines={breakdown} metric={metric} total={values[0].point[metric]} />}
{breakdown && <Breakdown at={hover.at} format={format} lines={breakdown} metric={metric} step={step} total={values[0].point[metric]} />}
</div>
)}
{series.length > 1 && (
Expand Down
Loading