Merge pull request #21 from yingpengsha/fix/apply-siteConfig

🐛 fix: apply siteToken configuration
lobehub · Oct 18, 2023 · 730fbd5 · 730fbd5
2 parents e7208f1 + 7a37f54
commit 730fbd5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/layouts/DocLayout/index.tsx b/src/layouts/DocLayout/index.tsx
@@ -5,19 +5,23 @@ import { shallow } from 'zustand/shallow';
 import Favicons from '@/components/Favicons';
 import { StoreUpdater } from '@/components/StoreUpdater';
 import GlobalStyle from '@/layouts/DocLayout/GlobalStyle';
-import { useThemeStore } from '@/store';
+import { siteSelectors, useSiteStore, useThemeStore } from '@/store';
 import customToken from '@/styles/customToken';
 
 import DocumentLayout from './DocumentLayout';
 
 const App = memo(() => {
   const themeMode = useThemeStore((st) => st.themeMode, shallow);
+  const userToken = useSiteStore(siteSelectors.token);
 
   return (
     <>
       <Favicons />
       <StoreUpdater />
-      <ThemeProvider customToken={customToken} themeMode={themeMode}>
+      <ThemeProvider
+        customToken={(themeToken) => Object.assign({}, customToken(themeToken), userToken)}
+        themeMode={themeMode}
+      >
         <GlobalStyle />
         <DocumentLayout />
       </ThemeProvider>