Skip to content

Fix: Added Accessibility in mobile for touch and keyboard #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −65
Draft

Fix: Added Accessibility in mobile for touch and keyboard #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
144 changes: 79 additions & 65 deletions src/components/primary-menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
import { Menu } from "@headlessui/react";
import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
import { useState, useCallback } from "react";
import { createPortal } from "react-dom";
import CustomLink from "./link";

export default function PrimaryMenu() {
const [isMenuOpen, setIsMenuOpen] = useState(false);

// Use useCallback to memoize the toggle handler
const handleMenuToggle = useCallback(() => {
setIsMenuOpen((previous) => !previous);
}, []);

const handleMenuItemClick = useCallback(() => {
setIsMenuOpen(false);
}, []);
// A helper that portals children to the body (or a different root).
function MenuPortal({ children }) {
if (typeof globalThis === "undefined") return;
return createPortal(children, document.body);
}

export default function PrimaryMenu() {
const navItemClass =
"text-gray-200 hover:text-white transition-colors duration-200";

Expand Down Expand Up @@ -47,59 +42,78 @@ export default function PrimaryMenu() {
</CustomLink>
</div>

<Menu>
<MenuButton
className="group rounded-md px-2 py-1.5 text-white/70 hover:text-white md:hidden"
onClick={handleMenuToggle}
>
<span className="sr-only">
{isMenuOpen ? "Close menu" : "Open menu"}
</span>
{isMenuOpen ? (
<XMarkIcon className="size-6" />
) : (
<Bars3Icon className="size-6" />
)}
</MenuButton>

{isMenuOpen && (
<MenuItems
static
className="absolute top-[84.5px] -left-4 flex w-full flex-col items-center justify-around gap-4 border-b-[.5px] border-gray-400 bg-gray-900/80 py-4 text-lg"
>
<MenuItem onClick={handleMenuItemClick}>
<CustomLink
className={navItemClass}
noDefaultStyles
href="/docs/"
activeClassName="text-purple-500"
>
Docs
</CustomLink>
</MenuItem>
<MenuItem onClick={handleMenuItemClick}>
<CustomLink
className={navItemClass}
noDefaultStyles
href="/blog/"
activeClassName="text-purple-500"
>
Blog
</CustomLink>
</MenuItem>
<MenuItem onClick={handleMenuItemClick}>
<CustomLink
className={navItemClass}
noDefaultStyles
href="/showcase/"
activeClassName="text-purple-500"
<div className="md:hidden">
<Menu as="div">
{({ open }) => (
<>
<Menu.Button
className="rounded-md px-2 py-1.5 text-white/70 hover:text-white focus:ring-2 focus:ring-purple-500 focus:outline-none"
aria-label={open ? "Close menu" : "Open menu"}
>
Showcase
</CustomLink>
</MenuItem>
</MenuItems>
)}
</Menu>
{open ? (
<XMarkIcon className="size-6" />
) : (
<Bars3Icon className="size-6" />
)}
</Menu.Button>

{open && (
<MenuPortal>
<Menu.Items
static
className="fixed inset-x-0 top-[60px] z-50 border-b-[.5px] border-gray-400 bg-gray-900 outline-none"
>
<div className="flex flex-col items-center justify-around gap-4 py-4 text-lg">
<Menu.Item>
{({ active }) => (
<CustomLink
className={`block w-full p-4 text-center ${navItemClass} ${
active ? "bg-purple-500/20" : ""
} hover:bg-purple-500/20 focus:bg-purple-500/20 focus:outline-none`}
noDefaultStyles
href="/docs/"
activeClassName="text-purple-500"
>
Docs
</CustomLink>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<CustomLink
className={`block w-full p-4 text-center ${navItemClass} ${
active ? "bg-purple-500/20" : ""
} hover:bg-purple-500/20 focus:bg-purple-500/20 focus:outline-none`}
noDefaultStyles
href="/blog/"
activeClassName="text-purple-500"
>
Blog
</CustomLink>
)}
</Menu.Item>
<Menu.Item>
{({ active }) => (
<CustomLink
className={`block w-full p-4 text-center ${navItemClass} ${
active ? "bg-purple-500/20" : ""
} hover:bg-purple-500/20 focus:bg-purple-500/20 focus:outline-none`}
noDefaultStyles
href="/showcase/"
activeClassName="text-purple-500"
>
Showcase
</CustomLink>
)}
</Menu.Item>
</div>
</Menu.Items>
</MenuPortal>
)}
</>
)}
</Menu>
</div>
</nav>
);
}