Merge pull request #4810 from h3poteto/fix/toast

Show toast
h3poteto · Jan 28, 2024 · 2c64c19 · 2c64c19
2 parents ca21bac + 613ff62
commit 2c64c19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/renderer/pages/_app.tsx b/renderer/pages/_app.tsx
@@ -4,6 +4,7 @@ import AccountLayout from '@/components/layouts/account'
 import TimelineLayout from '@/components/layouts/timelines'
 import { IntlProviderWrapper } from '@/utils/i18n'
 import { ThemeProvider } from '@material-tailwind/react'
+import { ToastProvider } from '@/utils/toast'
 
 export default function MyApp({ Component, pageProps }: AppProps) {
   const customTheme = {
@@ -102,11 +103,13 @@ export default function MyApp({ Component, pageProps }: AppProps) {
   return (
     <ThemeProvider value={customTheme}>
       <IntlProviderWrapper>
-        <AccountLayout>
-          <TimelineLayout>
-            <Component {...pageProps} />
-          </TimelineLayout>
-        </AccountLayout>
+        <ToastProvider>
+          <AccountLayout>
+            <TimelineLayout>
+              <Component {...pageProps} />
+            </TimelineLayout>
+          </AccountLayout>
+        </ToastProvider>
       </IntlProviderWrapper>
     </ThemeProvider>
   )

diff --git a/renderer/utils/toast.tsx b/renderer/utils/toast.tsx
@@ -43,12 +43,12 @@ export const ToastProvider: React.FC<Props> = ({ children }) => {
 
   return (
     <ToastContext.Provider value={showToast}>
-      {children}
       <div className={`${showable ? 'block' : 'hidden'} fixed top-2 -translate-x-1/2`} style={{ left: '50%' }}>
         <Alert color={color(toastType)} className="w96">
           <span>{toastText}</span>
         </Alert>
       </div>
+      {children}
     </ToastContext.Provider>
   )
 }