Skip to content

fix(build): really remove leftover merge conflict markers #293

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

Merged
Flotapponnier merged 1 commit into from
Jun 3, 2026
Merged

fix(build): really remove leftover merge conflict markers #293

Show file tree
Hide file tree
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
10 changes: 0 additions & 10 deletions src/components/distribution-chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ export function DistributionChart({
onToggleExclude,
onResetExcluded,
topNControl,
<<<<<<< HEAD
=======
disableTopN,
>>>>>>> origin/dev
headerActions,
}: {
benchmark: Benchmark;
Expand All @@ -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(
Expand All @@ -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],
Expand Down
10 changes: 0 additions & 10 deletions src/components/donut-chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,15 @@ export function DonutChart({
excluded: controlledExcluded,
onToggleExclude,
topNControl,
<<<<<<< HEAD
=======
disableTopN,
>>>>>>> origin/dev
headerActions,
}: {
benchmark: Benchmark;
excluded?: Set<string>;
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(
Expand All @@ -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
Expand Down
Loading