Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/navigation/MobileNavMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function MobileNavMenu({
const languageButtonHoverClass = 'ease-in-out hover:bg-gray-100/60 dark:hover:bg-gray-700/40 hover:translate-x-1';

return (
<div className='fixed inset-x-0 top-0 z-60 max-h-full origin-top-right overflow-y-auto py-2 transition lg:hidden animate-in fade-in slide-in-from-top-5 duration-300'>
<div className='fixed inset-x-0 top-0 z-60 max-h-full origin-top-right overflow-y-auto py-2 transition min-[1100px]:hidden animate-in fade-in slide-in-from-top-5 duration-300'>
<div className='mx-2 rounded-2xl'>
<div className='shadow-xs divide-y divide-gray-100/50 dark:divide-gray-700/50 rounded-2xl bg-white/90 dark:bg-dark-card/90 backdrop-blur-xl border border-gray-200/50 dark:border-gray-700/50'>
<div className='space-y-6 px-5 pb-6 pt-5'>
Expand Down
29 changes: 19 additions & 10 deletions components/navigation/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { NextRouter } from 'next/router';
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
import React, { useEffect, useState } from 'react';
import { createPortal } from 'react-dom';

import { defaultLanguage, i18nPaths, languages } from '@/utils/i18n';

Expand Down Expand Up @@ -40,9 +41,14 @@ export default function NavBar({ className = '', hideLogo = false }: NavBarProps
const { pathname, query, asPath } = router;
const [open, setOpen] = useState<'learning' | 'tooling' | 'community' | null>(null);
const [mobileMenuOpen, setMobileMenuOpen] = useState<boolean>(false);
const [isMounted, setIsMounted] = useState<boolean>(false);
const [isScrolled, setIsScrolled] = useState<boolean>(false);
const { i18n } = useTranslation();

useEffect(() => {
setIsMounted(true);
}, []);

// Adding Scroll listener
useEffect(() => {
const handleScroll = debounce(() => {
Expand Down Expand Up @@ -194,7 +200,7 @@ export default function NavBar({ className = '', hideLogo = false }: NavBarProps
)}

<div
className='-my-2 -mr-2 flex flex-row items-center justify-center gap-1 lg:hidden'
className='-my-2 -mr-2 flex flex-row items-center justify-center gap-1 min-[1100px]:hidden'
data-testid='Navbar-search'
>
<SearchButton
Expand All @@ -218,7 +224,7 @@ export default function NavBar({ className = '', hideLogo = false }: NavBarProps
</div>

<nav
className='hidden w-full space-x-4 lg:flex lg:items-center lg:justify-end xl:space-x-8'
className='hidden w-full space-x-4 min-[1100px]:flex min-[1100px]:items-center min-[1100px]:justify-end xl:space-x-8'
data-testid='Navbar-main'
>
<div className='relative' onMouseLeave={() => showMenu(null)} ref={learningRef}>
Expand Down Expand Up @@ -293,14 +299,17 @@ export default function NavBar({ className = '', hideLogo = false }: NavBarProps

{/* </div> */}
{/* Mobile menu, show/hide based on mobile menu state. */}
{mobileMenuOpen && (
<MobileNavMenu
onClickClose={() => setMobileMenuOpen(false)}
uniqueLangs={uniqueLangs}
currentLanguage={i18n.language ? i18n.language : 'en'}
changeLanguage={changeLanguage}
/>
)}
{isMounted &&
mobileMenuOpen &&
createPortal(
<MobileNavMenu
onClickClose={() => setMobileMenuOpen(false)}
uniqueLangs={uniqueLangs}
currentLanguage={i18n.language ? i18n.language : 'en'}
changeLanguage={changeLanguage}
/>,
document.body
)}
</>
);
}
Loading