usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(frontend): improve startViewTransition handling

This commit is contained in:
syuilo 2025-11-06 18:07:03 +09:00
parent 119423e3ae
commit 26c8914a26
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/frontend/src/theme.ts
View File

@ -146,17 +146,26 @@ export function applyTheme(theme: Theme, persist = true) {
if (window.document.startViewTransition != null) { if (window.document.startViewTransition != null) {
window.document.documentElement.classList.add('_themeChanging_'); window.document.documentElement.classList.add('_themeChanging_');
window.document.startViewTransition(async () => { try {
applyThemeInternal(theme, persist); window.document.startViewTransition(async () => {
await nextTick(); applyThemeInternal(theme, persist);
}).finished.then(() => { await nextTick();
}).finished.then(() => {
window.document.documentElement.classList.remove('_themeChanging_');
globalEvents.emit('themeChanged');
});
} catch (err) {
// 様々な理由により startViewTransition は失敗することがある
// ref. https://github.com/misskey-dev/misskey/issues/16562
console.error(err);
window.document.documentElement.classList.remove('_themeChanging_'); window.document.documentElement.classList.remove('_themeChanging_');
// 色計算など再度行えるようにクライアント全体に通知 applyThemeInternal(theme, persist);
globalEvents.emit('themeChanged'); globalEvents.emit('themeChanged');
}); }
} else { } else {
applyThemeInternal(theme, persist); applyThemeInternal(theme, persist);
// 色計算など再度行えるようにクライアント全体に通知
globalEvents.emit('themeChanged'); globalEvents.emit('themeChanged');
} }
} }