Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use mas_core::schema::SchemaInspector;
use std::sync::Arc;
#[cfg(target_os = "macos")]
use tauri::Emitter;
use tauri::Manager;
use tracing_subscriber::prelude::*;
use tracing_subscriber::EnvFilter;

Expand Down
28 changes: 28 additions & 0 deletions src/stores/__tests__/themeStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,32 @@ describe("themeStore", () => {
expect(() => mod.useThemeStore.getState().setTheme("light")).not.toThrow();
expect(mod.useThemeStore.getState().theme).toBe("light");
});

it("cleanupThemeListener removes the matchMedia change listener", async () => {
const removeEventListener = vi.fn();
let registeredHandler: (() => void) | null = null;

vi.spyOn(window, "matchMedia").mockImplementation((query) => ({
matches: true,
media: query,
onchange: null,
addListener: vi.fn(),
removeListener: vi.fn(),
addEventListener: (_event: string, handler: () => void) => {
registeredHandler = handler;
},
removeEventListener,
dispatchEvent: vi.fn(),
}) as unknown as MediaQueryList);

vi.resetModules();
const mod = await import("../themeStore");

// listener kuruldu mu?
expect(registeredHandler).not.toBeNull();

// temizlik, aynı handler ile removeEventListener çağırmalı
mod.cleanupThemeListener();
expect(removeEventListener).toHaveBeenCalledWith("change", registeredHandler);
});
});
28 changes: 18 additions & 10 deletions src/stores/themeStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,23 @@ export const useThemeStore = create<ThemeState>((set) => ({
}));

// Listen for system preference changes when mode is 'system'
let mediaQuery: MediaQueryList | undefined;

const handleSystemThemeChange = () => {
const state = useThemeStore.getState();
if (state.theme === "system") {
const effective = resolveEffective("system");
applyTheme(effective);
useThemeStore.setState({ effectiveTheme: effective });
}
};

if (typeof window !== "undefined") {
window
.matchMedia("(prefers-color-scheme: dark)")
.addEventListener("change", () => {
const state = useThemeStore.getState();
if (state.theme === "system") {
const effective = resolveEffective("system");
applyTheme(effective);
useThemeStore.setState({ effectiveTheme: effective });
}
});
mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
mediaQuery.addEventListener("change", handleSystemThemeChange);
}

/** Removes the system theme change listener. Useful for cleanup (e.g. in tests). */
export function cleanupThemeListener() {
mediaQuery?.removeEventListener("change", handleSystemThemeChange);
}