🐛 fix: fix auto lang switch (#1305)

lobehub · Feb 15, 2024 · 7a51329 · 7a51329
1 parent c67c25f
commit 7a51329
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 30 deletions.
diff --git a/src/layout/GlobalLayout/Locale.tsx b/src/layout/GlobalLayout/Locale.tsx
@@ -5,10 +5,7 @@ import useSWR from 'swr';
 
 import { createI18nNext } from '@/locales/create';
 import { normalizeLocale } from '@/locales/resources';
-import { useOnFinishHydrationGlobal } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
 import { isOnServerSide } from '@/utils/env';
-import { switchLang } from '@/utils/switchLang';
 
 const getAntdLocale = async (lang?: string) => {
   let normalLang = normalizeLocale(lang);
@@ -50,12 +47,6 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang }) => {
       });
   }
 
-  useOnFinishHydrationGlobal((s) => {
-    if (settingsSelectors.currentSettings(s).language === 'auto') {
-      switchLang('auto');
-    }
-  }, []);
-
   // handle i18n instance language change
   useEffect(() => {
     const handleLang = (e: string) => {

diff --git a/src/layout/GlobalLayout/StoreHydration.tsx b/src/layout/GlobalLayout/StoreHydration.tsx
@@ -2,7 +2,8 @@ import { useResponsive } from 'antd-style';
 import { useRouter } from 'next/navigation';
 import { memo, useEffect } from 'react';
 
-import { useEffectAfterGlobalHydrated, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { useEffectAfterGlobalHydrated } from '@/store/global/hooks/useEffectAfterHydrated';
 
 const StoreHydration = memo(() => {
   const [useFetchServerConfig, useFetchUserConfig] = useGlobalStore((s) => [

diff --git a/src/store/global/hooks/index.ts b/src/store/global/hooks/index.ts
diff --git a/src/store/global/hooks/useOnFinishHydrationGlobal.ts b/src/store/global/hooks/useOnFinishHydrationGlobal.ts
diff --git a/src/store/global/index.ts b/src/store/global/index.ts
@@ -1,2 +1 @@
-export * from './hooks';
 export * from './store';
diff --git a/src/store/global/slices/common/action.ts b/src/store/global/slices/common/action.ts
@@ -12,6 +12,9 @@ import type { GlobalStore } from '@/store/global';
 import type { GlobalServerConfig, GlobalSettings } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
+import { switchLang } from '@/utils/switchLang';
+
+import { settingsSelectors } from '../settings/selectors';
 
 const n = setNamespace('common');
 
@@ -82,6 +85,11 @@ export const createCommonSlice: StateCreator<
           if (!data) return;
 
           set({ avatar: data.avatar, settings: data.settings }, false, n('fetchUserConfig', data));
+
+          const { language } = settingsSelectors.currentSettings(get());
+          if (language === 'auto') {
+            switchLang('auto');
+          }
         },
         revalidateOnFocus: false,
       },