Revert "feat: sonner"

This reverts commit fb72500.

Signed-off-by: Innei <i@innei.in>

package.json

@@ -72,11 +72,11 @@
     "react-error-boundary": "4.0.10",
     "react-intersection-observer": "9.5.2",
     "react-tweet": "3.0.3",
+    "react-toastify": "9.1.3",
     "react-wrap-balancer": "1.0.0",
     "remove-markdown": "0.5.0",
     "shiki": "0.14.3",
     "socket.io-client": "4.7.1",
-    "sonner": "0.6.2",
     "tailwind-merge": "1.13.2",
     "xss": "1.0.14"
   },

src/app/layout.tsx

@@ -1,6 +1,7 @@
 import '../styles/index.css'
 
 import { Analytics } from '@vercel/analytics/react'
+import { ToastContainer } from 'react-toastify'
 import type { AggregateRoot } from '@mx-space/api-client'
 import type { AppThemeConfig } from './config'
 
@@ -18,7 +19,6 @@ import { queries } from '~/queries/definition'
 import { Providers } from '../providers/root'
 import { Analyze } from './analyze'
 import { init } from './init'
-import { SonnerContainer } from './SonnerContainer'
 
 const { version } = PKG
 init()
@@ -135,8 +135,8 @@ export default async function RootLayout(props: Props) {
 
             <TocAutoScroll />
             <Analyze />
-            <SonnerContainer />
           </Providers>
+          <ToastContainer />
         </body>
       </html>
       <Analytics />

src/atoms/owner.ts

@@ -17,7 +17,7 @@ export const login = async (username?: string, password?: string) => {
   if (username && password) {
     const user = await apiClient.user.login(username, password).catch((err) => {
       console.error(err)
-      toast.error('再试试哦')
+      toast('再试试哦', 'error')
       throw err
     })
     if (user) {
@@ -26,7 +26,7 @@ export const login = async (username?: string, password?: string) => {
       jotaiStore.set(isLoggedAtom, true)
 
       await fetchAppUrl()
-      toast.success(`欢迎回来，${jotaiStore.get(ownerAtom)?.name}`)
+      toast(`欢迎回来，${jotaiStore.get(ownerAtom)?.name}`, 'success')
     }
 
     return true
@@ -36,15 +36,7 @@ export const login = async (username?: string, password?: string) => {
   if (!token) {
     return
   }
-  const outdateToast = () =>
-    toast.message('登录身份过期了，再登录一下吧！', {
-      action: {
-        label: '登录',
-        onClick: () => {
-          window.location.href = '/login'
-        },
-      },
-    })
+  const outdateToast = () => toast('登录身份过期了，再登录一下吧！', 'warning')
   const validated = await apiClient.user
     .checkTokenValid(token)
     .then((res) => !!res.ok)
@@ -63,7 +55,7 @@ export const login = async (username?: string, password?: string) => {
 
   await apiClient.user.proxy.login.put<{ token: string }>().then((res) => {
     jotaiStore.set(isLoggedAtom, true)
-    toast.message(`欢迎回来，${jotaiStore.get(ownerAtom)?.name}`)
+    toast(`欢迎回来，${jotaiStore.get(ownerAtom)?.name}`, 'success')
     setToken(res.token)
   })
 

src/components/layout/header/internal/AnimatedLogo.tsx

@@ -43,7 +43,7 @@ const TapableLogo = () => {
         const adminUrl = getAdminUrl()
         if (adminUrl) location.href = adminUrl
         else {
-          toast.error('Admin url not found')
+          toast('Admin url not found', 'error')
         }
         return
       }

src/components/ui/code-highlighter/CodeHighlighter.tsx

@@ -24,7 +24,7 @@ export const HighLighter: FC<Props> = (props) => {
 
   const handleCopy = useCallback(() => {
     navigator.clipboard.writeText(value)
-    toast.success('COPIED!')
+    toast('COPIED!', 'success')
   }, [value])
 
   const prevThemeCSS = useRef<ReturnType<typeof loadStyleSheet>>()

src/components/ui/input/TextArea.tsx

@@ -48,7 +48,6 @@ export const TextArea = forwardRef<
           'h-full w-full resize-none bg-transparent',
           'overflow-auto px-3 py-4',
           'text-neutral-900/80 dark:text-slate-100/80',
-          // 'ring-accent/20 duration-200 focus:border-accent-focus focus:ring-2',
           className,
         )}
         {...rest}

src/components/ui/markdown/index.demo.tsx

@@ -1,11 +1,9 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { useRef } from 'react'
-// import { ToastContainer } from 'react-toastify'
+import { ToastContainer } from 'react-toastify'
 import { ThemeProvider } from 'next-themes'
 import type { DocumentComponent } from 'storybook/typings'
 
-import { SonnerContainer } from '~/app/SonnerContainer'
-
 // @ts-expect-error
 import customize from './customize.md?raw'
 import { Markdown } from './Markdown'
@@ -33,7 +31,7 @@ export const MarkdownCustomize: DocumentComponent = () => {
           />
         </main>
 
-        <SonnerContainer />
+        <ToastContainer />
       </ThemeProvider>
     </QueryClientProvider>
   )

src/components/widgets/note/NoteActionAside.tsx

@@ -77,8 +77,8 @@ const LikeButton = () => {
         control.start('tap', {
           repeat: 5,
         })
-        toast('谢谢你！', {
-          icon: (
+        toast('谢谢你！', undefined, {
+          iconElement: (
             <m.i
               className="icon-[mingcute--heart-fill] text-uk-red-light"
               initial={{

src/components/widgets/note/NoteHideIfSecret.tsx

@@ -26,7 +26,7 @@ export const NoteHideIfSecret: Component = ({ children }) => {
     const MAX_TIMEOUT = (2 ^ 31) - 1
     if (isSecret && timeout && timeout < MAX_TIMEOUT) {
       timer = setTimeout(() => {
-        toast.message('刷新以查看解锁的文章', { duration: Infinity })
+        toast('刷新以查看解锁的文章', 'info', { autoClose: false })
       }, timeout)
     }
 

src/components/widgets/post/PostActionAside.tsx

@@ -75,8 +75,8 @@ const LikeButton = () => {
       onClick={() => {
         handleLike()
         control.start('tap')
-        toast('捕捉一只大佬！', {
-          icon: (
+        toast('捕捉一只大佬！', undefined, {
+          iconElement: (
             <m.i
               className="text-uk-orange-light"
               initial={{