diff --git a/lib/global.js b/lib/global.js
index 17f31ace..77b94e2d 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -16,7 +16,7 @@ export function GlobalContextProvider(props) {
const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言
const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言
const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题
- const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE
+ const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE
const [isDarkMode, updateDarkMode] = useState(defaultDarkMode === 'dark') // 默认深色模式
const [onLoading, setOnLoading] = useState(false) // 抓取文章数据
const router = useRouter()
@@ -58,13 +58,13 @@ export function GlobalContextProvider(props) {
}
useEffect(() => {
- initDarkMode(updateDarkMode,defaultDarkMode)
+ initDarkMode(updateDarkMode, defaultDarkMode)
initLocale(lang, locale, updateLang, updateLocale)
}, [])
// 加载进度条
useEffect(() => {
- const handleStart = (url) => {
+ const handleStart = url => {
const { theme } = router.query
if (theme && !url.includes(`theme=${theme}`)) {
const newUrl = `${url}${url.includes('?') ? '&' : '?'}theme=${theme}`
@@ -87,27 +87,28 @@ export function GlobalContextProvider(props) {
}, [router])
return (
-
- {children}
-
+
+ {children}
+
)
}
diff --git a/package.json b/package.json
index 13b60baf..9dc7983b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "notion-next",
- "version": "4.3.2",
+ "version": "4.4.0",
"homepage": "https://github.com/tangly1024/NotionNext.git",
"license": "MIT",
"repository": {
diff --git a/themes/theme.js b/themes/theme.js
index 4e7c3a6e..f872a12e 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -100,13 +100,14 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
// 查看localStorage中用户记录的是否深色模式
const userDarkMode = loadDarkModeFromLocalStorage()
+ console.log('深色模式',userDarkMode)
if (userDarkMode) {
- newDarkMode = userDarkMode
+ newDarkMode = userDarkMode === 'dark' || userDarkMode === 'true'
}
// 如果站点强制设置默认深色,则优先级改过用
- if (defaultDarkMode === 'dark') {
- newDarkMode = defaultDarkMode
+ if (defaultDarkMode === 'true') {
+ newDarkMode = true
}
// url查询条件中是否深色模式