fix: theme provider

Signed-off-by: Innei <i@innei.in>
Innei · Feb 17, 2024 · cc58472 · cc58472
1 parent a84cb55
commit cc58472
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx
@@ -13,7 +13,6 @@ import { ScrollTop } from '~/components/common/ScrollTop'
 import { Root } from '~/components/layout/root/Root'
 import { AccentColorStyleInjector } from '~/components/modules/shared/AccentColorStyleInjector'
 import { SearchPanelWithHotKey } from '~/components/modules/shared/SearchFAB'
-import { Theme } from '~/components/modules/shared/Theme'
 import { TocAutoScroll } from '~/components/modules/toc/TocAutoScroll'
 import { attachUAAndRealIp } from '~/lib/attach-ua'
 import { sansFont, serifFont } from '~/lib/fonts'
@@ -147,7 +146,6 @@ export default async function RootLayout(props: PropsWithChildren) {
           suppressHydrationWarning
         >
           <head>
-            <Theme />
             <Global />
             <SayHi />
             <HydrationEndDetector />

diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
@@ -17,7 +17,6 @@ import type { Viewport } from 'next'
 
 import { MainLayout } from '~/components/modules/dashboard/layouts'
 import { AccentColorStyleInjector } from '~/components/modules/shared/AccentColorStyleInjector'
-import { Theme } from '~/components/modules/shared/Theme'
 import { FABContainer } from '~/components/ui/fab'
 
 export function generateViewport(): Viewport {
@@ -45,7 +44,6 @@ export default async function RootLayout({ children }: PropsWithChildren) {
   return (
     <html lang="zh-CN" suppressHydrationWarning>
       <head>
-        <Theme />
         <title>Shiro · Light Dashboard | Powered by Mix Space</title>
         <HydrationEndDetector />
         <AccentColorStyleInjector />

diff --git a/src/components/modules/shared/Theme.tsx b/src/components/modules/shared/Theme.tsx
diff --git a/src/providers/root/index.tsx b/src/providers/root/index.tsx
@@ -6,6 +6,7 @@ import {
 } from './react-query-provider'
 import { Provider as BalancerProvider } from 'react-wrap-balancer'
 import { LazyMotion } from 'framer-motion'
+import { ThemeProvider } from 'next-themes'
 import type { PropsWithChildren } from 'react'
 
 import { ModalStackProvider } from '~/components/ui/modal'
@@ -24,6 +25,7 @@ const loadFeatures = () =>
   import('./framer-lazy-feature').then((res) => res.default)
 
 const baseContexts: JSX.Element[] = [
+  <ThemeProvider key="themeProvider" />,
   <JotaiStoreProvider key="jotaiStoreProvider" />,
 
   <BalancerProvider key="balancerProvider" />,