diff --git a/packages/fiori/src/NotificationListGroupItem.hbs b/packages/fiori/src/NotificationListGroupItem.hbs index 6e1219cf3575..05c33e63dc89 100644 --- a/packages/fiori/src/NotificationListGroupItem.hbs +++ b/packages/fiori/src/NotificationListGroupItem.hbs @@ -3,7 +3,7 @@ @focusin="{{_onfocusin}}" @focusout="{{_onfocusout}}" @keydown="{{_onkeydown}}" - role="option" + role="listitem" tabindex="{{_tabIndex}}" dir="{{effectiveDir}}" aria-expanded="{{ariaExpanded}}" @@ -77,7 +77,7 @@ {{accInvisibleText}} - + diff --git a/packages/fiori/src/NotificationListItem.hbs b/packages/fiori/src/NotificationListItem.hbs index 3099ff950192..4e7352d831c8 100644 --- a/packages/fiori/src/NotificationListItem.hbs +++ b/packages/fiori/src/NotificationListItem.hbs @@ -5,7 +5,7 @@ @keydown="{{_onkeydown}}" @keyup="{{_onkeyup}}" @click="{{_onclick}}" - role="option" + role="listitem" tabindex="{{_tabIndex}}" dir="{{effectiveDir}}" aria-labelledby="{{ariaLabelledBy}}" diff --git a/packages/fiori/test/pages/NotificationListGroupItem.html b/packages/fiori/test/pages/NotificationListGroupItem.html index cd1867f87925..579e5beade93 100644 --- a/packages/fiori/test/pages/NotificationListGroupItem.html +++ b/packages/fiori/test/pages/NotificationListGroupItem.html @@ -48,7 +48,7 @@

Events on ui5-list level

  • itemToggle
  • - + Events on ui5-list level - + Events on ui5-list level
  • itemClose
  • - + Events on ui5-list level

    - + Events on ui5-list level - + { "The ariaLabelledBy text is correct."); }); - it("tests List Item ACC invisible text", () => { - const EXPECTED_RESULT = "Notification unread High Priority"; - const firstItem = $("#nli1"); - const invisibleText = firstItem.shadow$(".ui5-hidden-text"); - - // assert - assert.strictEqual(invisibleText.getText().toLowerCase(), EXPECTED_RESULT.toLowerCase(), - "The invisible text is correct."); - }); - - it("tests List Group Item ACC ariaLabelledBy", () => { + it("tests List Item ACC ariaLabelledBy", () => { const firstItem = $("#nli1"); const firstItemRoot = firstItem.shadow$(".ui5-nli-root"); @@ -182,4 +172,23 @@ describe("Notification List Item Tests", () => { assert.strictEqual(firstItemRoot.getAttribute("aria-labelledby"), EXPECTED_ARIA_LABELLED_BY, "The ariaLabelledBy text is correct."); }); + + it("tests List Item ACC invisible text", () => { + const EXPECTED_RESULT = "Notification unread High Priority"; + const firstItem = $("#nli1"); + const invisibleText = firstItem.shadow$(".ui5-hidden-text"); + + // assert + assert.strictEqual(invisibleText.getText().toLowerCase(), EXPECTED_RESULT.toLowerCase(), + "The invisible text is correct."); + }); + + it("tests List (Group) Item ACC role", () => { + const firstItemRoot = $("#nli1").shadow$(".ui5-nli-root"); + const firstGroupItemRoot = $("#nlgi1").shadow$(".ui5-nli-group-root"); + const EXPECTED_ROLE = "listitem"; + + assert.strictEqual(firstGroupItemRoot.getAttribute("role"), EXPECTED_ROLE, "The role text is correct."); + assert.strictEqual(firstItemRoot.getAttribute("role"), EXPECTED_ROLE, "The role text is correct."); + }); }); diff --git a/packages/main/src/List.hbs b/packages/main/src/List.hbs index f017107f87de..e43fc35e0dc0 100644 --- a/packages/main/src/List.hbs +++ b/packages/main/src/List.hbs @@ -20,7 +20,7 @@

      + * Note: If you use notification list items, + * it's recommended to set accessible-role="list" for better accessibility. * - * @private + * @public * @type {String} * @defaultvalue "listbox" - * @since 1.0.0-rc.9 + * @since 1.0.0-rc.15 */ - accRole: { + accessibleRole: { type: String, defaultValue: "listbox", }, diff --git a/packages/main/src/Tree.hbs b/packages/main/src/Tree.hbs index cd7c3a07d7b4..a9d804b1a235 100644 --- a/packages/main/src/Tree.hbs +++ b/packages/main/src/Tree.hbs @@ -3,7 +3,7 @@ .headerText="{{headerText}}" .footerText="{{footerText}}" .noDataText="{{noDataText}}" - .accRole="{{_role}}" + .accessibleRole="{{_role}}" @ui5-item-click="{{_onListItemClick}}" @ui5-item-delete="{{_onListItemDelete}}" @ui5-selection-change="{{_onListSelectionChange}}"