From 2ae113ed6610d7f1331fec64913da6e13ab28b9f Mon Sep 17 00:00:00 2001 From: Martin Bavio Date: Tue, 27 Oct 2020 00:52:49 -0300 Subject: [PATCH] Adds some extra logic for handling sidebar --- components/core/UserNav/DropdownMenu.tsx | 4 ++++ components/core/UserNav/UserNav.tsx | 9 +++------ components/ui/context.tsx | 8 ++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/components/core/UserNav/DropdownMenu.tsx b/components/core/UserNav/DropdownMenu.tsx index 2d4ccf8b8..85a856f6c 100644 --- a/components/core/UserNav/DropdownMenu.tsx +++ b/components/core/UserNav/DropdownMenu.tsx @@ -4,6 +4,7 @@ import { useTheme } from 'next-themes' import cn from 'classnames' import s from './DropdownMenu.module.css' import { Moon, Sun } from '@components/icons' +import { useUI } from '@components/ui/context' import { Menu, Transition } from '@headlessui/react' import useLogout from '@bigcommerce/storefront-data-hooks/dist/use-logout' import { useRouter } from 'next/router' @@ -32,6 +33,8 @@ const DropdownMenu: FC = ({ open = false }) => { const logout = useLogout() const { pathname } = useRouter() + const { closeSidebarIfPresent } = useUI() + return ( = ({ open = false }) => { className={cn(s.link, { [s.active]: pathname === href, })} + onClick={closeSidebarIfPresent} > {name} diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx index ab5ea9da1..e86591073 100644 --- a/components/core/UserNav/UserNav.tsx +++ b/components/core/UserNav/UserNav.tsx @@ -21,21 +21,18 @@ const UserNav: FC = ({ className, children, ...props }) => { const { data } = useCart() const { data: customer } = useCustomer() - const { openSidebar, closeSidebar, displaySidebar, openModal } = useUI() + const { toggleSidebar, closeSidebarIfPresent, openModal } = useUI() const itemsCount = Object.values(data?.line_items ?? {}).reduce(countItems, 0) return (