From ac5a371cef1df9cc3ed770a7041c4ec8c3368a72 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Sat, 24 Oct 2020 13:03:29 -0300 Subject: [PATCH] scroll issue --- components/core/Layout/Layout.tsx | 14 +++++++++--- components/core/UserNav/DropdownMenu.tsx | 14 ++---------- components/core/UserNav/UserNav.tsx | 27 ++++++++++-------------- components/ui/Modal/Modal.tsx | 6 +----- components/ui/Sidebar/Sidebar.tsx | 26 +++++++---------------- package.json | 1 + 6 files changed, 34 insertions(+), 54 deletions(-) diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx index 74c5a4069..7a4d1fa24 100644 --- a/components/core/Layout/Layout.tsx +++ b/components/core/Layout/Layout.tsx @@ -8,7 +8,7 @@ import Button from '@components/ui/Button' import { CartSidebarView } from '@components/cart' import { useUI } from '@components/ui/context' import s from './Layout.module.css' - +import { usePreventScroll } from '@react-aria/overlays' interface Props { pageProps: { pages?: Page[] @@ -16,10 +16,11 @@ interface Props { } const Layout: FC = ({ children, pageProps }) => { - const { displaySidebar, closeSidebar } = useUI() + const { displaySidebar, displayDropdown, closeSidebar } = useUI() const [acceptedCookies, setAcceptedCookies] = useState(false) const [hasScrolled, setHasScrolled] = useState(false) + // TODO: Update code, add throttle and more. useEffect(() => { const offset = 0 function handleScroll() { @@ -34,6 +35,11 @@ const Layout: FC = ({ children, pageProps }) => { } }, []) + console.log(displaySidebar, displayDropdown) + usePreventScroll({ + isDisabled: !displaySidebar, + }) + return (
@@ -49,9 +55,11 @@ const Layout: FC = ({ children, pageProps }) => {
{children}