Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

fix(editor): init default theme observer value according to data-theme (#9698)

donteatfriedrice4f421efb22a7
diff --git a/blocksuite/affine/shared/src/services/theme-service.ts b/blocksuite/affine/shared/src/services/theme-service.ts
index 54dde1d076..ab62a3baf3 100644
--- a/blocksuite/affine/shared/src/services/theme-service.ts
+++ b/blocksuite/affine/shared/src/services/theme-service.ts
@@ -161,10 +161,17 @@ export class ThemeService extends Extension {
export class ThemeObserver {
private readonly observer: MutationObserver;
- theme$ = signal(ColorScheme.Light);
+ theme$: Signal<ColorScheme>;
constructor() {
const COLOR_SCHEMES: string[] = Object.values(ColorScheme);
+ // Set initial theme according to the data-theme attribute
+ const initialMode = document.documentElement.dataset.theme;
+ this.theme$ = signal(
+ initialMode && COLOR_SCHEMES.includes(initialMode)
+ ? (initialMode as ColorScheme)
+ : ColorScheme.Light
+ );
this.observer = new MutationObserver(() => {
const mode = document.documentElement.dataset.theme;
if (!mode) return;