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
4 changes: 4 additions & 0 deletions packages/main/src/List.ts
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,10 @@ class List extends UI5Element {
return toLowercaseEnumValue(this.accessibleRole);
}

get noDataItemRole() {
return LIST_ACCESSIBLE_ROLE_TO_ITEM_ROLE[this.accessibleRole] || "listitem";
}

get classes(): ClassMap {
return {
root: {
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/ListItemBaseTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default function ListItemBaseTemplate(this: ListItemBase, hooks?: { listI
draggable={this.movable}
role={injectedProps?.role}
title={injectedProps?.title}
aria-selected={injectedProps?.role === "option" ? this.selected : undefined}
onFocusIn={this._onfocusin}
onKeyUp={this._onkeyup}
onKeyDown={this._onkeydown}
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/ListTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function ListTemplate(this: List) {
<slot></slot>

{this.showNoDataText &&
<li tabindex={0} id={`${this._id}-nodata`} class="ui5-list-nodata" role="listitem">
<li tabindex={0} id={`${this._id}-nodata`} class="ui5-list-nodata" role={this.noDataItemRole as any}>
<div id={`${this._id}-nodata-text`} class="ui5-list-nodata-text">
{this.noDataText}
</div>
Expand Down
3 changes: 2 additions & 1 deletion packages/main/src/SelectPopoverTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function SelectPopoverTemplate(this: Select) {
onBeforeOpen={this._beforeOpen}
onClose={this._afterClose}
onKeyDown={this._onkeydown}
accessibleName={this._isPhone ? this._headerTitleText : undefined}
accessibleName={this.ariaLabelText || this._headerTitleText}
>
{this._isPhone &&
<div slot="header" class="ui5-responsive-popover-header">
Expand Down Expand Up @@ -68,6 +68,7 @@ export default function SelectPopoverTemplate(this: Select) {
onMouseDown={this._itemMousedown}
onItemClick={this._handleItemPress}
accessibleRole="ListBox"
accessibleName={this.ariaLabelText || this._headerTitleText}
>
<slot></slot>
</List>
Expand Down
Loading