From f9d7cea763fd5df63ecc3c69228946f18e2f0aa3 Mon Sep 17 00:00:00 2001 From: Florent Tapponnier Date: Wed, 3 Jun 2026 16:57:32 +0200 Subject: [PATCH] fix(build): really remove leftover merge conflict markers --- src/components/distribution-chart.tsx | 10 ---------- src/components/donut-chart.tsx | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/src/components/distribution-chart.tsx b/src/components/distribution-chart.tsx index 9493b65f..fa2d3fae 100644 --- a/src/components/distribution-chart.tsx +++ b/src/components/distribution-chart.tsx @@ -51,10 +51,7 @@ export function DistributionChart({ onToggleExclude, onResetExcluded, topNControl, -<<<<<<< HEAD -======= disableTopN, ->>>>>>> origin/dev headerActions, }: { benchmark: Benchmark; @@ -67,10 +64,7 @@ export function DistributionChart({ * the card corner or eating a footer row of its own. */ headerActions?: ReactNode; topNControl?: { topN: number | null; setTopN: (n: number | null) => void }; -<<<<<<< HEAD -======= disableTopN?: boolean; ->>>>>>> origin/dev }) { const { results, unit, higherIsBetter } = benchmark; const { excluded, toggle, reset } = useChartExclusion( @@ -96,11 +90,7 @@ export function DistributionChart({ ); // Top-N selector — shared shape with the other chart views so the // reader can focus on the top tail without losing the option to widen. -<<<<<<< HEAD - const { topN, setTopN, topNOptions } = useTopN(sortedAll.length, { external: topNControl }); -======= const { topN, setTopN, topNOptions } = useTopN(sortedAll.length, { external: topNControl, disabled: disableTopN }); ->>>>>>> origin/dev const sorted = useMemo( () => (topN == null ? sortedAll : sortedAll.slice(0, topN)), [sortedAll, topN], diff --git a/src/components/donut-chart.tsx b/src/components/donut-chart.tsx index 00f1db93..8fcb1e69 100644 --- a/src/components/donut-chart.tsx +++ b/src/components/donut-chart.tsx @@ -39,10 +39,7 @@ export function DonutChart({ excluded: controlledExcluded, onToggleExclude, topNControl, -<<<<<<< HEAD -======= disableTopN, ->>>>>>> origin/dev headerActions, }: { benchmark: Benchmark; @@ -50,10 +47,7 @@ export function DonutChart({ onToggleExclude?: (slug: string) => void; headerActions?: ReactNode; topNControl?: { topN: number | null; setTopN: (n: number | null) => void }; -<<<<<<< HEAD -======= disableTopN?: boolean; ->>>>>>> origin/dev }) { const { results } = benchmark; const { excluded, toggle } = useChartExclusion( @@ -68,11 +62,7 @@ export function DonutChart({ // Top-N selector — clip the cohort BEFORE applying exclusion so the // "top N" semantic matches what every other view shows. Sized off // the live provider count via the shared `useTopN` hook. -<<<<<<< HEAD - const { topN, setTopN, topNOptions } = useTopN(liveAll.length, { external: topNControl }); -======= const { topN, setTopN, topNOptions } = useTopN(liveAll.length, { external: topNControl, disabled: disableTopN }); ->>>>>>> origin/dev const liveClipped = useMemo( () => topN == null