diff --git a/src/components/custom-nav-link/index.tsx b/src/components/custom-nav-link/index.tsx index a26ee13f..009c383c 100644 --- a/src/components/custom-nav-link/index.tsx +++ b/src/components/custom-nav-link/index.tsx @@ -17,7 +17,8 @@ const CustomNavLink: React.FC = ({ onClick, }) => { const location = useLocation(); - const isActive = location.pathname === to; + const pathnameWithHash = location.pathname.concat(location.hash); + const isActive = pathnameWithHash === to; return ( void; } -const NavigationBar: React.FC = ({ isOpen }) => { +const NavigationBar: React.FC = ({ isOpen, onClick }) => { + const { isLoggedIn } = useAuth(); + const { handleOpenPopup } = usePopup(); + const burgerRef = useRef(null); + + const handleClick = () => { + onClick(); + handleOpenPopup('openPopupLogin'); + }; + + const closeBurger = (e: MouseEvent) => { + if (isOpen && !burgerRef.current?.contains(e.target as Node)) { + onClick(); + } + }; + const closeBurgerOnEsc = (e: KeyboardEvent) => { + console.log(e); + if (isOpen && e.key === 'Escape') { + onClick(); + } + }; + + useEffect(() => { + document.addEventListener('pointerdown', closeBurger); + document.addEventListener('keydown', closeBurgerOnEsc); + return () => { + document.removeEventListener('pointerdown', closeBurger); + document.removeEventListener('keydown', closeBurgerOnEsc); + }; + }); + return (
); diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx index 4721f3fe..76df54e8 100644 --- a/src/pages/home/index.tsx +++ b/src/pages/home/index.tsx @@ -8,10 +8,12 @@ import TopSellingThisWeek from '@components/top-selling-this-week'; import AboutCompany from '@components/about-company/index.tsx'; import OurBlock from '@components/our-block'; import CatalogPromo from '@components/catalog-promo'; +import ScrollToAnchorHash from '@components/scroll-to-anchor-hash'; const Home: React.FC = () => { return (
+
@@ -32,7 +34,7 @@ const Home: React.FC = () => {
-
+