Skip to content

Commit e192815

Browse files
committed
v4.4.0 & darkmode
1 parent b58e74d commit e192815

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

lib/global.js

+25-24
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function GlobalContextProvider(props) {
1616
const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言
1717
const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言
1818
const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题
19-
const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE
19+
const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE
2020
const [isDarkMode, updateDarkMode] = useState(defaultDarkMode === 'dark') // 默认深色模式
2121
const [onLoading, setOnLoading] = useState(false) // 抓取文章数据
2222
const router = useRouter()
@@ -58,13 +58,13 @@ export function GlobalContextProvider(props) {
5858
}
5959

6060
useEffect(() => {
61-
initDarkMode(updateDarkMode,defaultDarkMode)
61+
initDarkMode(updateDarkMode, defaultDarkMode)
6262
initLocale(lang, locale, updateLang, updateLocale)
6363
}, [])
6464

6565
// 加载进度条
6666
useEffect(() => {
67-
const handleStart = (url) => {
67+
const handleStart = url => {
6868
const { theme } = router.query
6969
if (theme && !url.includes(`theme=${theme}`)) {
7070
const newUrl = `${url}${url.includes('?') ? '&' : '?'}theme=${theme}`
@@ -87,27 +87,28 @@ export function GlobalContextProvider(props) {
8787
}, [router])
8888

8989
return (
90-
<GlobalContext.Provider value={{
91-
fullWidth,
92-
NOTION_CONFIG,
93-
toggleDarkMode,
94-
onLoading,
95-
setOnLoading,
96-
lang,
97-
changeLang,
98-
locale,
99-
updateLocale,
100-
isDarkMode,
101-
updateDarkMode,
102-
theme,
103-
setTheme,
104-
switchTheme,
105-
siteInfo,
106-
categoryOptions,
107-
tagOptions
108-
}}>
109-
{children}
110-
</GlobalContext.Provider>
90+
<GlobalContext.Provider
91+
value={{
92+
fullWidth,
93+
NOTION_CONFIG,
94+
toggleDarkMode,
95+
onLoading,
96+
setOnLoading,
97+
lang,
98+
changeLang,
99+
locale,
100+
updateLocale,
101+
isDarkMode,
102+
updateDarkMode,
103+
theme,
104+
setTheme,
105+
switchTheme,
106+
siteInfo,
107+
categoryOptions,
108+
tagOptions
109+
}}>
110+
{children}
111+
</GlobalContext.Provider>
111112
)
112113
}
113114

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-next",
3-
"version": "4.3.2",
3+
"version": "4.4.0",
44
"homepage": "https://github.com/tangly1024/NotionNext.git",
55
"license": "MIT",
66
"repository": {

themes/theme.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
100100

101101
// 查看localStorage中用户记录的是否深色模式
102102
const userDarkMode = loadDarkModeFromLocalStorage()
103+
console.log('深色模式',userDarkMode)
103104
if (userDarkMode) {
104-
newDarkMode = userDarkMode
105+
newDarkMode = userDarkMode === 'dark' || userDarkMode === 'true'
105106
}
106107

107108
// 如果站点强制设置默认深色,则优先级改过用
108-
if (defaultDarkMode === 'dark') {
109-
newDarkMode = defaultDarkMode
109+
if (defaultDarkMode === 'true') {
110+
newDarkMode = true
110111
}
111112

112113
// url查询条件中是否深色模式

0 commit comments

Comments
 (0)