From 86ffa3753fc7c313e77cda26d9d82caf8f1acc28 Mon Sep 17 00:00:00 2001
From: Evan Fiordeliso <evan.fiordeliso@gmail.com>
Date: Fri, 4 Jul 2025 22:40:38 -0400
Subject: [PATCH] Fix colors on bookshelf

---
 src/ui/components/bookshelf/Book.svelte          | 13 +++++++++----
 .../components/bookshelf/BookStackElement.svelte |  6 +++---
 src/utils/color.ts                               | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/ui/components/bookshelf/Book.svelte b/src/ui/components/bookshelf/Book.svelte
index f0ff61d..4331643 100644
--- a/src/ui/components/bookshelf/Book.svelte
+++ b/src/ui/components/bookshelf/Book.svelte
@@ -1,6 +1,11 @@
 <script lang="ts">
 	import Self from "./Book.svelte";
-	import { Color, COLOR_NAMES, type ColorName } from "@utils/color";
+	import {
+		Color,
+		COLOR_NAMES,
+		isColorName,
+		type ColorName,
+	} from "@utils/color";
 	import BookTiltedDefault from "./designs/tilted/BookTiltedDefault.svelte";
 	import BookOnDisplay from "./designs/book/BookOnDisplay.svelte";
 	import BookText from "./BookText.svelte";
@@ -45,8 +50,8 @@
 	}
 
 	const color = $derived(
-		colorRaw in COLOR_NAMES
-			? Color.fromName(colorRaw as ColorName)
+		isColorName(colorRaw)
+			? Color.fromName(colorRaw).darken()
 			: Color.fromCSSColor(colorRaw),
 	);
 
@@ -61,7 +66,7 @@
 				{title}
 				{subtitle}
 				{author}
-				color={colorRaw}
+				color={color.hex}
 				{design}
 				{height}
 				{width}
diff --git a/src/ui/components/bookshelf/BookStackElement.svelte b/src/ui/components/bookshelf/BookStackElement.svelte
index aa2b23e..d1bba1e 100644
--- a/src/ui/components/bookshelf/BookStackElement.svelte
+++ b/src/ui/components/bookshelf/BookStackElement.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Color, COLOR_NAMES, type ColorName } from "@utils/color";
+	import { Color, isColorName, type ColorName } from "@utils/color";
 	import BookText from "./BookText.svelte";
 	import BookStackColoredSpine from "./designs/stack/BookStackColoredSpine.svelte";
 	import BookStackDefault from "./designs/stack/BookStackDefault.svelte";
@@ -21,8 +21,8 @@
 	}: Props = $props();
 
 	const color = $derived(
-		colorRaw in COLOR_NAMES
-			? Color.fromName(colorRaw as ColorName)
+		isColorName(colorRaw)
+			? Color.fromName(colorRaw).darken()
 			: Color.fromCSSColor(colorRaw),
 	);
 	const textColor = $derived(color.contrastColor.hex);
diff --git a/src/utils/color.ts b/src/utils/color.ts
index 9eca054..2db8e85 100644
--- a/src/utils/color.ts
+++ b/src/utils/color.ts
@@ -13,6 +13,10 @@ export const COLOR_NAMES = [
 	"pink",
 ] as const;
 
+export function isColorName(color: string): color is ColorName {
+	return COLOR_NAMES.includes(color as ColorName);
+}
+
 export type ColorName = (typeof COLOR_NAMES)[number];
 export type RGB = [number, number, number];
 
@@ -54,6 +58,18 @@ export class Color {
 		return new Color(this.r, this.g, this.b, alpha);
 	}
 
+	darken(amount?: number): Color {
+		return new Color(
+			...chroma([this.r, this.g, this.b]).darken(amount).rgb()
+		);
+	}
+
+	lighten(amount?: number): Color {
+		return new Color(
+			...chroma([this.r, this.g, this.b]).brighten(amount).rgb()
+		);
+	}
+
 	static fromName(color: ColorName): Color {
 		const rawRgb = style
 			.getPropertyValue(`--color-${color}-rgb`)