mirror of
https://github.com/reonokiy/blog.nokiy.net.git
synced 2025-06-16 11:41:17 +02:00
fix: theme toggle fallback animation flash issue (final)
This commit is contained in:
parent
00149b251b
commit
d4e5fda5d1
4 changed files with 44 additions and 45 deletions
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
// Core theme switching logic
|
// Core theme switching logic
|
||||||
function switchTheme() {
|
function switchTheme() {
|
||||||
|
document.body.removeAttribute('data-restore-theme')
|
||||||
const isDark = document.documentElement.classList.toggle('dark')
|
const isDark = document.documentElement.classList.toggle('dark')
|
||||||
themeToggle.setAttribute('aria-pressed', String(isDark))
|
themeToggle.setAttribute('aria-pressed', String(isDark))
|
||||||
localStorage.setItem('theme', isDark ? 'dark' : 'light')
|
localStorage.setItem('theme', isDark ? 'dark' : 'light')
|
||||||
|
@ -22,9 +23,13 @@
|
||||||
|
|
||||||
// Sync theme state
|
// Sync theme state
|
||||||
function syncTheme() {
|
function syncTheme() {
|
||||||
|
document.body.setAttribute('data-restore-theme', 'true')
|
||||||
const theme = localStorage.getItem('theme')
|
const theme = localStorage.getItem('theme')
|
||||||
document.documentElement.classList.toggle('dark', theme === 'dark')
|
document.documentElement.classList.toggle('dark', theme === 'dark')
|
||||||
themeToggle.setAttribute('aria-pressed', String(theme === 'dark'))
|
themeToggle.setAttribute('aria-pressed', String(theme === 'dark'))
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
document.body.removeAttribute('data-restore-theme')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Event listeners
|
// Event listeners
|
||||||
|
|
|
@ -97,27 +97,21 @@ const { cdn, commentURL = '', imageHostURL = '', customGoogleAnalyticsURL = '',
|
||||||
<script is:inline define:vars={{ defaultMode: themeConfig.color.mode }}>
|
<script is:inline define:vars={{ defaultMode: themeConfig.color.mode }}>
|
||||||
function initTheme() {
|
function initTheme() {
|
||||||
const theme = (() => {
|
const theme = (() => {
|
||||||
// 1. 检查 localStorage
|
|
||||||
if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
|
if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
|
||||||
return localStorage.getItem('theme')
|
return localStorage.getItem('theme')
|
||||||
}
|
}
|
||||||
// 2. 检查系统主题
|
|
||||||
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||||
return 'dark'
|
return 'dark'
|
||||||
}
|
}
|
||||||
// 3. 使用默认主题
|
|
||||||
return defaultMode
|
return defaultMode
|
||||||
})()
|
})()
|
||||||
|
|
||||||
document.documentElement.classList.toggle('dark', theme === 'dark')
|
document.documentElement.classList.toggle('dark', theme === 'dark')
|
||||||
}
|
}
|
||||||
|
|
||||||
// 立即执行初始化
|
|
||||||
initTheme()
|
initTheme()
|
||||||
|
|
||||||
// 监听系统主题变化
|
|
||||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
|
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
|
||||||
if (!localStorage.getItem('theme')) { // 只在用户未手动设置主题时响应
|
if (!localStorage.getItem('theme')) {
|
||||||
document.documentElement.classList.toggle('dark', e.matches)
|
document.documentElement.classList.toggle('dark', e.matches)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -64,7 +64,7 @@ animation: none;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
}
|
}
|
||||||
@supports not (view-transition-name: none) {
|
@supports not (view-transition-name: none) {
|
||||||
body {
|
body:not([data-restore-theme]) {
|
||||||
--at-apply: 'transition-all duration-500 ease-in-out';
|
--at-apply: 'transition-all duration-500 ease-in-out';
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -12,9 +12,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.scrollbar-light {
|
.scrollbar-light {
|
||||||
--os-handle-bg: #D1C6BE;
|
--os-handle-bg: #C9C4C1;
|
||||||
--os-handle-bg-hover: #C1B6AF;
|
--os-handle-bg-hover: #B8B3B0;
|
||||||
--os-handle-bg-active: #C1B6AF;
|
--os-handle-bg-active: #B8B3B0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.scrollbar-dark {
|
.scrollbar-dark {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue