From d5be0287ad03e47635be057222ca7155a033ae80 Mon Sep 17 00:00:00 2001 From: Suemor Date: Sat, 26 Oct 2024 17:12:37 +0800 Subject: [PATCH] fix: theme cannot be switched (#1157) --- apps/renderer/src/modules/settings/tabs/apperance.tsx | 3 ++- packages/hooks/src/useSyncTheme.ts | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/renderer/src/modules/settings/tabs/apperance.tsx b/apps/renderer/src/modules/settings/tabs/apperance.tsx index bc4f6f521..4b7980896 100644 --- a/apps/renderer/src/modules/settings/tabs/apperance.tsx +++ b/apps/renderer/src/modules/settings/tabs/apperance.tsx @@ -5,7 +5,7 @@ import { SelectTrigger, SelectValue, } from "@follow/components/ui/select/index.jsx" -import { useIsDark, useSetTheme, useThemeAtomValue } from "@follow/hooks" +import { useIsDark, useThemeAtomValue } from "@follow/hooks" import { IN_ELECTRON } from "@follow/shared/constants" import { getOS } from "@follow/utils/utils" import { useTranslation } from "react-i18next" @@ -18,6 +18,7 @@ import { useUISettingValue, } from "~/atoms/settings/ui" import { isElectronBuild } from "~/constants" +import { useSetTheme } from "~/hooks/common" import { SettingTabbedSegment } from "../control" import { createDefineSettingItem } from "../helper/builder" diff --git a/packages/hooks/src/useSyncTheme.ts b/packages/hooks/src/useSyncTheme.ts index 22bc172c9..7dcb776b1 100644 --- a/packages/hooks/src/useSyncTheme.ts +++ b/packages/hooks/src/useSyncTheme.ts @@ -20,10 +20,7 @@ export const useSyncThemeWebApp = () => { export const internal_useSetTheme = () => // eslint-disable-next-line react-hooks/rules-of-hooks useCallback((theme: ColorMode) => jotaiStore.set(themeAtom, theme), []) -export const useSetTheme = () => - useCallback((colorMode: ColorMode) => { - jotaiStore.set(themeAtom, colorMode) - }, []) + export function disableTransition(disableTransitionExclude: string[] = []) { const css = document.createElement("style") css.append(