Skip to content

Commit

Permalink
change CSS injection order with MUI styled engine provider (#264)
Browse files Browse the repository at this point in the history
Co-authored-by: test <[email protected]>
hannahmcg and test authored Nov 18, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 70a9abc commit 560daf6
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ import CustomToast from "@/components/CustomToast";
import Layout from "@/components/layout/Layout";
import { LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
import { StyledEngineProvider } from "@mui/material/styles";

interface CustomPageProps {
session: Session;
@@ -81,18 +82,20 @@ export default function App({
<meta name="description" content="Make IEPs easier" />
<link rel="icon" href="/img/favicon.png" />
</Head>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<trpc.Provider client={trpcClient} queryClient={queryClient}>
<QueryClientProvider client={queryClient}>
<SessionProvider session={pageProps.session}>
{errorMessage && <CustomToast errorMessage={errorMessage} />}
<Layout>
<Component {...pageProps} showErrorToast={toast.error} />
</Layout>
</SessionProvider>
</QueryClientProvider>
</trpc.Provider>
</LocalizationProvider>
<StyledEngineProvider injectFirst>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<trpc.Provider client={trpcClient} queryClient={queryClient}>
<QueryClientProvider client={queryClient}>
<SessionProvider session={pageProps.session}>
{errorMessage && <CustomToast errorMessage={errorMessage} />}
<Layout>
<Component {...pageProps} showErrorToast={toast.error} />
</Layout>
</SessionProvider>
</QueryClientProvider>
</trpc.Provider>
</LocalizationProvider>
</StyledEngineProvider>
</>
);
}

0 comments on commit 560daf6

Please sign in to comment.