From 5fb90ff85421891b2e0f4f9e57096fdc399b7e24 Mon Sep 17 00:00:00 2001
From: tszhong0411 <me@honghong.me>
Date: Thu, 6 Feb 2025 23:46:16 +0800
Subject: [PATCH] refactor: move sonner component into providers directly

---
 apps/docs/src/app/providers.tsx     | 15 +++++++++++----
 apps/docs/src/components/sonner.tsx | 21 ---------------------
 apps/web/src/app/providers.tsx      | 15 +++++++++++----
 apps/web/src/components/sonner.tsx  | 21 ---------------------
 4 files changed, 22 insertions(+), 50 deletions(-)
 delete mode 100644 apps/docs/src/components/sonner.tsx
 delete mode 100644 apps/web/src/components/sonner.tsx

diff --git a/apps/docs/src/app/providers.tsx b/apps/docs/src/app/providers.tsx
index cee47846..d8e13044 100644
--- a/apps/docs/src/app/providers.tsx
+++ b/apps/docs/src/app/providers.tsx
@@ -1,8 +1,7 @@
 'use client'
 
-import { ThemeProvider } from 'next-themes'
-
-import Sonner from '@/components/sonner'
+import { Toaster, type ToasterProps } from '@tszhong0411/ui'
+import { ThemeProvider, useTheme } from 'next-themes'
 
 type ProvidesProps = {
   children: React.ReactNode
@@ -10,6 +9,7 @@ type ProvidesProps = {
 
 const Providers = (props: ProvidesProps) => {
   const { children } = props
+  const { theme } = useTheme()
 
   return (
     <ThemeProvider
@@ -20,7 +20,14 @@ const Providers = (props: ProvidesProps) => {
       disableTransitionOnChange
     >
       {children}
-      <Sonner />
+      <Toaster
+        toastOptions={{
+          duration: 2500
+        }}
+        visibleToasts={5}
+        theme={theme as ToasterProps['theme']}
+        expand
+      />
     </ThemeProvider>
   )
 }
diff --git a/apps/docs/src/components/sonner.tsx b/apps/docs/src/components/sonner.tsx
deleted file mode 100644
index 46a329d7..00000000
--- a/apps/docs/src/components/sonner.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { Toaster, type ToasterProps } from '@tszhong0411/ui'
-import { useTheme } from 'next-themes'
-
-const Sonner = () => {
-  const { theme } = useTheme()
-
-  return (
-    <Toaster
-      toastOptions={{
-        duration: 2500
-      }}
-      visibleToasts={5}
-      theme={theme as ToasterProps['theme']}
-      expand
-    />
-  )
-}
-
-export default Sonner
diff --git a/apps/web/src/app/providers.tsx b/apps/web/src/app/providers.tsx
index 22559b6a..f8d2df5c 100644
--- a/apps/web/src/app/providers.tsx
+++ b/apps/web/src/app/providers.tsx
@@ -1,11 +1,10 @@
 'use client'
 
-import { TooltipProvider } from '@tszhong0411/ui'
+import { Toaster, type ToasterProps, TooltipProvider } from '@tszhong0411/ui'
 import { SessionProvider } from 'next-auth/react'
-import { ThemeProvider } from 'next-themes'
+import { ThemeProvider, useTheme } from 'next-themes'
 import { Suspense } from 'react'
 
-import Sonner from '@/components/sonner'
 import { TRPCReactProvider } from '@/trpc/react'
 
 import Debug from './debug'
@@ -16,6 +15,7 @@ type ProvidesProps = {
 
 const Providers = (props: ProvidesProps) => {
   const { children } = props
+  const { theme } = useTheme()
 
   return (
     <TRPCReactProvider>
@@ -29,7 +29,14 @@ const Providers = (props: ProvidesProps) => {
         <SessionProvider>
           <TooltipProvider>
             {children}
-            <Sonner />
+            <Toaster
+              toastOptions={{
+                duration: 2500
+              }}
+              visibleToasts={5}
+              theme={theme as ToasterProps['theme']}
+              expand
+            />
             <Suspense>
               <Debug />
             </Suspense>
diff --git a/apps/web/src/components/sonner.tsx b/apps/web/src/components/sonner.tsx
deleted file mode 100644
index 46a329d7..00000000
--- a/apps/web/src/components/sonner.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { Toaster, type ToasterProps } from '@tszhong0411/ui'
-import { useTheme } from 'next-themes'
-
-const Sonner = () => {
-  const { theme } = useTheme()
-
-  return (
-    <Toaster
-      toastOptions={{
-        duration: 2500
-      }}
-      visibleToasts={5}
-      theme={theme as ToasterProps['theme']}
-      expand
-    />
-  )
-}
-
-export default Sonner