Skip to content
Open
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
89 changes: 87 additions & 2 deletions packages/main/cypress/specs/List.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ describe("List - Accessibility", () => {

it("has default aria-description for accessibleRole List when no accessibleDescription is set", () => {
cy.mount(
<List>
<List selectionMode="Delete">
<ListItemStandard>Item 1</ListItemStandard>
<ListItemStandard>Item 2</ListItemStandard>
</List>
Expand Down Expand Up @@ -413,7 +413,7 @@ describe("List - Accessibility", () => {
const customDescription = "Custom list description";

cy.mount(
<List accessibleDescription={customDescription}>
<List selectionMode="Delete" accessibleDescription={customDescription}>
<ListItemStandard>Item 1</ListItemStandard>
<ListItemStandard>Item 2</ListItemStandard>
</List>
Expand Down Expand Up @@ -457,6 +457,91 @@ describe("List - Accessibility", () => {
});
});
});

it("does not announce F2 instruction for selectionMode None with standard items", () => {
cy.mount(
<List selectionMode="None">
<ListItemStandard>Item 1</ListItemStandard>
<ListItemStandard>Item 2</ListItemStandard>
</List>
);

cy.get("[ui5-list]")
.shadow()
.find(".ui5-list-ul")
.invoke("attr", "aria-description")
.then((ariaDesc) => {
cy.get("[ui5-list]")
.should(($list) => {
const defaultText = $list.prop("defaultAriaDescriptionText") as string;
expect(ariaDesc ?? "").to.not.include(defaultText);
});
});
});

it("announces F2 instruction for selectionMode Delete", () => {
cy.mount(
<List selectionMode="Delete">
<ListItemStandard>Item 1</ListItemStandard>
<ListItemStandard>Item 2</ListItemStandard>
</List>
);

cy.get("[ui5-list]")
.shadow()
.find(".ui5-list-ul")
.invoke("attr", "aria-description")
.then((ariaDesc) => {
cy.get("[ui5-list]")
.should(($list) => {
const defaultText = $list.prop("defaultAriaDescriptionText") as string;
expect(ariaDesc).to.include(defaultText);
});
});
});

it("announces F2 instruction for selectionMode None with type Detail items", () => {
cy.mount(
<List selectionMode="None">
<ListItemStandard type="Detail">Item 1</ListItemStandard>
<ListItemStandard type="Detail">Item 2</ListItemStandard>
</List>
);

cy.get("[ui5-list]")
.shadow()
.find(".ui5-list-ul")
.invoke("attr", "aria-description")
.then((ariaDesc) => {
cy.get("[ui5-list]")
.should(($list) => {
const defaultText = $list.prop("defaultAriaDescriptionText") as string;
expect(ariaDesc).to.include(defaultText);
});
});
});

it("announces F2 instruction for selectionMode None with custom list items", () => {
cy.mount(
<List selectionMode="None">
<ListItemCustom>
<Button>Action</Button>
</ListItemCustom>
</List>
);

cy.get("[ui5-list]")
.shadow()
.find(".ui5-list-ul")
.invoke("attr", "aria-description")
.then((ariaDesc) => {
cy.get("[ui5-list]")
.should(($list) => {
const defaultText = $list.prop("defaultAriaDescriptionText") as string;
expect(ariaDesc).to.include(defaultText);
});
});
});
});

describe("List - Wrapping Behavior", () => {
Expand Down
12 changes: 11 additions & 1 deletion packages/main/src/List.ts
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ class List extends UI5Element {
get ariaDescriptionText() {
const parts = [];

if (this.accessibleRole === ListAccessibleRole.List) {
if (this.accessibleRole === ListAccessibleRole.List && this._hasInteractiveItems) {
parts.push(this.defaultAriaDescriptionText);
}
const externalDescription = this._associatedDescriptionRefTexts || getEffectiveAriaDescriptionText(this);
Expand All @@ -763,6 +763,16 @@ class List extends UI5Element {
return List.i18nBundle.getText(LIST_ROLE_DESCRIPTION);
}

get _hasInteractiveItems() {
if (this.selectionMode === ListSelectionMode.Delete) {
return true;
}

return this.getItems().some(item => {
return item.getAttribute("type") === "Detail" || item.hasAttribute("ui5-li-custom");
});
}

get growingButtonAriaLabel() {
return this.accessibilityAttributes.growingButton?.name;
}
Expand Down
Loading