fix: empty page because the provider position

This commit is contained in:
alt0
2022-12-21 21:35:04 +08:00
parent 94bd4f9a8c
commit b94aba355e
2 changed files with 18 additions and 22 deletions
@@ -2,32 +2,18 @@ import HelpIsland from '@/components/help-island';
import { WorkSpaceSliderBar } from '@/components/workspace-slider-bar';
import { useRouter } from 'next/router';
import { StyledPage, StyledWrapper } from './styles';
import { AppStateProvider } from '@/providers/app-state-provider/provider';
import ConfirmProvider from '@/providers/confirm-provider';
import { ModalProvider } from '@/providers/global-modal-provider';
import ProviderComposer from '@/components/provider-composer';
import { PropsWithChildren } from 'react';
export const WorkspaceLayout = ({ children }: PropsWithChildren) => {
const router = useRouter();
return (
<ProviderComposer
contexts={[
<AppStateProvider key="appStateProvider" />,
<ModalProvider key="ModalProvider" />,
<ConfirmProvider key="ConfirmProvider" />,
]}
>
<StyledPage>
<WorkSpaceSliderBar />
<StyledWrapper>
{children}
<HelpIsland
showList={router.query.pageId ? undefined : ['contact']}
/>
</StyledWrapper>
</StyledPage>
</ProviderComposer>
<StyledPage>
<WorkSpaceSliderBar />
<StyledWrapper>
{children}
<HelpIsland showList={router.query.pageId ? undefined : ['contact']} />
</StyledWrapper>
</StyledPage>
);
};
+11 -1
View File
@@ -10,6 +10,9 @@ import '../utils/print-build-info';
import ProviderComposer from '@/components/provider-composer';
import type { ReactElement, ReactNode } from 'react';
import type { NextPage } from 'next';
import { AppStateProvider } from '@/providers/app-state-provider/provider';
import ConfirmProvider from '@/providers/confirm-provider';
import { ModalProvider } from '@/providers/global-modal-provider';
const ThemeProvider = dynamic(() => import('@/providers/themeProvider'), {
ssr: false,
@@ -29,7 +32,14 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) {
return (
<>
<Logger />
<ProviderComposer contexts={[<ThemeProvider key="ThemeProvider" />]}>
<ProviderComposer
contexts={[
<ThemeProvider key="ThemeProvider" />,
<AppStateProvider key="appStateProvider" />,
<ModalProvider key="ModalProvider" />,
<ConfirmProvider key="ConfirmProvider" />,
]}
>
{getLayout(<Component {...pageProps} />)}
</ProviderComposer>
</>