ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent white screen on page load

Browse Source 
Bug introduced with ff58dcc480.
With 18ddf46f17 the "appearance" settings got moved from the local storage to the server metadata.
However, the old settings still remained in the local storage, which includes a value with they key "appTheme". This was the id of the selected app theme.
With ff58dcc480 this key got resued for the app theme object, which leads to a type error in case the old setting is still present in the local storage.
This commit is contained in:
schroda
2025-08-01 20:30:24 +02:00
parent cd04be7f52
commit c758cc41e1
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/theme/services/AppThemes.ts
View File

@@ -21,22 +21,22 @@ export const appThemes = (Object.entries(themes) as [AppThemes, TBaseTheme][]).m
...theme,
})) satisfies AppTheme[];
export const getTheme = (id: AppThemes, customThemes: Record<string, AppTheme> = {}): AppTheme => {
try {
const allThemes = { ...themes, ...customThemes };
const theme = (allThemes[id as keyof typeof themes] as AppTheme) ?? themes.default;
export const getTheme = (id: AppThemes | undefined, customThemes: Record<string, AppTheme> = {}): AppTheme => {
// TODO - This is a workaround to fix a type error which causes a white screen.
// It should be removed and replaced with a proper migration logic, which would then e.g., add a migration to
// remove deprecated/outdated settings from the local storage
const actualId = id === undefined ? 'default' : id;
return {
// @ts-ignore - custom themes do not have a "getName" function
getName: () => id,
// @ts-ignore - app themes do not have the "id" prop by default
id,
...theme,
};
} catch (e) {
defaultPromiseErrorHandler('getTheme')(e);
}
return { id, ...themes[id as keyof typeof themes] };
const allThemes = { ...themes, ...customThemes };
const theme = (allThemes[actualId as keyof typeof themes] as AppTheme) ?? themes.default;
return {
// @ts-ignore - custom themes do not have a "getName" function
getName: () => id,
// @ts-ignore - app themes do not have the "id" prop by default
id,
...theme,
};
};
export const isThemeNameUnique = (id: string, customThemes: Record<string, AppTheme>): boolean =>