Skip to content

Fix capturing keys we shouldn't #48

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

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Fix capturing keys we shouldn't #48

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
12 changes: 6 additions & 6 deletions src/use-dropdown-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ export default function useDropdownMenu(itemCount: number) {

// Create a function that handles menu logic based on keyboard events that occur on menu items
const itemListener = (e: React.KeyboardEvent<HTMLAnchorElement>) => {
// Create mutable value that initializes as the currentFocusIndex value
let newFocusIndex = currentFocusIndex.current;

// Destructure the key property from the event object
const { key } = e;

// Prevent default browser behavior except in cases where maintaining the natural tab order is desired
if (key !== 'Tab' && key !== 'Shift' && key !== 'Enter') {
e.preventDefault();
// Ignore keys that we shouldn't handle
if (!['Tab', 'Shift', 'Enter', 'Escape', 'ArrowUp', 'ArrowDown'].includes(key)) {
return;
}

// Create mutable value that initializes as the currentFocusIndex value
let newFocusIndex = currentFocusIndex.current;

// Controls whether the menu is open or closed, if the button should regain focus on close, and if a handler function should be called
if (key === 'Escape') {
setIsOpen(false);
Expand Down