fix ui: move confirm modal inside ant and store ctx providers (#2241)
This commit is contained in:
parent
3aeea9a3b0
commit
02cd4997de
5 changed files with 26 additions and 11 deletions
|
|
@ -1,5 +1,8 @@
|
|||
import { createConfirmation } from 'react-confirm';
|
||||
import { createConfirmationCreater, createReactTreeMounter, createMountPoint } from 'react-confirm';
|
||||
import Confirmation from './Confirmation';
|
||||
|
||||
export default createConfirmation(Confirmation);
|
||||
// export { default } from './Confirmation';
|
||||
const mounter = createReactTreeMounter();
|
||||
const createConfirmation = createConfirmationCreater(mounter);
|
||||
|
||||
export const MountPoint = createMountPoint(mounter);
|
||||
export default createConfirmation(Confirmation);
|
||||
|
|
@ -30,7 +30,7 @@ export { default as Tooltip } from './Tooltip';
|
|||
export { default as CountryFlag } from './CountryFlag';
|
||||
export { default as RandomElement } from './RandomElement';
|
||||
export { default as SplitButton } from './SplitButton';
|
||||
export { default as confirm } from './Confirmation';
|
||||
export { default as confirm, MountPoint } from './Confirmation';
|
||||
export { default as SideMenuitem } from './SideMenuItem';
|
||||
export { default as Avatar } from './Avatar';
|
||||
export { default as TimezoneDropdown } from './TimezoneDropdown';
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import { DndProvider } from 'react-dnd';
|
|||
import { ConfigProvider, theme, ThemeConfig } from 'antd';
|
||||
import colors from 'App/theme/colors';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
import { Notification } from 'UI';
|
||||
import { Notification, MountPoint } from 'UI';
|
||||
|
||||
// @ts-ignore
|
||||
window.getCommitHash = () => console.log(window.env.COMMIT_HASH);
|
||||
|
|
@ -81,6 +81,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||
<Router />
|
||||
</BrowserRouter>
|
||||
</DndProvider>
|
||||
<MountPoint />
|
||||
</StoreProvider>
|
||||
</Provider>
|
||||
</ConfigProvider>
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
"rc-time-picker": "^3.7.3",
|
||||
"react": "^18.2.0",
|
||||
"react-circular-progressbar": "^2.1.0",
|
||||
"react-confirm": "^0.2.3",
|
||||
"react-confirm": "^0.3.0-7",
|
||||
"react-daterange-picker": "^2.0.1",
|
||||
"react-dnd": "^16.0.1",
|
||||
"react-dnd-html5-backend": "^15.1.2",
|
||||
|
|
@ -117,6 +117,7 @@
|
|||
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
|
||||
"@types/luxon": "^3.0.0",
|
||||
"@types/react": "^18.0.9",
|
||||
"@types/react-confirm": "^0.2.3",
|
||||
"@types/react-dom": "^18.0.4",
|
||||
"@types/react-redux": "^7.1.24",
|
||||
"@types/react-router-dom": "^5.3.3",
|
||||
|
|
|
|||
|
|
@ -5366,6 +5366,15 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react-confirm@npm:^0.2.3":
|
||||
version: 0.2.3
|
||||
resolution: "@types/react-confirm@npm:0.2.3"
|
||||
dependencies:
|
||||
"@types/react": "*"
|
||||
checksum: 2a1e24de5adf70c4d4ab1408fe770b0e003f0a6f8f643ec0e195915e13654fe68943b8c57e8842eff17910f171923f32682588b8b5d4aca18e6786ef251e3052
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react-dom@npm:^18.0.4":
|
||||
version: 18.2.24
|
||||
resolution: "@types/react-dom@npm:18.2.24"
|
||||
|
|
@ -18269,6 +18278,7 @@ __metadata:
|
|||
"@trivago/prettier-plugin-sort-imports": ^4.3.0
|
||||
"@types/luxon": ^3.0.0
|
||||
"@types/react": ^18.0.9
|
||||
"@types/react-confirm": ^0.2.3
|
||||
"@types/react-dom": ^18.0.4
|
||||
"@types/react-redux": ^7.1.24
|
||||
"@types/react-router-dom": ^5.3.3
|
||||
|
|
@ -18333,7 +18343,7 @@ __metadata:
|
|||
rc-time-picker: ^3.7.3
|
||||
react: ^18.2.0
|
||||
react-circular-progressbar: ^2.1.0
|
||||
react-confirm: ^0.2.3
|
||||
react-confirm: ^0.3.0-7
|
||||
react-daterange-picker: ^2.0.1
|
||||
react-dnd: ^16.0.1
|
||||
react-dnd-html5-backend: ^15.1.2
|
||||
|
|
@ -20845,13 +20855,13 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"react-confirm@npm:^0.2.3":
|
||||
version: 0.2.4
|
||||
resolution: "react-confirm@npm:0.2.4"
|
||||
"react-confirm@npm:^0.3.0-7":
|
||||
version: 0.3.0-7
|
||||
resolution: "react-confirm@npm:0.3.0-7"
|
||||
peerDependencies:
|
||||
react: 18.x
|
||||
react-dom: 18.x
|
||||
checksum: b06897e41a50985bc2107b3f3b5abf658e2de84177f8c1c39968e64f2afd20e44c3506c5ba6b51b6dd9ba2289ea9df9a4e39008aa8d8de73af6f0cbfd6515d46
|
||||
checksum: 38c863bce5f3b8c4c17b59f995da77d69f1b442c5c7e812d8a62f2721a426d859ae17d3e4ed3eaf878cf458b3be047cedb1ec125aa5a29cd2a03eaef773923c8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue