From 612b39a87865ac74aa66cc296f72b70d3d29c856 Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 8 Nov 2024 11:53:53 +0800 Subject: [PATCH] fix: code style init value --- src/renderer/src/context/SyntaxHighlighterProvider.tsx | 7 +++++-- src/renderer/src/store/index.ts | 2 +- src/renderer/src/store/migrate.ts | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/context/SyntaxHighlighterProvider.tsx b/src/renderer/src/context/SyntaxHighlighterProvider.tsx index eae545c8..b2dd13db 100644 --- a/src/renderer/src/context/SyntaxHighlighterProvider.tsx +++ b/src/renderer/src/context/SyntaxHighlighterProvider.tsx @@ -24,8 +24,11 @@ export const SyntaxHighlighterProvider: React.FC = ({ childre const { codeStyle } = useSettings() const highlighterTheme = useMemo(() => { - if (codeStyle === 'auto') return theme === ThemeMode.light ? 'one-light' : 'material-theme-darker' - else return codeStyle + if (!codeStyle || codeStyle === 'auto') { + return theme === ThemeMode.light ? 'one-light' : 'material-theme-darker' + } + + return codeStyle }, [theme, codeStyle]) useEffect(() => { diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts index 32157109..f628d93b 100644 --- a/src/renderer/src/store/index.ts +++ b/src/renderer/src/store/index.ts @@ -24,7 +24,7 @@ const persistedReducer = persistReducer( { key: 'cherry-studio', storage, - version: 38, + version: 39, blacklist: ['runtime'], migrate }, diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 73e19e8d..09b1afb7 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -669,6 +669,10 @@ const migrateConfig = { ] } } + }, + '39': (state: RootState) => { + state.settings.codeStyle = 'auto' + return state } }