diff --git a/package-lock.json b/package-lock.json index c2d70aa..a3de847 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21968,14 +21968,6 @@ } } }, - "react-portal": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-4.2.2.tgz", - "integrity": "sha512-vS18idTmevQxyQpnde0Td6ZcUlv+pD8GTyR42n3CHUQq9OHi1C4jDE4ZWEbEsrbrLRhSECYiao58cvocwMtP7Q==", - "requires": { - "prop-types": "^15.5.8" - } - }, "react-rating": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/react-rating/-/react-rating-2.0.5.tgz", diff --git a/package.json b/package.json index 9109bfb..af65893 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "react-pdf": "5.3.2", "react-perfect-scrollbar": "1.5.5", "react-player": "2.6.2", - "react-portal": "^4.2.2", "react-rating": "2.0.5", "react-redux": "7.2.2", "react-router-dom": "5.2.0", diff --git a/src/@core/layouts/VerticalLayout.js b/src/@core/layouts/VerticalLayout.js index 4e990e6..31eda8c 100644 --- a/src/@core/layouts/VerticalLayout.js +++ b/src/@core/layouts/VerticalLayout.js @@ -126,7 +126,6 @@ const VerticalLayout = props => { } return (
{ // ** Props - const { layout, children, appLayout, wrapperClass, transition, routeMeta } = props + const { layout, children, appLayout, wrapperClass, transition, routeMeta } = + props; // ** Store Vars - const dispatch = useDispatch() - const store = useSelector(state => state) - const navbarStore = store.navbar - const contentWidth = store.layout.contentWidth + const dispatch = useDispatch(); + const store = useSelector(state => state); + const navbarStore = store.navbar; + const contentWidth = store.layout.contentWidth; //** Vars - const Tag = layout === 'HorizontalLayout' && !appLayout ? 'div' : Fragment + const Tag = layout === 'HorizontalLayout' && !appLayout ? 'div' : Fragment; // ** Clean Up Function const cleanUp = () => { if (routeMeta) { if (routeMeta.contentWidth) { - dispatch(handleContentWidth('full')) + dispatch(handleContentWidth('full')); } if (routeMeta.menuCollapsed) { - dispatch(handleMenuCollapsed(!routeMeta.menuCollapsed)) + dispatch(handleMenuCollapsed(!routeMeta.menuCollapsed)); } if (routeMeta.menuHidden) { - dispatch(handleMenuHidden(!routeMeta.menuHidden)) + dispatch(handleMenuHidden(!routeMeta.menuHidden)); } } - } + }; // ** ComponentDidMount useEffect(() => { if (routeMeta) { if (routeMeta.contentWidth) { - dispatch(handleContentWidth(routeMeta.contentWidth)) + dispatch(handleContentWidth(routeMeta.contentWidth)); } if (routeMeta.menuCollapsed) { - dispatch(handleMenuCollapsed(routeMeta.menuCollapsed)) + dispatch(handleMenuCollapsed(routeMeta.menuCollapsed)); } if (routeMeta.menuHidden) { - dispatch(handleMenuHidden(routeMeta.menuHidden)) + dispatch(handleMenuHidden(routeMeta.menuHidden)); } } - return () => cleanUp() - }, []) + return () => cleanUp(); + }, []); return (
{ 'content-wrapper': !appLayout, 'content-area-wrapper': appLayout, 'container p-0': contentWidth === 'boxed', - [`animate__animated animate__${transition}`]: transition !== 'none' && transition.length + [`animate__animated animate__${transition}`]: + transition !== 'none' && transition.length })} > {
- ) -} + ); +}; -export default LayoutWrapper +export default LayoutWrapper; diff --git a/src/views/vertiport/VertiportView.js b/src/views/vertiport/VertiportView.js index b34617f..a775fe2 100644 --- a/src/views/vertiport/VertiportView.js +++ b/src/views/vertiport/VertiportView.js @@ -20,7 +20,7 @@ export default function VertiportView() { openSetting={openSetting} setOpenSetting={setOpenSetting} />, - document.getElementById('vertical') + document.getElementById('app-content') )} );