Skip to content

fix(Menu/Nav): flyout variants work with VO navigation #7772

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
nicolethoen merged 1 commit into from
Aug 1, 2022
Merged

fix(Menu/Nav): flyout variants work with VO navigation #7772

Show file tree
Hide file tree
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: 7 additions & 5 deletions packages/react-core/src/components/Menu/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,12 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
}
}, [flyoutVisible, flyoutTarget]);

const handleFlyout = (event: React.KeyboardEvent) => {
const key = event.key;
const handleFlyout = (event: React.KeyboardEvent | React.MouseEvent) => {
const key = (event as React.KeyboardEvent).key;
const target = event.target;
const type = event.type;

if (key === ' ' || key === 'Enter' || key === 'ArrowRight') {
if (key === ' ' || key === 'Enter' || key === 'ArrowRight' || type === 'click') {
event.stopPropagation();
if (!flyoutVisible) {
showFlyout(true);
Expand Down Expand Up @@ -248,7 +249,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
if (isOnPath) {
additionalProps['aria-expanded'] = true;
} else if (hasFlyout) {
additionalProps['aria-haspopup'] = true;
additionalProps['aria-haspopup'] = 'menu';
additionalProps['aria-expanded'] = flyoutVisible;
}
const getAriaCurrent = () => {
Expand Down Expand Up @@ -305,12 +306,13 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
className={css(styles.menuItem, getIsSelected() && !hasCheck && styles.modifiers.selected, className)}
aria-current={getAriaCurrent()}
{...(!hasCheck && { disabled: isDisabled })}
{...(!hasCheck && { role: 'menuitem' })}
{...(!hasCheck && !flyoutMenu && { role: 'menuitem' })}
ref={innerRef}
{...(!hasCheck && {
onClick: (event: any) => {
onItemSelect(event, onSelect);
_drill && _drill();
flyoutMenu && handleFlyout(event);
}
})}
{...(hasCheck && { htmlFor: randomId })}
Expand Down
6 changes: 6 additions & 0 deletions packages/react-core/src/components/Nav/NavItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
</span>
);

const ariaFlyoutProps = {
'aria-haspopup': 'menu',
'aria-expanded': flyoutVisible
};

const renderDefaultLink = (context: any): React.ReactNode => {
const preventLinkDefault = preventDefault || !to;
return (
Expand All @@ -164,6 +169,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
)}
aria-current={isActive ? 'page' : null}
tabIndex={isNavOpen ? null : '-1'}
{...(hasFlyout && { ...ariaFlyoutProps })}
{...props}
>
{children}
Expand Down