Rewrite cosmetics and theme preferences (#1292)

- Cosmetics and theme preferences are now only stored in cookies instead
  of a combination of both cookies and state.

- The theme plugin now supports client hints. This allows the server
  to render a page using the client-preferred theme provided it supplies
  this information (any browser other than Firefox), helping to avoid an
  annoying flash while the page is hydrating.

- The previous workaround using the Nitro plugin has been removed. Its
  functionality is now handled by the Nuxt theme plugin with cleaner
  code.

- All pages and components now use the new plugins.
This commit is contained in:
Sasha Sorokin
2024-07-13 21:20:43 +02:00
committed by GitHub
parent ce4250281f
commit 8704d3acb3
21 changed files with 268 additions and 248 deletions

View File

@@ -1,27 +0,0 @@
export default defineNuxtPlugin(async (nuxtApp) => {
await useAuth();
await useUser();
const themeStore = useTheme();
const cosmetics = useCosmetics();
nuxtApp.hook("app:mounted", () => {
if (import.meta.client && themeStore.value.preference === "system") {
const colorSchemeQueryList = window.matchMedia("(prefers-color-scheme: light)");
const setColorScheme = (e) => {
if (themeStore.value.preference === "system") {
if (e.matches) {
updateTheme("light");
} else {
updateTheme(cosmetics.value.preferredDarkTheme ?? "dark");
}
}
};
setColorScheme(colorSchemeQueryList);
colorSchemeQueryList.addEventListener("change", setColorScheme);
}
});
nuxtApp.provide("colorMode", themeStore.value);
});

View File

@@ -0,0 +1,57 @@
import type { Theme } from "./theme.ts";
export type DisplayMode = "list" | "gallery" | "grid";
export type DisplayLocation =
| "mod"
| "plugin"
| "resourcepack"
| "modpack"
| "shader"
| "datapack"
| "user"
| "collection";
export interface Cosmetics {
searchLayout: boolean;
projectLayout: boolean;
advancedRendering: boolean;
externalLinksNewTab: boolean;
notUsingBlockers: boolean;
hideModrinthAppPromos: boolean;
preferredDarkTheme: Theme;
searchDisplayMode: Record<DisplayLocation, DisplayMode>;
hideStagingBanner: boolean;
}
export default defineNuxtPlugin(() => {
const cosmetics = useCookie<Cosmetics>("cosmetics", {
maxAge: 60 * 60 * 24 * 365 * 10,
sameSite: "lax",
secure: true,
httpOnly: false,
path: "/",
default: () => ({
searchLayout: false,
projectLayout: false,
advancedRendering: true,
externalLinksNewTab: true,
notUsingBlockers: false,
hideModrinthAppPromos: false,
preferredDarkTheme: "dark",
searchDisplayMode: {
mod: "list",
plugin: "list",
resourcepack: "gallery",
modpack: "list",
shader: "gallery",
datapack: "list",
user: "list",
collection: "list",
},
hideStagingBanner: false,
}),
});
return { provide: { cosmetics } };
});

View File

@@ -0,0 +1,130 @@
import { ref, computed } from "vue";
export type Theme = "system" | "light" | "dark" | "oled" | "retro";
export const DarkThemes: Theme[] = ["dark", "oled", "retro"];
export type SystemTheme = "unknown" | "light" | "dark";
function useNativeTheme() {
if (import.meta.server) {
let clientHint;
switch (useRequestHeader("Sec-CH-Prefers-Color-Scheme")) {
case "light":
clientHint = "light";
break;
case "dark":
clientHint = "dark";
break;
default:
clientHint = "unknown";
}
return computed(() => clientHint as SystemTheme);
}
const lightPreference = window.matchMedia("(prefers-color-scheme: light)");
const isLight = ref(lightPreference.matches);
const onPreferenceChange = ({ matches }: MediaQueryListEvent) => (isLight.value = matches);
lightPreference.addEventListener("change", onPreferenceChange);
onScopeDispose(() => lightPreference.removeEventListener("change", onPreferenceChange));
return computed<SystemTheme>(() => (isLight.value ? "light" : "dark"));
}
interface ThemeSettings {
preference: Theme;
value: Exclude<Theme, "system">;
}
export default defineNuxtPlugin((nuxtApp) => {
const $nativeTheme = useNativeTheme();
const $themeSettings = useCookie<ThemeSettings>("color-mode", {
maxAge: 60 * 60 * 24 * 365 * 10,
sameSite: "lax",
secure: true,
httpOnly: false,
path: "/",
default: () => ({
preference: "system",
// if we have a client hint - use the associated theme, otherwise use dark
// theme, because it's worse to have a bright flash in the dark than just
// darkened screen in the light
value: $nativeTheme.value === "unknown" ? "dark" : $nativeTheme.value,
}),
});
const $preferredTheme = toRef($themeSettings.value, "preference");
const $cosmetics = useCosmetics();
const $activeTheme = toRef($themeSettings.value, "value");
useHead({ htmlAttrs: { class: () => [`${$activeTheme.value}-mode`] } });
function syncTheme() {
const preferredTheme = $preferredTheme.value;
if (preferredTheme === "system") {
const nativeTheme = $nativeTheme.value;
if (nativeTheme === "unknown" || nativeTheme === "dark") {
let { preferredDarkTheme } = $cosmetics.value;
if (preferredDarkTheme === "system") {
// fail safe in case the user is messing with internals
preferredDarkTheme = "dark";
}
$activeTheme.value = preferredDarkTheme;
} else {
$activeTheme.value = nativeTheme;
}
return;
}
$activeTheme.value = preferredTheme;
}
if (
import.meta.server &&
$preferredTheme.value === "system" &&
$nativeTheme.value !== "unknown"
) {
// take advantage of the client hint
syncTheme();
}
if (import.meta.client) {
const $clientReady = ref(false);
nuxtApp.hook("app:suspense:resolve", () => {
$clientReady.value = true;
});
watchEffect(() => $clientReady.value && syncTheme());
}
function cycle() {
$preferredTheme.value = DarkThemes.includes($activeTheme.value)
? "light"
: $cosmetics.value.preferredDarkTheme;
}
return {
provide: {
theme: reactive({
preferred: $preferredTheme,
active: $activeTheme,
native: $nativeTheme,
cycle,
}),
},
};
});