🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(charts): Make PieChart colors match other charts (#17875)
Ben Bachem9b7ccf67af07
diff --git a/web/src/components/design-system/charts/HorizontalBarChart/HorizontalBarChart.tsx b/web/src/components/design-system/charts/HorizontalBarChart/HorizontalBarChart.tsxindex a884efc93a..4bd9850a03 100644--- a/web/src/components/design-system/charts/HorizontalBarChart/HorizontalBarChart.tsx+++ b/web/src/components/design-system/charts/HorizontalBarChart/HorizontalBarChart.tsx@@ -3,6 +3,7 @@import { scaleLinear } from "d3-scale";import { ChartContainer } from "@/src/components/design-system/charts/ChartContainer";+import { INACTIVE_CHART_COLOR_STRENGTH } from "@/src/components/design-system/charts/constants";import type { BarChartDatum } from "@/src/components/design-system/internal/charts/BarChartCore";import { CARTESIAN_CHART_INSETS } from "@/src/components/design-system/internal/charts/CartesianLayout";import { ChartTooltip } from "@/src/components/design-system/internal/charts/ChartTooltip";@@ -192,7 +193,7 @@ export function HorizontalBarChart({rx={Math.min(4, rowHeight / 2)}fill={inactive- ? `color-mix(in srgb, ${datum.color ?? color} 20%, hsl(var(--background)))`+ ? `color-mix(in srgb, ${datum.color ?? color} ${INACTIVE_CHART_COLOR_STRENGTH}%, hsl(var(--background)))`: (datum.color ?? color)}pointerEvents="none"diff --git a/web/src/components/design-system/charts/PieChart/PieChart.stories.tsx b/web/src/components/design-system/charts/PieChart/PieChart.stories.tsxindex 8ce5bb7701..90ecf1971f 100644--- a/web/src/components/design-system/charts/PieChart/PieChart.stories.tsx+++ b/web/src/components/design-system/charts/PieChart/PieChart.stories.tsx@@ -1,5 +1,6 @@import preview from "../../../../../.storybook/preview";import { expect, spyOn, userEvent, within } from "storybook/test";+import { chartColors } from "../constants";import { PieChart } from "./PieChart";const data = [@@ -29,9 +30,27 @@ const meta = preview.meta({export const Default = meta.story({});-export const SubtleFill = meta.story({- args: {- variant: "subtle",+export const HoverColors = meta.story({+ name: "(Test) Hover Colors",+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const first = canvas.getByRole("graphics-symbol", { name: "GPT-5: 46" });+ const second = canvas.getByRole("graphics-symbol", {+ name: "Claude Sonnet: 31",+ });++ await expect(first).toHaveAttribute("fill", chartColors[0]);+ await expect(second).toHaveAttribute("fill", chartColors[1]);++ await userEvent.hover(first);+ await expect(first).toHaveAttribute("fill", chartColors[0]);+ await expect(second).toHaveAttribute(+ "fill",+ expect.stringContaining("20%"),+ );++ await userEvent.unhover(first);+ await expect(second).toHaveAttribute("fill", chartColors[1]);},});diff --git a/web/src/components/design-system/charts/PieChart/PieChart.tsx b/web/src/components/design-system/charts/PieChart/PieChart.tsxindex 8587d40f09..b18fa4c476 100644--- a/web/src/components/design-system/charts/PieChart/PieChart.tsx+++ b/web/src/components/design-system/charts/PieChart/PieChart.tsx@@ -6,7 +6,10 @@ import { arc, pie, type PieArcDatum } from "d3-shape";import { ChartContainer } from "@/src/components/design-system/charts/ChartContainer";import { ChartTooltip } from "@/src/components/design-system/internal/charts/ChartTooltip";-import { chartColors } from "@/src/components/design-system/charts/chartColors";+import {+ chartColors,+ INACTIVE_CHART_COLOR_STRENGTH,+} from "@/src/components/design-system/charts/constants";import { cn } from "@/src/utils/tailwind";export type PieChartDatum = {@@ -23,7 +26,6 @@ type PieChartProps = {data: PieChartDatum[];valueFormatter?: (value: number) => string;centerLabel?: string;- variant?: "default" | "subtle";ariaLabel?: string;};@@ -55,7 +57,6 @@ function PieChartContent({data,valueFormatter = (value) => value.toLocaleString(),centerLabel = "Total",- variant = "default",ariaLabel = "Pie chart",availableSize,}: PieChartProps & { availableSize: number }) {@@ -170,19 +171,19 @@ function PieChartContent({{chartSlices.map(({ slice, index, path, activePath, color }) => {const isActive = activeIndex === index;- let opacity = 0.82;- if (variant === "subtle") opacity = isActive ? 0.9 : 0.45;- if (isActive && variant === "default") opacity = 1;+ const fill =+ activeIndex !== undefined && !isActive+ ? `color-mix(in srgb, ${color} ${INACTIVE_CHART_COLOR_STRENGTH}%, hsl(var(--background)))`+ : color;return (<pathkey={slice.data.id}d={isActive ? activePath : path}- fill={color}- opacity={opacity}+ fill={fill}stroke="hsl(var(--background))"strokeWidth={isActive ? 4 : 3}- className="outline-hidden transition-[opacity] duration-100 focus-visible:outline-2 focus-visible:outline-offset-2"+ className="outline-hidden transition-[fill] duration-100 focus-visible:outline-2 focus-visible:outline-offset-2"role="graphics-symbol"tabIndex={0}aria-label={`${slice.data.label}: ${valueFormatter(slice.data.value)}`}diff --git a/web/src/components/design-system/charts/chartColors.ts b/web/src/components/design-system/charts/constants.tssimilarity index 74%rename from web/src/components/design-system/charts/chartColors.tsrename to web/src/components/design-system/charts/constants.tsindex b90a656b6b..7b9ea2e2d5 100644--- a/web/src/components/design-system/charts/chartColors.ts+++ b/web/src/components/design-system/charts/constants.ts@@ -8,3 +8,5 @@ export const chartColors = ["#82cb15","#ec4699",] as const;++export const INACTIVE_CHART_COLOR_STRENGTH = 20;diff --git a/web/src/components/design-system/internal/charts/BarChartCore.tsx b/web/src/components/design-system/internal/charts/BarChartCore.tsxindex 90b9f588c4..f584d07c4c 100644--- a/web/src/components/design-system/internal/charts/BarChartCore.tsx+++ b/web/src/components/design-system/internal/charts/BarChartCore.tsx@@ -3,6 +3,7 @@import { scaleLinear } from "d3-scale";import { ChartContainer } from "@/src/components/design-system/charts/ChartContainer";+import { INACTIVE_CHART_COLOR_STRENGTH } from "@/src/components/design-system/charts/constants";import { CartesianChart } from "@/src/components/design-system/internal/charts/CartesianChart";import { CartesianLayout } from "@/src/components/design-system/internal/charts/CartesianLayout";import {@@ -171,7 +172,10 @@ export function BarChartCore({colorStrength = active ? 60 : 30;}if (activeIndex !== undefined && !active) {- colorStrength = variant === "subtle" ? 15 : 20;+ colorStrength =+ variant === "subtle"+ ? 15+ : INACTIVE_CHART_COLOR_STRENGTH;}const fill =colorStrength === 100diff --git a/web/src/features/widgets/chart-library/Chart.tsx b/web/src/features/widgets/chart-library/Chart.tsxindex 7a7efe3e7f..55b4a53cdb 100644--- a/web/src/features/widgets/chart-library/Chart.tsx+++ b/web/src/features/widgets/chart-library/Chart.tsx@@ -254,7 +254,6 @@ const ChartComponent = ({<PieChartdata={renderedData.slice(0, rowLimit)}metricFormatter={metricFormatter}- subtleFill={chartConfig?.subtle_fill}/>);case "HISTOGRAM":diff --git a/web/src/features/widgets/chart-library/PieChart.tsx b/web/src/features/widgets/chart-library/PieChart.tsxindex f8a4fe543f..06efa2a988 100644--- a/web/src/features/widgets/chart-library/PieChart.tsx+++ b/web/src/features/widgets/chart-library/PieChart.tsx@@ -11,11 +11,10 @@ import {* @param data - Data to be displayed. Expects an array of objects with dimension and metric properties.*/export const PieChart: React.FC<- Pick<ChartProps, "data" | "metricFormatter" | "subtleFill">+ Pick<ChartProps, "data" | "metricFormatter">> = ({data,metricFormatter = (value, options) => formatMetric(value, options),- subtleFill = false,}) => {const formatValue = (value: number) =>toFullMetricString(metricFormatter(value, { style: "compact" }));@@ -27,11 +26,5 @@ export const PieChart: React.FC<}));}, [data]);- return (- <DesignSystemPieChart- data={chartData}- valueFormatter={formatValue}- variant={subtleFill ? "subtle" : "default"}- />- );+ return <DesignSystemPieChart data={chartData} valueFormatter={formatValue} />;};