External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): resolve theme persistence bug after hard refresh

Browse Source
This commit is contained in:
plebeius
2025-10-23 21:44:43 +02:00
parent 5a3f7f0270
commit 26d014b696
2 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/use-initial-theme.ts
+9 -10
View File
@@ -11,8 +11,8 @@ const useInitialTheme = (pendingPostSubplebbitAddress?: string) => {
const { subplebbitAddress: paramsSubplebbitAddress, accountCommentIndex } = useParams<{ subplebbitAddress: string; accountCommentIndex?: string }>();
const commentIndex = accountCommentIndex ? parseInt(accountCommentIndex) : undefined;
const pendingPost = useAccountComment({ commentIndex });
const getTheme = useThemeStore((state) => state.getTheme);
const currentTheme = useThemeStore((state) => state.currentTheme);
// Subscribe to the actual themes data, not just functions
const themes = useThemeStore((state) => state.themes);
const subplebbits = useDefaultSubplebbits();
const params = useParams();
const isInHomeView = isHomeView(location.pathname);
@@ -30,23 +30,23 @@ const useInitialTheme = (pendingPostSubplebbitAddress?: string) => {
if (subplebbitAddress) {
const subplebbit = subplebbits.find((s) => s.address === subplebbitAddress);
if (subplebbit && subplebbit.tags && subplebbit.tags.some((tag) => nsfwTags.includes(tag))) {
theme = getTheme('nsfw', false) || 'yotsuba';
theme = themes.nsfw || 'yotsuba';
} else {
theme = getTheme('sfw', false) || 'yotsuba-b';
theme = themes.sfw || 'yotsuba-b';
}
} else {
theme = currentTheme || 'yotsuba';
theme = 'yotsuba';
}
} else if (isInAllView || isInSubscriptionsView || isInModView) {
theme = getTheme('sfw', false) || 'yotsuba-b'; // Add 'false' parameter
theme = themes.sfw || 'yotsuba-b';
} else if (isInHomeView || isInNotFoundView) {
theme = 'yotsuba';
} else if (paramsSubplebbitAddress) {
const subplebbit = subplebbits.find((s) => s.address === paramsSubplebbitAddress);
if (subplebbit && subplebbit.tags && subplebbit.tags.some((tag) => nsfwTags.includes(tag))) {
theme = getTheme('nsfw', false) || 'yotsuba'; // Add 'false' parameter
theme = themes.nsfw || 'yotsuba';
} else {
theme = getTheme('sfw', false) || 'yotsuba-b'; // Add 'false' parameter
theme = themes.sfw || 'yotsuba-b';
}
}
@@ -59,8 +59,7 @@ const useInitialTheme = (pendingPostSubplebbitAddress?: string) => {
isInHomeView,
isInNotFoundView,
paramsSubplebbitAddress,
getTheme,
currentTheme,
themes,
subplebbits,
pendingPostSubplebbitAddress,
pendingPost,