Skip to content
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

Jump to bottom

fix: reset tabindex to -1 when initializing menu item #7203

Merged
merged 1 commit into from
Mar 14, 2024
Merged

fix: reset tabindex to -1 when initializing menu item #7203

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/context-menu/src/vaadin-contextmenu-items-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ export const ItemsMixin = (superClass) =>
// Support menu-bar / context-menu item
if (component._hasVaadinItemMixin) {
component.setAttribute('role', 'menuitem');
component.tabIndex = -1;
}

if (component.localName === 'hr') {
Expand Down
40 changes: 40 additions & 0 deletions packages/context-menu/test/items.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ import { getMenuItems, getSubMenu, openMenu } from './helpers.js';
describe('items', () => {
let rootMenu, subMenu, target, rootOverlay, subOverlay1;

const createComponent = (text) => {
const item = document.createElement('vaadin-context-menu-item');
item.textContent = text;
return item;
};

beforeEach(async () => {
rootMenu = fixtureSync(`
<vaadin-context-menu>
Expand All @@ -43,6 +49,14 @@ describe('items', () => {
},
{ text: 'foo-1' },
{ text: 'foo-2', keepOpen: true },
{
text: 'foo-3',
children: [
{ component: createComponent('foo-3-0') },
{ component: createComponent('foo-3-1') },
{ component: createComponent('foo-3-2') },
],
},
];
await nextRender();
await openMenu(target);
Expand Down Expand Up @@ -374,6 +388,32 @@ describe('items', () => {
expect(spy.calledOnce).to.be.true;
});

it('should focus first item after re-opening when using components', async () => {
subMenu.close();
rootOverlay.focus();

const rootItem = getMenuItems(rootMenu)[3];

// Open the sub-menu with item components
await openMenu(rootItem);
const subMenu2 = getSubMenu(rootMenu);
const items = getMenuItems(subMenu2);

// Arrow Down to focus next item
items[0].focus();
arrowDownKeyDown(items[0]);
expect(items[1].hasAttribute('focus-ring')).to.be.true;

// Arrow Left to close the sub-menu
arrowLeftKeyDown(items[1]);
await nextFrame();
expect(rootItem.hasAttribute('focus-ring')).to.be.true;

// Re-open sub-menu and check focus
await openMenu(rootItem);
expect(items[0].hasAttribute('focus-ring')).to.be.true;
});

it('should have modeless sub menus', () => {
const rootItemRect = getMenuItems(rootMenu)[0].getBoundingClientRect();
const element = document.elementFromPoint(rootItemRect.left, rootItemRect.top);
Expand Down
32 changes: 30 additions & 2 deletions packages/menu-bar/test/sub-menu.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
arrowLeft,
arrowRight,
arrowUp,
aTimeout,
click,
enter,
esc,
Expand All @@ -29,6 +28,12 @@ const menuOpenEvent = isTouch ? 'click' : 'mouseover';
describe('sub-menu', () => {
let menu, buttons, subMenu, subMenuOverlay, item;

const createComponent = (text) => {
const item = document.createElement('vaadin-menu-bar-item');
item.textContent = text;
return item;
};

beforeEach(async () => {
menu = fixtureSync('<vaadin-menu-bar></vaadin-menu-bar>');
menu.items = [
Expand All @@ -45,7 +50,14 @@ describe('sub-menu', () => {
{ text: 'Menu Item 2' },
{
text: 'Menu Item 3',
children: [{ text: 'Menu Item 3 1' }, { text: 'Menu Item 3 2' }],
children: [
{
component: createComponent('Menu Item 3 1'),
},
{
component: createComponent('Menu Item 3 2'),
},
],
},
];
await nextRender(menu);
Expand Down Expand Up @@ -152,6 +164,22 @@ describe('sub-menu', () => {
expect(spy.calledOnce).to.be.true;
});

it('should focus first item after re-opening when using components', async () => {
arrowDown(buttons[2]);
await nextRender(subMenu);

const items = subMenuOverlay.querySelectorAll('vaadin-menu-bar-item');
arrowDown(items[0]);
expect(items[1].hasAttribute('focus-ring')).to.be.true;

// Close and re-open
esc(items[1]);
arrowDown(buttons[2]);
await nextRender(subMenu);

expect(items[0].hasAttribute('focus-ring')).to.be.true;
});

it('should close sub-menu on first item arrow up', async () => {
arrowDown(buttons[0]);
await oneEvent(subMenu, 'opened-changed');
Expand Down