zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: improve cookie store

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2025-10-20 10:29:38 +02:00
parent 90c1a813af
commit f958230a66
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/start/src/components/theme-provider.tsx
View File

@@ -18,18 +18,6 @@ export type AppTheme = z.infer<typeof AppThemeSchema>;
const themeStorageKey = 'ui-theme';
const getStoredUserTheme = createIsomorphicFn()
.server((): UserTheme => 'system')
.client((): UserTheme => {
const stored = localStorage.getItem(themeStorageKey);
return UserThemeSchema.parse(stored);
});
const setStoredTheme = clientOnly((theme: UserTheme) => {
const validatedTheme = UserThemeSchema.parse(theme);
localStorage.setItem(themeStorageKey, validatedTheme);
});
const getSystemTheme = createIsomorphicFn()
.server((): AppTheme => 'light')
.client((): AppTheme => {
@@ -73,7 +61,10 @@ const themes = mapKeys(themeConfig).map((key) => ({
const themeScript = (() => {
function themeFn() {
try {
const storedTheme = localStorage.getItem('ui-theme') || 'system';
// Read theme from cookie
const cookies = document.cookie.split('; ');
const themeCookie = cookies.find((c) => c.startsWith('ui-theme='));
const storedTheme = themeCookie ? themeCookie.split('=')[1] : 'system';
const validTheme = ['light', 'dark', 'system'].includes(storedTheme)
? storedTheme
: 'system';
@@ -131,7 +122,6 @@ export function ThemeProvider({ children }: ThemeProviderProps) {
const setTheme = (newUserTheme: UserTheme) => {
const validatedTheme = UserThemeSchema.parse(newUserTheme);
setUserTheme(validatedTheme);
setStoredTheme(validatedTheme);
handleThemeChange(validatedTheme);
};