This commit is contained in:
Gregory Schier
2024-09-03 06:44:51 -07:00
parent 942f959c36
commit 90e2eb67e5
5 changed files with 23 additions and 84 deletions

View File

@@ -4,7 +4,6 @@ import { Outlet } from 'react-router-dom';
import { useOsInfo } from '../hooks/useOsInfo';
import { DialogProvider, Dialogs } from './DialogContext';
import { GlobalHooks } from './GlobalHooks';
import { RequestEditorProvider } from './RequestEditorContext';
import { ToastProvider, Toasts } from './ToastContext';
export function DefaultLayout() {
@@ -12,25 +11,23 @@ export function DefaultLayout() {
return (
<DialogProvider>
<ToastProvider>
<RequestEditorProvider>
<>
{/* Must be inside all the providers, so they have access to them */}
<Toasts />
<Dialogs />
</>
<motion.div
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.1, delay: 0.1 }}
className={classNames(
'w-full h-full',
osInfo?.osType === 'linux' && 'border border-border-subtle',
)}
>
<Outlet />
</motion.div>
<GlobalHooks />
</RequestEditorProvider>
<>
{/* Must be inside all the providers, so they have access to them */}
<Toasts />
<Dialogs />
</>
<motion.div
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.1, delay: 0.1 }}
className={classNames(
'w-full h-full',
osInfo?.osType === 'linux' && 'border border-border-subtle',
)}
>
<Outlet />
</motion.div>
<GlobalHooks />
</ToastProvider>
</DialogProvider>
);