fix: 修复modal状态管理问题

pull/13/head
moonrailgun 4 years ago
parent 843c695ae0
commit 3b2950151e

@ -35,7 +35,7 @@ const AppProvider: React.FC = React.memo((props) => {
<BrowserRouter> <BrowserRouter>
<TcProvider> <TcProvider>
<AntdProvider getPopupContainer={getPopupContainer}> <AntdProvider getPopupContainer={getPopupContainer}>
<PortalHost>{props.children}</PortalHost> {props.children}
</AntdProvider> </AntdProvider>
</TcProvider> </TcProvider>
</BrowserRouter> </BrowserRouter>

@ -1,9 +1,10 @@
import { Divider } from 'antd'; import { Divider } from 'antd';
import React, { useCallback } from 'react'; import React from 'react';
import { useParams } from 'react-router'; import { useParams } from 'react-router';
import { InviteInfo } from './InviteInfo'; import { InviteInfo } from './InviteInfo';
import bgImage from '@assets/images/bg.jpg'; import bgImage from '@assets/images/bg.jpg';
import { JoinBtn } from './JoinBtn'; import { JoinBtn } from './JoinBtn';
import { PortalHost } from '@/components/Portal';
/** /**
* *
@ -12,18 +13,20 @@ export const InviteRoute: React.FC = React.memo(() => {
const { inviteCode } = useParams<{ inviteCode: string }>(); const { inviteCode } = useParams<{ inviteCode: string }>();
return ( return (
<div <PortalHost>
className="h-full w-full bg-gray-600 flex justify-center items-center bg-center bg-cover bg-no-repeat" <div
style={{ backgroundImage: `url(${bgImage})` }} className="h-full w-full bg-gray-600 flex justify-center items-center bg-center bg-cover bg-no-repeat"
> style={{ backgroundImage: `url(${bgImage})` }}
<div className="w-96 p-4 rounded-lg shadow-lg bg-black bg-opacity-60 text-center"> >
<InviteInfo inviteCode={inviteCode} /> <div className="w-96 p-4 rounded-lg shadow-lg bg-black bg-opacity-60 text-center">
<InviteInfo inviteCode={inviteCode} />
<Divider /> <Divider />
<JoinBtn inviteCode={inviteCode} /> <JoinBtn inviteCode={inviteCode} />
</div>
</div> </div>
</div> </PortalHost>
); );
}); });
InviteRoute.displayName = 'InviteRoute'; InviteRoute.displayName = 'InviteRoute';

@ -14,6 +14,7 @@ import _isNil from 'lodash/isNil';
import { getUserJWT } from '../../utils/jwt-helper'; import { getUserJWT } from '../../utils/jwt-helper';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { SidebarContextProvider } from './SidebarContext'; import { SidebarContextProvider } from './SidebarContext';
import { PortalHost } from '@/components/Portal';
/** /**
* hooks * hooks
@ -79,7 +80,9 @@ export const MainProvider: React.FC = React.memo((props) => {
return ( return (
<ReduxProvider store={store}> <ReduxProvider store={store}>
<SidebarContextProvider>{props.children}</SidebarContextProvider> <SidebarContextProvider>
<PortalHost>{props.children}</PortalHost>
</SidebarContextProvider>
</ReduxProvider> </ReduxProvider>
); );
}); });

Loading…
Cancel
Save