diff --git a/packages/fiori/src/UserMenu.ts b/packages/fiori/src/UserMenu.ts index 8ae4ced2182f..9ded08ddef3e 100644 --- a/packages/fiori/src/UserMenu.ts +++ b/packages/fiori/src/UserMenu.ts @@ -464,7 +464,7 @@ class UserMenu extends UI5Element { } getAccountDescriptionText(account: UserMenuAccount) { - return `${account.subtitleText} ${account.description} ${account.selected ? UserMenu.i18nBundle.getText(USER_MENU_POPOVER_ACCESSIBLE_ACCOUNT_SELECTED_TXT) : ""}`; + return `${account.titleText} ${account.subtitleText} ${account.description} ${account.selected ? UserMenu.i18nBundle.getText(USER_MENU_POPOVER_ACCESSIBLE_ACCOUNT_SELECTED_TXT) : ""}`; } getAccountByRefId(refId: string) { diff --git a/packages/fiori/src/UserMenuAccount.ts b/packages/fiori/src/UserMenuAccount.ts index 920d351822f6..d8a99f3e2057 100644 --- a/packages/fiori/src/UserMenuAccount.ts +++ b/packages/fiori/src/UserMenuAccount.ts @@ -103,7 +103,7 @@ class UserMenuAccount extends UI5Element { loading = false; get _initials() { - return this.avatarInitials || "undefined"; + return this.avatarInitials || undefined; } } diff --git a/packages/fiori/src/UserMenuTemplate.tsx b/packages/fiori/src/UserMenuTemplate.tsx index db83aa9f02eb..3fe60944720e 100644 --- a/packages/fiori/src/UserMenuTemplate.tsx +++ b/packages/fiori/src/UserMenuTemplate.tsx @@ -77,6 +77,7 @@ export default function UserMenuTemplate(this: UserMenu) { selectionMode="None" separators="None" accessibleRole="Menu" + accessibleName={this._ariaLabelledByActions} onItemClick={this._handleMenuItemClick} onui5-close-menu={this._handleMenuItemClose} > @@ -103,16 +104,18 @@ function headerContent(this: UserMenu) { return (<> {this._selectedAccount &&