fix: change theme settings do not work after relocated data folder

janhq · Dec 23, 2024 · 6b4e1bd · 6b4e1bd
1 parent abb718c
commit 6b4e1bd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/web/helpers/atoms/Setting.atom.ts b/web/helpers/atoms/Setting.atom.ts
@@ -20,12 +20,7 @@ export const CHAT_WIDTH = 'chatWidth'
 export const themesOptionsAtom = atomWithStorage<
   { name: string; value: string }[]
 >(THEME_OPTIONS, [], undefined, { getOnInit: true })
-export const janThemesPathAtom = atomWithStorage<string | undefined>(
-  THEME_PATH,
-  undefined,
-  undefined,
-  { getOnInit: true }
-)
+
 export const selectedThemeIdAtom = atomWithStorage<string>(
   THEME,
   '',

diff --git a/web/hooks/useLoadTheme.ts b/web/hooks/useLoadTheme.ts
@@ -10,7 +10,6 @@ import cssVars from '@/utils/jsonToCssVariables'
 
 import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
 import {
-  janThemesPathAtom,
   selectedThemeIdAtom,
   themeDataAtom,
   themesOptionsAtom,
@@ -21,7 +20,6 @@ type NativeThemeProps = 'light' | 'dark'
 export const useLoadTheme = () => {
   const janDataFolderPath = useAtomValue(janDataFolderPathAtom)
   const [themeOptions, setThemeOptions] = useAtom(themesOptionsAtom)
-  const [themePath, setThemePath] = useAtom(janThemesPathAtom)
   const [themeData, setThemeData] = useAtom(themeDataAtom)
   const [selectedIdTheme, setSelectedIdTheme] = useAtom(selectedThemeIdAtom)
   const { setTheme } = useTheme()
@@ -41,6 +39,14 @@ export const useLoadTheme = () => {
     [setTheme]
   )
 
+  const applyTheme = (theme: Theme) => {
+    const variables = cssVars(theme.variables)
+    const headTag = document.getElementsByTagName('head')[0]
+    const styleTag = document.createElement('style')
+    styleTag.innerHTML = `:root {${variables}}`
+    headTag.appendChild(styleTag)
+  }
+
   const getThemes = useCallback(async () => {
     if (!janDataFolderPath.length) return
     const folderPath = await joinPath([janDataFolderPath, 'themes'])
@@ -59,7 +65,6 @@ export const useLoadTheme = () => {
 
     if (janDataFolderPath.length > 0) {
       if (!selectedIdTheme.length) return setSelectedIdTheme('joi-light')
-      setThemePath(folderPath)
       const filePath = await joinPath([
         `${folderPath}/${selectedIdTheme}`,
         `theme.json`,
@@ -68,11 +73,7 @@ export const useLoadTheme = () => {
 
       setThemeData(theme)
       setNativeTheme(theme.nativeTheme)
-      const variables = cssVars(theme.variables)
-      const headTag = document.getElementsByTagName('head')[0]
-      const styleTag = document.createElement('style')
-      styleTag.innerHTML = `:root {${variables}}`
-      headTag.appendChild(styleTag)
+      applyTheme(theme)
     }
   }, [
     janDataFolderPath,
@@ -81,26 +82,21 @@ export const useLoadTheme = () => {
     setSelectedIdTheme,
     setThemeData,
     setThemeOptions,
-    setThemePath,
   ])
 
-  const applyTheme = useCallback(async () => {
-    if (!themeData || !themeOptions || !themePath) {
+  const configureTheme = useCallback(async () => {
+    if (!themeData || !themeOptions) {
       await getThemes()
     } else {
-      const variables = cssVars(themeData.variables)
-      const headTag = document.getElementsByTagName('head')[0]
-      const styleTag = document.createElement('style')
-      styleTag.innerHTML = `:root {${variables}}`
-      headTag.appendChild(styleTag)
+      applyTheme(themeData)
     }
     setNativeTheme(themeData?.nativeTheme as NativeThemeProps)
-  }, [themeData, themeOptions, themePath, getThemes])
+  }, [themeData, themeOptions, getThemes, setNativeTheme])
 
   useEffect(() => {
-    applyTheme()
+    configureTheme()
   }, [
-    applyTheme,
+    configureTheme,
     selectedIdTheme,
     setNativeTheme,
     setSelectedIdTheme,

diff --git a/web/screens/Settings/Appearance/index.tsx b/web/screens/Settings/Appearance/index.tsx
@@ -8,9 +8,10 @@ import { useAtom, useAtomValue } from 'jotai'
 
 import { twMerge } from 'tailwind-merge'
 
+import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
+
 import {
   chatWidthAtom,
-  janThemesPathAtom,
   reduceTransparentAtom,
   selectedThemeIdAtom,
   spellCheckAtom,
@@ -21,8 +22,8 @@ import {
 export default function AppearanceOptions() {
   const [selectedIdTheme, setSelectedIdTheme] = useAtom(selectedThemeIdAtom)
   const themeOptions = useAtomValue(themesOptionsAtom)
+  const janDataFolderPath = useAtomValue(janDataFolderPathAtom)
   const { setTheme, theme } = useTheme()
-  const janThemesPath = useAtomValue(janThemesPathAtom)
   const [themeData, setThemeData] = useAtom(themeDataAtom)
   const [reduceTransparent, setReduceTransparent] = useAtom(
     reduceTransparentAtom
@@ -48,6 +49,7 @@ export default function AppearanceOptions() {
   const handleClickTheme = useCallback(
     async (e: string) => {
       setSelectedIdTheme(e)
+      const janThemesPath = await joinPath([janDataFolderPath, 'themes'])
       const filePath = await joinPath([`${janThemesPath}/${e}`, `theme.json`])
       const theme: Theme = JSON.parse(await fs.readFileSync(filePath, 'utf-8'))
       setThemeData(theme)
@@ -59,7 +61,7 @@ export default function AppearanceOptions() {
       }
     },
     [
-      janThemesPath,
+      janDataFolderPath,
       reduceTransparent,
       setReduceTransparent,
       setSelectedIdTheme,