@@ -33,16 +33,21 @@ export const tokenLabels: Record<Token, string> = {
3333 danger: "danger",
3434 };
3535
36+// "custom" is not a palette of its own: it layers the user's color overrides on
37+// top of `base`, the built-in palette that was active when custom was chosen.
3638 export const presets = [
3739 { id: "nicotine", label: "80s nicotine" },
3840 { id: "tuxedo", label: "tuxedo" },
41+ { id: "custom", label: "custom" },
3942 ] as const;
4043
4144 export type PresetId = (typeof presets)[number]["id"];
45+export type BasePreset = Exclude<PresetId, "custom">;
4246
4347 export interface ThemePrefs {
4448 mode: Mode;
4549 preset: PresetId;
50+ base: BasePreset;
4651 overrides: Record<Mode, Partial<Record<Token, string>>>;
4752 // Experimental: the terminal scheme the palette was seeded from (name, plus
4853 // the colors it contributes to skittles), and per-username colors.
@@ -55,6 +60,7 @@ const key = "irvc.theme";
5560 export const defaultPrefs: ThemePrefs = {
5661 mode: "light",
5762 preset: "nicotine",
63+ base: "nicotine",
5864 overrides: { light: {}, dark: {} },
5965 scheme: null,
6066 skittles: false,
@@ -79,31 +85,45 @@ export function loadPrefs(): ThemePrefs {
7985 if (presets.some((p) => p.id === raw)) return { ...defaultPrefs, preset: raw as PresetId };
8086 if (!raw || typeof raw !== "object") return { ...defaultPrefs, mode: systemMode() };
8187 const p = raw as Partial<ThemePrefs>;
88+ const mode: Mode = p.mode === "dark" ? "dark" : "light";
89+ const overrides = { light: p.overrides?.light ?? {}, dark: p.overrides?.dark ?? {} };
90+ let preset: PresetId = presets.some((x) => x.id === p.preset) ? (p.preset as PresetId) : defaultPrefs.preset;
91+ let base: BasePreset = p.base === "tuxedo" || p.base === "nicotine" ? p.base : defaultPrefs.base;
92+ // Overrides used to sit on top of any preset. They now only exist under
93+ // "custom", so a saved palette with edits becomes a custom one.
94+ if (preset !== "custom" && Object.keys(overrides[mode]).length > 0) {
95+ base = preset;
96+ preset = "custom";
97+ }
8298 return {
83- mode: p.mode === "dark" ? "dark" : "light",
84- preset: presets.some((x) => x.id === p.preset) ? (p.preset as PresetId) : defaultPrefs.preset,
85- overrides: { light: p.overrides?.light ?? {}, dark: p.overrides?.dark ?? {} },
99+ mode,
100+ preset,
101+ base,
102+ overrides,
86103 scheme: p.scheme?.name && Array.isArray(p.scheme.colors) ? p.scheme : null,
87104 skittles: p.skittles === true,
88105 };
89106 }
90107
108+// basePalette is the built-in palette whose CSS is in effect.
109+const basePalette = (p: ThemePrefs): BasePreset => (p.preset === "custom" ? p.base : p.preset);
110+
91111 // applyTheme writes the mode class, the preset attribute and the user's
92112 // overrides onto <html>. The palettes themselves live in CSS, so switching
93113 // preset is a single attribute change.
94114 export function applyTheme(prefs: ThemePrefs) {
95115 const el = document.documentElement;
96116 el.classList.toggle("dark", prefs.mode === "dark");
97- el.dataset.preset = prefs.preset;
117+ el.dataset.preset = basePalette(prefs);
98118 for (const t of TOKENS) {
99- const v = prefs.overrides[prefs.mode][t];
119+ const v = prefs.preset === "custom" ? prefs.overrides[prefs.mode][t] : undefined;
100120 if (v) el.style.setProperty(cssVar(t), v);
101121 else el.style.removeProperty(cssVar(t));
102122 }
103123 // Skittles: --user-N are only defined while it is on; userColor() falls back
104124 // to the accent otherwise. Needs the resolved bg/fg, hence after the loop.
105125 const colors = prefs.skittles
106- ? skittlesPalette(prefs.scheme?.colors, effective("bg"), effective("fg"), prefs.preset)
126+ ? skittlesPalette(prefs.scheme?.colors, effective("bg"), effective("fg"), basePalette(prefs))
107127 : [];
108128 for (let i = 0; i < SKITTLES; i++) {
109129 if (colors[i]) el.style.setProperty(`--user-${i}`, colors[i]);
@@ -154,7 +174,12 @@ export function useTheme() {
154174 const setMode = useCallback((mode: Mode) => setPrefs((p) => ({ ...p, mode })), []);
155175 const setPreset = useCallback(
156176 (preset: PresetId) =>
157- setPrefs((p) => ({ ...p, preset, scheme: null, overrides: { light: {}, dark: {} } })),
177+ setPrefs((p) => {
178+ if (preset === p.preset) return p;
179+ // Custom starts from whatever built-in palette (and mode) is showing.
180+ const base = preset === "custom" ? basePalette(p) : p.base;
181+ return { ...p, preset, base, scheme: null, overrides: { light: {}, dark: {} } };
182+ }),
158183 [],
159184 );
160185 const setToken = useCallback(
@@ -165,10 +190,6 @@ export function useTheme() {
165190 })),
166191 [],
167192 );
168- const resetTokens = useCallback(
169- () => setPrefs((p) => ({ ...p, scheme: null, overrides: { ...p.overrides, [p.mode]: {} } })),
170- [],
171- );
172193 // A scheme is dark or light by nature, so applying one switches to that mode
173194 // and overrides every token there; the other mode keeps its palette.
174195 const setScheme = useCallback(
@@ -178,6 +199,8 @@ export function useTheme() {
178199 return {
179200 ...p,
180201 mode,
202+ preset: "custom",
203+ base: basePalette(p),
181204 scheme: { name: s.n, colors: schemeColors(s) },
182205 overrides: { ...p.overrides, [mode]: toPalette(s) },
183206 };
@@ -186,5 +209,5 @@ export function useTheme() {
186209 );
187210 const setSkittles = useCallback((skittles: boolean) => setPrefs((p) => ({ ...p, skittles })), []);
188211
189- return { prefs, setMode, setPreset, setToken, resetTokens, setScheme, setSkittles };
212+ return { prefs, setMode, setPreset, setToken, setScheme, setSkittles };
190213 }