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

feat(ui5-menu): selectable menu items #10028

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

feat(ui5-menu): selectable menu items #10028

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5868ccd
feat(ui5-menu): selectable menu items
NHristov-sap Oct 15, 2024
69b4859
feat(ui5-menu): add accessibility features and tests
NHristov-sap Oct 17, 2024
e91564d
feat(ui5-menu): fix comments
NHristov-sap Oct 18, 2024
5a03a77
feat(ui5-menu): fix more comments
NHristov-sap Oct 18, 2024
3dab552
feat(ui5-menu): fix comments
NHristov-sap Nov 1, 2024
a9b53e9
Merge branch 'main' into BL_menu_selectable
NHristov-sap Nov 6, 2024
7954ca5
feat(ui5-menu): fix more comments
NHristov-sap Nov 6, 2024
31de201
feat(ui5-menu): fix comments and adapt tests
NHristov-sap Nov 12, 2024
c98c8dc
feat(ui5-menu): fix build error
NHristov-sap Nov 12, 2024
e7a79ca
feat(ui5-menu): fix comments and tests
NHristov-sap Nov 18, 2024
be391a0
feat(ui5-menu): fix failing tests
NHristov-sap Nov 21, 2024
f7f0330
feat(ui5-menu): fix comments
NHristov-sap Dec 3, 2024
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
317 changes: 317 additions & 0 deletions packages/main/cypress/specs/Menu.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { html } from "lit";
import "../../src/Button.js";
import "../../src/Menu.js";
import "../../src/MenuItem.js";
import "../../src/MenuSeparator.js";
import "../../src/MenuItemGroup.js";
import type MenuItem from "../../src/MenuItem.js";

describe("Menu interaction", () => {
Expand Down Expand Up @@ -426,4 +428,319 @@ describe("Menu interaction", () => {
.should("be.equal", "Select an option from the menu");
});
});

describe("Check mark is rendered for selectable and selected items", () => {
it("Selected items have check mark rendered when it is necessary", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item text="Item 1" is-selected></ui5-menu-item>
<ui5-menu-item-group item-selection-mode="SingleSelect" id="groupSingle">
<ui5-menu-item text="Item 2" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 3" is-selected></ui5-menu-item>
</ui5-menu-item-group>
<ui5-menu-item-group id="groupMulti" item-selection-mode="MultiSelect">
<ui5-menu-item text="Item 4" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 5" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 6" is-selected>
<ui5-menu-item text="Item 6.1"></ui5-menu-item>
</ui5-menu-item>
</ui5-menu-item-group>
<ui5-menu-item-group id="groupNone" item-selection-mode="None">
<ui5-menu-item text="Item 7" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 8" is-selected></ui5-menu-item>
</ui5-menu-item-group>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 1']")
.shadow()
.find("[part='selected']")
.should("not.exist");

cy.get("@menu")
.find("[id='groupSingle']")
.as("groupSingle");

cy.get("@groupSingle")
.find("[text='Item 2']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@groupSingle")
.find("[text='Item 3']")
.shadow()
.find("[part='selected']")
.should("not.exist");

cy.get("@menu")
.find("[id='groupMulti']")
.as("groupMulti");

cy.get("@groupMulti")
.find("[text='Item 4']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@groupMulti")
.find("[text='Item 5']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@groupMulti")
.find("[text='Item 6']")
.shadow()
.find("[part='selected']")
.should("not.exist");

cy.get("@menu")
.find("[id='groupNone']")
.as("groupNone");

cy.get("@groupNone")
.find("[text='Item 7']")
.shadow()
.find("[part='selected']")
.should("not.exist");

cy.get("@groupNone")
.find("[text='Item 8']")
.shadow()
.find("[part='selected']")
.should("not.exist");
});

it("Select item (outside of any group)", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item text="Item 1"></ui5-menu-item>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 1']")
.as("item")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 1']")
.shadow()
.find("[part='selected']")
.should("not.exist");
});

it("Select/deselect items (SingleSelect mode)", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item-group item-selection-mode="SingleSelect" id="groupSingle">
<ui5-menu-item text="Item 2"></ui5-menu-item>
<ui5-menu-item text="Item 3"></ui5-menu-item>
</ui5-menu-item-group>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 2']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 2']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@menu")
.ui5MenuOpen({ opener: "btnOpen" });

cy.get("@menu")
.find("[text='Item 3']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 2']")
.shadow()
.find("[part='selected']")
.should("not.exist");

cy.get("@menu")
.find("[text='Item 3']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@menu")
.ui5MenuOpen({ opener: "btnOpen" });

cy.get("@menu")
.find("[text='Item 3']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 3']")
.shadow()
.find("[part='selected']")
.should("not.exist");
});

it("Select/deselect items (MultiSelect mode) ", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item-group id="groupMulti" item-selection-mode="MultiSelect">
<ui5-menu-item text="Item 4"></ui5-menu-item>
<ui5-menu-item text="Item 5"></ui5-menu-item>
</ui5-menu-item-group>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 4']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 4']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@menu")
.ui5MenuOpen({ opener: "btnOpen" });

cy.get("@menu")
.find("[text='Item 5']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 4']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@menu")
.find("[text='Item 5']")
.shadow()
.find("[part='selected']")
.should("exist");

cy.get("@menu")
.ui5MenuOpen({ opener: "btnOpen" });

cy.get("@menu")
.find("[text='Item 5']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 5']")
.shadow()
.find("[part='selected']")
.should("not.exist");
});

it("Select item (None mode) ", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item-group id="groupNone" item-selection-mode="None">
<ui5-menu-item text="Item 6"></ui5-menu-item>
</ui5-menu-item-group>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 6']")
.ui5MenuItemClick();

cy.get("@menu")
.find("[text='Item 6']")
.shadow()
.find("[part='selected']")
.should("not.exist");
});

it("Accessibility attributes", () => {
it("Selected items have check mark rendered when it is necessary", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu-item text="Item 1" is-selected></ui5-menu-item>
<ui5-menu-item-group item-selection-mode="SingleSelect" id="groupSingle">
<ui5-menu-item text="Item 2" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 3"></ui5-menu-item>
</ui5-menu-item-group>
<ui5-menu-item-group id="groupMulti" item-selection-mode="MultiSelect">
<ui5-menu-item text="Item 4" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 5"></ui5-menu-item>
</ui5-menu-item-group>
<ui5-menu-item-group id="groupNone" item-selection-mode="None">
<ui5-menu-item text="Item 6" is-selected></ui5-menu-item>
<ui5-menu-item text="Item 7"></ui5-menu-item>
</ui5-menu-item-group>
</ui5-menu>`);

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

cy.get("@menu")
.find("[text='Item 1']")
.shadow()
.find("li")
.should("have.attr", "role", "menuitem");

cy.get("@menu")
.find("[id='groupSingle']")
.as("groupSingle");

cy.get("@groupSingle")
.shadow()
.find("div")
.should("have.attr", "role", "group");

cy.get("@groupSingle")
.find("[text='Item 2']")
.shadow()
.find("li")
.should("have.attr", "role", "menuitemradio");

cy.get("@menu")
.find("[id='groupMulti']")
.as("groupMulti");

cy.get("@groupMulti")
.shadow()
.find("div")
.should("have.attr", "role", "group");

cy.get("@groupMulti")
.find("[text='Item 4']")
.shadow()
.find("[part='selected']")
.should("have.attr", "role", "menuitemcheckbox");

cy.get("@menu")
.find("[id='groupNone']")
.as("groupNone");

cy.get("@groupNone")
.shadow()
.find("div")
.should("have.attr", "role", "group");

cy.get("@groupNone")
.find("[text='Item 6']")
.shadow()
.find("[part='selected']")
.should("have.attr", "role", "menuitem");
});
});
});
});
Loading
Loading