From 9851fe0e16bd633dbcd4ce26d702cc418b48d988 Mon Sep 17 00:00:00 2001
From: lderuijter <85785995+lderuijter@users.noreply.github.com>
Date: Mon, 15 Jun 2026 22:53:12 +0200
Subject: [PATCH] Requested changes 1-5 all resolved

- Black line is gone.
- Disabled animations (set it to false).
- Correct usage of chart label colors.
- Fixed layout shift (doesn't happen anymore).
- Added TicksLimit for both axis so the seasons chart is not too cramped.
---
 app/components/Chart.module.css               |  1 +
 app/components/Chart.tsx                      | 58 ++++++++++++++-----
 .../routes/u.$identifier.seasons.tsx          |  9 ++-
 3 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/app/components/Chart.module.css b/app/components/Chart.module.css
index b68a1cc8e..e1dc6c140 100644
--- a/app/components/Chart.module.css
+++ b/app/components/Chart.module.css
@@ -1,4 +1,5 @@
 .container {
+	height: var(--chart-height, 200px);
 	width: var(--chart-width);
 	background-color: var(--chart-bg, var(--color-bg-high));
 	border-radius: var(--radius-box);
diff --git a/app/components/Chart.tsx b/app/components/Chart.tsx
index fd3fad3db..cb8664ca6 100644
--- a/app/components/Chart.tsx
+++ b/app/components/Chart.tsx
@@ -26,12 +26,24 @@ ChartJS.register(
 	Tooltip,
 );
 
+const gridColor = "rgba(255, 255, 255, 0.05)";
+const borderColor = "rgba(255, 255, 255, 0.3)";
+const ticksColor = "rgba(255, 255, 255, 0.6)";
+
+const scaleDefaults = {
+	grid: { color: gridColor },
+	border: { color: borderColor },
+	ticks: { color: ticksColor },
+};
+
 export default function Chart({
 	options,
 	containerClassName,
 	headerSuffix,
 	valueSuffix,
 	xAxis,
+	xTicksLimit,
+	yTicksLimit,
 }: {
 	options: [
 		{
@@ -43,6 +55,8 @@ export default function Chart({
 	headerSuffix?: string;
 	valueSuffix?: string;
 	xAxis: "linear" | "localTime";
+	xTicksLimit?: number;
+	yTicksLimit?: number;
 }) {
 	const isHydrated = useHydrated();
 
@@ -92,12 +106,19 @@ export default function Chart({
 		[colors],
 	);
 
-	// Get the grid color based on the current theme
-	const gridColor = React.useMemo(() => {
-		if (typeof document === "undefined") return "rgba(255,255,255,0.1)";
-		const isDark = document.documentElement.classList.contains("dark");
-		return isDark ? "rgba(255, 255, 255, 0.15)" : "rgba(0, 0, 0, 0.1)";
-	}, []);
+	const datasetColors = React.useCallback(
+		(i: number) => {
+			const color = colorList[i % colorList.length];
+			return {
+				borderColor: color,
+				pointBackgroundColor: color,
+				pointBorderColor: color,
+				pointHoverBackgroundColor: color,
+				pointHoverBorderColor: color,
+			};
+		},
+		[colorList],
+	);
 
 	const chartData = React.useMemo(
 		() => ({
@@ -105,14 +126,14 @@ export default function Chart({
 			datasets: options.map((series, i) => ({
 				label: String(i),
 				data: series.data.map((d) => d.secondary),
-				borderColor: colorList[i % colorList.length],
+				...datasetColors(i),
 				pointRadius: 0,
 				pointHoverRadius: 5,
 				hitRadius: 50,
 				backgroundColor: "transparent",
 			})),
 		}),
-		[options, colorList],
+		[options, datasetColors],
 	);
 
 	if (!isHydrated) {
@@ -129,20 +150,31 @@ export default function Chart({
 				id={chartId}
 				data={chartData}
 				options={{
-					maintainAspectRatio: true,
+					animation: false,
+					maintainAspectRatio: false,
 					scales: {
 						x: {
-							grid: { color: gridColor },
+							...scaleDefaults,
 							type: xAxis === "localTime" ? "time" : "linear",
 							ticks: {
+								...scaleDefaults.ticks,
+								maxRotation: 0,
+								maxTicksLimit: xTicksLimit,
 								callback: (value) => {
-									const date = new Date(value as number);
-									return scaleFormatter.format(date);
+									if (xAxis === "localTime") {
+										const date = new Date(value as number);
+										return scaleFormatter.format(date);
+									}
+									return value;
 								},
 							},
 						},
 						y: {
-							grid: { color: gridColor },
+							...scaleDefaults,
+							ticks: {
+								...scaleDefaults.ticks,
+								maxTicksLimit: yTicksLimit,
+							},
 						},
 					},
 					plugins: {
diff --git a/app/features/user-page/routes/u.$identifier.seasons.tsx b/app/features/user-page/routes/u.$identifier.seasons.tsx
index 91c7ff978..bbdd12c15 100644
--- a/app/features/user-page/routes/u.$identifier.seasons.tsx
+++ b/app/features/user-page/routes/u.$identifier.seasons.tsx
@@ -398,7 +398,14 @@ function PowerChart({
 		];
 	}, [skills]);
 
-	return <Chart options={chartOptions as any} xAxis="localTime" />;
+	return (
+		<Chart
+			xTicksLimit={5}
+			yTicksLimit={5}
+			options={chartOptions as any}
+			xAxis="localTime"
+		/>
+	);
 }
 
 const MIN_DEGREE = 5;