Skip to content
Merged
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
191 changes: 177 additions & 14 deletions packages/main/cypress/specs/Menu.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1055,8 +1055,6 @@ describe("Menu interaction", () => {
.should("have.attr", "accessible-name", "Select an option from the menu");
});

/* The test is valid, but currently it is not stable. It will be reviewed further and stabilized afterwards. */

it("Menu items - navigation in endContent", () => {
cy.mount(
<>
Expand All @@ -1071,6 +1069,10 @@ describe("Menu interaction", () => {
</>
);

// Move mouse to opener button to avoid interference with menu item hover behavior
cy.get("[ui5-button]")
.realHover();

cy.get("[ui5-menu]")
.ui5MenuOpen();

Expand All @@ -1079,24 +1081,34 @@ describe("Menu interaction", () => {

cy.get("@items")
.first()
.should("be.focused");
.should("be.focused")
.realPress("ArrowRight");

cy.realPress("ArrowRight");
cy.get("@buttons").first().should("be.focused");
cy.get("@buttons")
.first()
.should("be.focused")
.realPress("ArrowRight");

cy.realPress("ArrowRight");
cy.get("@buttons").last().should("be.focused");
cy.get("@buttons")
.last()
.should("be.focused")
.realPress("ArrowRight");

cy.realPress("ArrowRight");
cy.get("@buttons").last().should("be.focused");
cy.get("@buttons")
.last()
.should("be.focused")
.realPress("ArrowLeft");

cy.realPress("ArrowLeft");
cy.get("@buttons").first().should("be.focused");
cy.get("@buttons")
.first()
.should("be.focused")
.realPress("ArrowLeft");

cy.realPress("ArrowLeft");
cy.get("@buttons").first().should("be.focused");
cy.get("@buttons")
.first()
.should("be.focused")
.realPress("ArrowDown");

cy.realPress("ArrowDown");
cy.get("@items").last().should("be.focused");
});
});
Expand Down Expand Up @@ -1162,4 +1174,155 @@ describe("Menu - getFocusDomRef", () => {
expect(menu.getFocusDomRef()).equal(clickedItem.getFocusDomRef());
});
});
});

describe("Menu - Submenu Focus Behavior", () => {
it("should not move focus when submenu opens via mouse hover", () => {
cy.mount(
<>
<Button id="btnOpen">Open Menu</Button>
<Menu opener="btnOpen">
<MenuItem text="Parent Item">
<MenuItem text="Child Item 1"></MenuItem>
<MenuItem text="Child Item 2"></MenuItem>
</MenuItem>
<MenuItem text="Another Item"></MenuItem>
</Menu>
</>
);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu] > [ui5-menu-item]")
.as("items");

cy.get("@items")
.first()
.should("be.visible")
.as("parentItem");

// Hover item to open submenu
cy.get("@parentItem").realHover();

cy.get("@parentItem")
.shadow()
.find("[ui5-responsive-popover]")
.should("have.attr", "open");

// Verify focus not moved to submenu
cy.get("@parentItem")
.should("be.focused");

cy.get("[ui5-menu-item] > [ui5-menu-item]")
.as("submenuitems");

cy.get("@submenuitems")
.first()
.should("be.visible")
.as("childItem");

cy.get("@childItem")
.should("not.be.focused");
});

it("should close submenu when hover moves to another item", () => {
cy.mount(
<>
<Button id="btnOpen">Open Menu</Button>
<Menu opener="btnOpen">
<MenuItem text="Parent Item">
<MenuItem text="Child Item 1"></MenuItem>
<MenuItem text="Child Item 2"></MenuItem>
</MenuItem>
<MenuItem text="Another Item"></MenuItem>
</Menu>
</>
);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu] > [ui5-menu-item]")
.as("items");

cy.get("@items")
.first()
.should("be.visible")
.as("parentItem");

// Hover item to open submenu
cy.get("@parentItem").realHover();

cy.get("@parentItem")
.shadow()
.find("[ui5-responsive-popover]")
.as("submenuPopover");

cy.get("@submenuPopover")
.should("have.attr", "open");

// Hover over another top-level item
cy.get("@items")
.last()
.should("be.visible")
.as("lastItem");

cy.get("@lastItem")
.realHover();

// The original submenu should be closed
cy.get("@submenuPopover")
.should("not.have.attr", "open");
});

it("should move focus when submenu opens via keyboard", () => {
cy.mount(
<>
<Button id="btnOpen">Open Menu</Button>
<Menu opener="btnOpen">
<MenuItem text="Parent Item">
<MenuItem text="Child Item 1"></MenuItem>
<MenuItem text="Child Item 2"></MenuItem>
</MenuItem>
<MenuItem text="Another Item"></MenuItem>
</Menu>
</>
);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu] > [ui5-menu-item]")
.as("items");

cy.get("@items")
.first()
.should("be.visible")
.as("parentItem");

// Open submenu with keyboard
cy.get("@parentItem")
.should("be.focused")
.realPress("ArrowRight");
cy.get("@parentItem")
.shadow()
.find("[ui5-responsive-popover]")
.should("have.attr", "open");

// Verify focus is moved to submenu
cy.get("@parentItem")
.should("not.be.focused");

cy.get("[ui5-menu-item] > [ui5-menu-item]")
.as("submenuitems");

cy.get("@submenuitems")
.first()
.should("be.visible")
.as("childItem");

cy.get("@childItem")
.should("be.focused");
});
});
9 changes: 5 additions & 4 deletions packages/main/src/Menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class Menu extends UI5Element {
this.open = false;
}

_openItemSubMenu(item: MenuItem) {
_openItemSubMenu(item: MenuItem, openedByMouse = false) {
clearTimeout(this._timeout);

if (!item._popover || item._popover.open) {
Expand All @@ -365,6 +365,7 @@ class Menu extends UI5Element {
item._popover.opener = item;
item._popover.open = true;
item.selected = true;
item._openedByMouse = openedByMouse;
}

_itemMouseOver(e: MouseEvent) {
Expand All @@ -377,7 +378,7 @@ class Menu extends UI5Element {
return;
}

item.focus();
item.getFocusDomRef()?.focus();

// Opens submenu with 300ms delay
this._startOpenTimeout(item);
Expand Down Expand Up @@ -413,7 +414,7 @@ class Menu extends UI5Element {
this._timeout = setTimeout(() => {
this._closeOtherSubMenus(item);

this._openItemSubMenu(item);
this._openItemSubMenu(item, true);
}, MENU_OPEN_DELAY);
}

Expand Down Expand Up @@ -455,7 +456,7 @@ class Menu extends UI5Element {
}

if (shouldOpenMenu) {
this._openItemSubMenu(item);
this._openItemSubMenu(item, false);
} else if (isTabNextPrevious) {
this._close();
}
Expand Down
9 changes: 7 additions & 2 deletions packages/main/src/MenuItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ class MenuItem extends ListItem implements IMenuItem {

_itemNavigation: ItemNavigation;
_shiftPressed: boolean = false;
_openedByMouse = false;

constructor() {
super();
Expand Down Expand Up @@ -535,7 +536,8 @@ class MenuItem extends ListItem implements IMenuItem {
if (!isInstanceOfMenuItem(item)) {
return;
}
item.focus();

item.getFocusDomRef()?.focus();

this._closeOtherSubMenus(item);
}
Expand Down Expand Up @@ -622,7 +624,9 @@ class MenuItem extends ListItem implements IMenuItem {
}

_afterPopoverOpen() {
this._allMenuItems[0]?.focus();
if (!this._openedByMouse) {
this._allMenuItems[0]?.focus();
}
this.fireDecoratorEvent("open");
}

Expand All @@ -644,6 +648,7 @@ class MenuItem extends ListItem implements IMenuItem {
}

_afterPopoverClose() {
this._openedByMouse = false;
this.fireDecoratorEvent("close");
}

Expand Down
Loading