style: optimize theme provider and App layout

This commit is contained in:
Bot
2026-04-28 00:04:22 +08:00
parent 01ca9f155e
commit 37ba1f05cb
2 changed files with 43 additions and 56 deletions
+10 -24
View File
@@ -10,7 +10,6 @@ import ErrorBoundary from "./components/ErrorBoundary";
import Footer from "./components/Footer"; import Footer from "./components/Footer";
import Header, { RefreshToast } from "./components/Header"; import Header, { RefreshToast } from "./components/Header";
import { useBackground } from "./hooks/use-background"; import { useBackground } from "./hooks/use-background";
import { useTheme } from "./hooks/use-theme";
import { InjectContext } from "./lib/inject"; import { InjectContext } from "./lib/inject";
import { fetchSetting } from "./lib/nezha-api"; import { fetchSetting } from "./lib/nezha-api";
import { cn } from "./lib/utils"; import { cn } from "./lib/utils";
@@ -32,19 +31,19 @@ const MainApp: React.FC = () => {
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
}); });
const { i18n } = useTranslation(); const { i18n } = useTranslation();
const { setTheme } = useTheme();
const [isCustomCodeInjected, setIsCustomCodeInjected] = useState(false); const [isCustomCodeInjected, setIsCustomCodeInjected] = useState(false);
const { backgroundImage: customBackgroundImage } = useBackground(); const { backgroundImage: customBackgroundImage } = useBackground();
useEffect(() => { useEffect(() => {
if (settingData?.data?.config?.custom_code) { const updateConfig = () => {
InjectContext(settingData?.data?.config?.custom_code); const config = settingData?.data?.config;
if (config) {
if (config.custom_code) {
InjectContext(config.custom_code);
setIsCustomCodeInjected(true); setIsCustomCodeInjected(true);
} }
// 同步自定义配置到全局变量 // 同步自定义配置到全局变量
const config = settingData?.data?.config;
if (config) {
if (config.custom_logo) window.CustomLogo = config.custom_logo; if (config.custom_logo) window.CustomLogo = config.custom_logo;
if (config.custom_description) if (config.custom_description)
window.CustomDesc = config.custom_description; window.CustomDesc = config.custom_description;
@@ -59,27 +58,14 @@ const MainApp: React.FC = () => {
window.CustomBackgroundImage = config.background_image_day; window.CustomBackgroundImage = config.background_image_day;
} }
window.CustomMobileBackgroundImage = window.CustomBackgroundImage; window.CustomMobileBackgroundImage = window.CustomBackgroundImage;
// 设置强制主题
window.ForceTheme = isNight ? "dark" : "light";
} }
};
updateConfig();
const interval = setInterval(updateConfig, 60000); // Check every minute
return () => clearInterval(interval);
}, [settingData]); }, [settingData]);
// 检测是否强制指定了主题颜色
const forceTheme =
(window.ForceTheme as string) !== "" ? window.ForceTheme : undefined;
useEffect(() => {
const savedTheme = localStorage.getItem("vite-ui-theme");
// Only auto-apply ForceTheme if the user hasn't manually picked one (or picked 'system')
if (
(!savedTheme || savedTheme === "system") &&
(forceTheme === "dark" || forceTheme === "light")
) {
setTheme(forceTheme);
}
}, [forceTheme, setTheme]);
if (error) { if (error) {
return <ErrorPage code={500} message={error.message} />; return <ErrorPage code={500} message={error.message} />;
} }
+19 -18
View File
@@ -1,4 +1,5 @@
import { createContext, type ReactNode, useEffect, useState } from "react"; import { createContext, type ReactNode, useEffect, useState } from "react";
import { DateTime } from "luxon";
export type Theme = "dark" | "light" | "system"; export type Theme = "dark" | "light" | "system";
@@ -28,40 +29,40 @@ export function ThemeProvider({
() => (localStorage.getItem(storageKey) as Theme) || "system", () => (localStorage.getItem(storageKey) as Theme) || "system",
); );
const [hour, setHour] = useState(() => DateTime.now().hour);
useEffect(() => {
const timer = setInterval(() => {
setHour(DateTime.now().hour);
}, 60000);
return () => clearInterval(timer);
}, []);
useEffect(() => { useEffect(() => {
const root = window.document.documentElement; const root = window.document.documentElement;
root.classList.add("disable-transitions"); root.classList.add("disable-transitions");
root.classList.remove("light", "dark"); root.classList.remove("light", "dark");
let effectiveTheme = theme;
if (theme === "system") { if (theme === "system") {
const systemTheme = window.matchMedia("(prefers-color-scheme: dark)") // Time-based theme: 18:00 - 06:00 is dark
.matches const isNight = hour >= 18 || hour < 6;
? "dark" effectiveTheme = isNight ? "dark" : "light";
: "light";
root.classList.add(systemTheme);
const themeColor =
systemTheme === "dark" ? "hsl(30 15% 8%)" : "hsl(0 0% 98%)";
document
.querySelector('meta[name="theme-color"]')
?.setAttribute("content", themeColor);
const timeoutId = window.setTimeout(() => {
root.classList.remove("disable-transitions");
}, 0);
return () => window.clearTimeout(timeoutId);
} }
root.classList.add(theme); root.classList.add(effectiveTheme);
const themeColor = theme === "dark" ? "hsl(30 15% 8%)" : "hsl(0 0% 98%)"; const themeColor =
effectiveTheme === "dark" ? "hsl(30 15% 8%)" : "hsl(0 0% 98%)";
document document
.querySelector('meta[name="theme-color"]') .querySelector('meta[name="theme-color"]')
?.setAttribute("content", themeColor); ?.setAttribute("content", themeColor);
const timeoutId = window.setTimeout(() => { const timeoutId = window.setTimeout(() => {
root.classList.remove("disable-transitions"); root.classList.remove("disable-transitions");
}, 0); }, 0);
return () => window.clearTimeout(timeoutId); return () => window.clearTimeout(timeoutId);
}, [theme]); }, [theme, hour]);
const value = { const value = {
theme, theme,