@ui5/webcomponents 0.0.0-aeb93167c → 0.0.0-b053ad005

package/src/FileUploader.hbs

@@ -4,6 +4,9 @@
 	@mouseout="{{_onmouseout}}"
 	@focusin="{{_onfocusin}}"
 	@focusout="{{_onfocusout}}"
+	@keydown="{{_onkeydown}}"
+	@keyup="{{_onkeyup}}"
+	@click="{{_onclick}}"
 >
 	<div class="ui5-file-uploader-mask">
 		{{#unless hideInput}}

package/src/FileUploader.js

@@ -2,10 +2,8 @@ import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
 import { getFeature } from "@ui5/webcomponents-base/dist/FeaturesRegistry.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
-import {
-	fetchI18nBundle,
-	getI18nBundle,
-} from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { isEnter, isSpace } from "@ui5/webcomponents-base/dist/Keys.js";
 import {
 	FILEUPLOAD_BROWSE,
 	FILEUPLOADER_TITLE,
@@ -35,7 +33,7 @@ const metadata = {
 	languageAware: true,
 	properties: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
-		 * Comma-separated list of file types that the <code>ui5-file-uploader</code> should accept.
+		 * Comma-separated list of file types that the component should accept.
 		 * <br><br>
 		 * <b>Note:</b> Please make sure you are adding the <code>.</code> in front on the file type, e.g. <code>.png</code> in case you want to accept png's only.
 		 * @type {string}
@@ -47,7 +45,7 @@ const metadata = {
 		},
 
 		/**
-		 * If set to "true", the input field of <code>ui5-file-uploader</code> will not be rendered. Only the default slot that is passed will be rendered.
+		 * If set to "true", the input field of component will not be rendered. Only the default slot that is passed will be rendered.
 		 * @type {boolean}
 		 * @defaultvalue false
 		 * @public
@@ -57,9 +55,9 @@ const metadata = {
 		},
 
 		/**
-		 * Defines whether <code>ui5-file-uploader</code> is in disabled state.
+		 * Defines whether the component is in disabled state.
 		 * <br><br>
-		 * <b>Note:</b> A disabled <code>ui5-file-uploader</code> is completely noninteractive.
+		 * <b>Note:</b> A disabled component is completely noninteractive.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
@@ -80,7 +78,7 @@ const metadata = {
 		},
 
 		/**
-		 * Determines the name with which the <code>ui5-file-uploader</code> will be submitted in an HTML form.
+		 * Determines the name with which the component will be submitted in an HTML form.
 		 *
 		 * <br><br>
 		 * <b>Important:</b> For the <code>name</code> property to have effect, you must add the following import to your project:
@@ -88,7 +86,7 @@ const metadata = {
 		 *
 		 * <br><br>
 		 * <b>Note:</b> When set, a native <code>input</code> HTML element
-		 * will be created inside the <code>ui5-file-uploader</code> so that it can be submitted as
+		 * will be created inside the component so that it can be submitted as
 		 * part of an HTML form. Do not use this property unless you need to submit a form.
 		 *
 		 * @type {string}
@@ -100,7 +98,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines a short hint intended to aid the user with data entry when the <code>ui5-file-uploader</code> has no value.
+		 * Defines a short hint intended to aid the user with data entry when the component has no value.
 		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
@@ -120,7 +118,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the value state of the <code>ui5-file-uploader</code>.
+		 * Defines the value state of the component.
 		 * <br><br>
 		 * Available options are:
 		 * <ul>
@@ -150,10 +148,10 @@ const metadata = {
 	managedSlots: true,
 	slots: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
-		 * By default the <code>ui5-file-uploader</code> contains a single input field. With this slot you can pass any content that you wish to add. See the samples for more information.
+		 * By default the component contains a single input field. With this slot you can pass any content that you wish to add. See the samples for more information.
 		 *
 		 * @type {HTMLElement[]}
-		 * @slot
+		 * @slot content
 		 * @public
 		 */
 		"default": {
@@ -162,13 +160,13 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the value state message that will be displayed as pop up under the <code>ui5-file-uploader</code>.
+		 * Defines the value state message that will be displayed as pop up under the component.
 		 * <br><br>
 		 *
 		 * <b>Note:</b> If not specified, a default text (in the respective language) will be displayed.
 		 * <br>
 		 * <b>Note:</b> The <code>valueStateMessage</code> would be displayed,
-		 * when the <code>ui5--file-uploader</code> is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
+		 * when the component is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
 		 * @type {HTMLElement[]}
 		 * @since 1.0.0-rc.9
 		 * @slot
@@ -177,6 +175,17 @@ const metadata = {
 		valueStateMessage: {
 			type: HTMLElement,
 		},
+
+		/**
+		 * The slot is used to render native <code>input</code> HTML element within Light DOM to enable form submit,
+		 * when <code>name</code> property is set.
+		 * @type {HTMLElement[]}
+		 * @slot
+		 * @private
+		 */
+		formSupport: {
+			type: HTMLElement,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
@@ -213,7 +222,7 @@ const metadata = {
  * For the <code>ui5-file-uploader</code>
  * <h3>ES6 Module Import</h3>
  *
- * <code>import @ui5/webcomponents/dist/FileUploader.js";</code>
+ * <code>import "@ui5/webcomponents/dist/FileUploader.js";</code>
  *
  * @constructor
  * @since 1.0.0-rc.6
@@ -257,8 +266,6 @@ class FileUploader extends UI5Element {
 		if (this._canUseNativeFormSupport) {
 			this._internals = this.attachInternals();
 		}
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
 	}
 
 	_onmouseover() {
@@ -273,6 +280,26 @@ class FileUploader extends UI5Element {
 		});
 	}
 
+	_onclick(event) {
+		if (event.isMarked === "button") {
+			this._input.click(event);
+		}
+	}
+
+	_onkeydown(event) {
+		if (isEnter(event)) {
+			this._input.click(event);
+			event.preventDefault();
+		}
+	}
+
+	_onkeyup(event) {
+		if (isSpace(event)) {
+			this._input.click(event);
+			event.preventDefault();
+		}
+	}
+
 	_onfocusin() {
 		this.focused = true;
 	}
@@ -319,7 +346,7 @@ class FileUploader extends UI5Element {
 					(element, nativeInput) => {
 						nativeInput.disabled = element.disabled;
 					},
-					this._onChange.bind(this)
+					this._onChange.bind(this),
 				);
 			}
 		} else if (this.name) {
@@ -362,7 +389,7 @@ class FileUploader extends UI5Element {
 		const popover = await this._getPopover();
 
 		if (popover) {
-			popover.openBy(this);
+			popover.showAt(this);
 		}
 	}
 
@@ -380,7 +407,7 @@ class FileUploader extends UI5Element {
 	}
 
 	/**
-	 * in case when ui5-file-uploader is not placed in the DOM, return empty FileList, like native input would do
+	 * in case when the component is not placed in the DOM, return empty FileList, like native input would do
 	 * @private
 	 */
 	static get _emptyFilesList() {
@@ -392,11 +419,11 @@ class FileUploader extends UI5Element {
 	}
 
 	get browseText() {
-		return this.i18nBundle.getText(FILEUPLOAD_BROWSE);
+		return FileUploader.i18nBundle.getText(FILEUPLOAD_BROWSE);
 	}
 
 	get titleText() {
-		return this.i18nBundle.getText(FILEUPLOADER_TITLE);
+		return FileUploader.i18nBundle.getText(FILEUPLOADER_TITLE);
 	}
 
 	get _canUseNativeFormSupport() {
@@ -421,13 +448,11 @@ class FileUploader extends UI5Element {
 	}
 
 	get valueStateTextMappings() {
-		const i18nBundle = this.i18nBundle;
-
 		return {
-			"Success": i18nBundle.getText(VALUE_STATE_SUCCESS),
-			"Information": i18nBundle.getText(VALUE_STATE_INFORMATION),
-			"Error": i18nBundle.getText(VALUE_STATE_ERROR),
-			"Warning": i18nBundle.getText(VALUE_STATE_WARNING),
+			"Success": FileUploader.i18nBundle.getText(VALUE_STATE_SUCCESS),
+			"Information": FileUploader.i18nBundle.getText(VALUE_STATE_INFORMATION),
+			"Error": FileUploader.i18nBundle.getText(VALUE_STATE_ERROR),
+			"Warning": FileUploader.i18nBundle.getText(VALUE_STATE_WARNING),
 		};
 	}
 
@@ -455,6 +480,20 @@ class FileUploader extends UI5Element {
 		return this.focused && this.hasValueStateText && !this.hideInput;
 	}
 
+	/**
+	 * This method is relevant for sap_horizon theme only
+	 */
+	get _valueStateMessageInputIcon() {
+		const iconPerValueState = {
+			Error: "error",
+			Warning: "alert",
+			Success: "sys-enter-2",
+			Information: "information",
+		};
+
+		return this.valueState !== ValueState.None ? iconPerValueState[this.valueState] : "";
+	}
+
 	get classes() {
 		return {
 			popoverValueState: {
@@ -484,7 +523,7 @@ class FileUploader extends UI5Element {
 	}
 
 	static async onDefine() {
-		await fetchI18nBundle("@ui5/webcomponents");
+		FileUploader.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }
 

package/src/FileUploaderPopover.hbs

@@ -3,12 +3,13 @@
 	_disable-initial-focus
 	prevent-focus-restore
 	no-padding
-	no-arrow
+	hide-arrow
 	class="ui5-valuestatemessage-popover"
 	placement-type="Bottom"
 	horizontal-align="Left"
 >
 	<div slot="header" class="{{classes.popoverValueState}}" style="{{styles.popoverHeader}}">
+		<ui5-icon class="ui5-input-value-state-message-icon" name="{{_valueStateMessageInputIcon}}"></ui5-icon>
 		{{> valueStateMessage}}
 	</div>
 </ui5-popover>

package/src/GroupHeaderListItem.hbs

@@ -1,14 +1,14 @@
 <li
+	part="native-li"
 	tabindex="{{_tabIndex}}"
 	class="ui5-ghli-root {{classes.main}}"
 	@focusin="{{_onfocusin}}"
 	@focusout="{{_onfocusout}}"
 	@keydown="{{_onkeydown}}"
-	role="option"
-	style="list-style-type: none;"
+	aria-label="{{ariaLabelText}}"
+	aria-roledescription="{{groupHeaderText}}"
+	role="group"
 >
-	<span class="ui5-hidden-text">{{groupHeaderText}}</span>
-
 	<div id="{{_id}}-content" class="ui5-li-content">
 		<span class="ui5-ghli-title"><slot></slot></span>
 	</div>

package/src/GroupHeaderListItem.js

@@ -1,4 +1,4 @@
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import ListItemBase from "./ListItemBase.js";
 
 import { GROUP_HEADER_TEXT } from "./generated/i18n/i18n-defaults.js";
@@ -16,12 +16,24 @@ const metadata = {
 	tag: "ui5-li-groupheader",
 	languageAware: true,
 	properties: /** @lends  sap.ui.webcomponents.main.GroupHeaderListItem.prototype */ {
+		/**
+		 * Defines the text alternative of the component.
+		 * Note: If not provided a default text alternative will be set, if present.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.0.0-rc.15
+		 */
+		accessibleName: {
+			type: String,
+		},
 	},
 	slots: /** @lends sap.ui.webcomponents.main.GroupHeaderListItem.prototype */ {
 		/**
-		 * Defines the text of the <code>ui5-li-groupheader</code>.
+		 * Defines the text of the component.
 		 * <br>
-		 * <b>Note:</b> Аlthough this slot accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design.
+		 * <b>Note:</b> Although this slot accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design.
 		 *
 		 * @type {Node[]}
 		 * @slot
@@ -44,6 +56,7 @@ const metadata = {
  * @alias sap.ui.webcomponents.main.GroupHeaderListItem
  * @extends ListItemBase
  * @tagname ui5-li-groupheader
+ * @implements sap.ui.webcomponents.main.IListItem
  * @public
  */
 class GroupHeaderListItem extends ListItemBase {
@@ -59,24 +72,20 @@ class GroupHeaderListItem extends ListItemBase {
 		return [ListItemBase.styles, groupheaderListItemCss];
 	}
 
-	constructor() {
-		super();
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
-	}
-
 	get group() {
 		return true;
 	}
 
 	get groupHeaderText() {
-		return this.i18nBundle.getText(GROUP_HEADER_TEXT);
+		return GroupHeaderListItem.i18nBundle.getText(GROUP_HEADER_TEXT);
+	}
+
+	get ariaLabelText() {
+		return [this.textContent, this.accessibleName].filter(Boolean).join(" ");
 	}
 
 	static async onDefine() {
-		await Promise.all([
-			fetchI18nBundle("@ui5/webcomponents"),
-		]);
+		GroupHeaderListItem.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }
 

package/src/Icon.hbs

@@ -3,10 +3,11 @@
 	tabindex="{{tabIndex}}"
 	dir="{{_dir}}"
 	viewBox="0 0 512 512"
-	role="{{role}}"
+	role="{{effectiveAccessibleRole}}"
 	focusable="false"
 	preserveAspectRatio="xMidYMid meet"
-	aria-label="{{accessibleNameText}}"
+	aria-label="{{effectiveAccessibleName}}"
+	aria-hidden={{effectiveAriaHidden}}
 	xmlns="http://www.w3.org/2000/svg"
 	@focusin={{_onfocusin}}
 	@focusout={{_onfocusout}}
@@ -15,7 +16,7 @@
 	@click={{_onclick}}
 >
 	{{#if hasIconTooltip}}
-		<title id="{{_id}}-tooltip">{{accessibleNameText}}</title>
+		<title id="{{_id}}-tooltip">{{effectiveAccessibleName}}</title>
 	{{/if}}
 
 	<g role="presentation">

package/src/Icon.js

@@ -1,15 +1,17 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
-import { getIconData, getIconDataSync } from "@ui5/webcomponents-base/dist/SVGIconRegistry.js";
+import { getIconData, getIconDataSync } from "@ui5/webcomponents-base/dist/asset-registries/Icons.js";
 import createStyleInHead from "@ui5/webcomponents-base/dist/util/createStyleInHead.js";
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
+import isLegacyBrowser from "@ui5/webcomponents-base/dist/isLegacyBrowser.js";
 import IconTemplate from "./generated/templates/IconTemplate.lit.js";
 
 // Styles
 import iconCss from "./generated/themes/Icon.css.js";
 
 const ICON_NOT_FOUND = "ICON_NOT_FOUND";
+const PRESENTATION_ROLE = "presentation";
 
 /**
  * @public
@@ -17,6 +19,7 @@ const ICON_NOT_FOUND = "ICON_NOT_FOUND";
 const metadata = {
 	tag: "ui5-icon",
 	languageAware: true,
+	themeAware: true,
 	properties: /** @lends sap.ui.webcomponents.main.Icon.prototype */ {
 		/**
 		 * Defines if the icon is interactive (focusable and pressable)
@@ -30,7 +33,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the unique identifier (icon name) of each <code>ui5-icon</code>.
+		 * Defines the unique identifier (icon name) of the component.
 		 * <br>
 		 *
 		 * To browse all available icons, see the
@@ -58,7 +61,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the text alternative of the <code>ui5-icon</code>.
+		 * Defines the text alternative of the component.
 		 * If not provided a default text alternative will be set, if present.
 		 * <br><br>
 		 * <b>Note:</b> Every icon should have a text alternative in order to
@@ -73,7 +76,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines whether the <code>ui5-icon</code> should have a tooltip.
+		 * Defines whether the component should have a tooltip.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
@@ -83,6 +86,26 @@ const metadata = {
 			type: Boolean,
 		},
 
+		/**
+		 * Defines the accessibility role of the component.
+		 * @defaultvalue ""
+		 * @private
+		 * @since 1.0.0-rc.15
+		 */
+		role: {
+			type: String,
+		},
+
+		/**
+		 * Defines the aria hidden state of the component.
+		 * Note: If the role is presentation the default value of aria-hidden will be true.
+		 * @private
+		 * @since 1.0.0-rc.15
+		 */
+		ariaHidden: {
+			type: String,
+		},
+
 		/**
 		 * @private
 		 */
@@ -112,8 +135,17 @@ const metadata = {
 		invalid: {
 			type: Boolean,
 		},
+
+		/**
+		 * @private
+		 */
+		effectiveAccessibleName: {
+			type: String,
+			defaultValue: undefined,
+			noAttribute: true,
+		},
 	},
-	events: {
+	events: /** @lends sap.ui.webcomponents.main.Icon.prototype */ {
 		/**
 		 * Fired on mouseup, space and enter if icon is interactive
 		 * @private
@@ -145,6 +177,15 @@ const metadata = {
  * <br>
  * <code>import "@ui5/webcomponents-icons-tnt/dist/antenna.js";</code>
  *
+ * <br><br>
+ * <h3>Keyboard Handling</h3>
+ *
+ * <ul>
+ * <li>[SPACE, ENTER, RETURN] - Fires the <code>click</code> event if the <code>interactive</code> property is set to true.</li>
+ * <li>[SHIFT] - If [SPACE] or [ENTER],[RETURN] is pressed, pressing [SHIFT] releases the ui5-icon without triggering the click event.</li>
+ * </ul>
+ * <br><br>
+ *
  * <h3>ES6 Module Import</h3>
  *
  * <code>import "@ui5/webcomponents/dist/Icon.js";</code>
@@ -154,14 +195,10 @@ const metadata = {
  * @alias sap.ui.webcomponents.main.Icon
  * @extends sap.ui.webcomponents.base.UI5Element
  * @tagname ui5-icon
+ * @implements sap.ui.webcomponents.main.IIcon
  * @public
  */
 class Icon extends UI5Element {
-	constructor() {
-		super();
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
-	}
-
 	static get metadata() {
 		return metadata;
 	}
@@ -180,7 +217,6 @@ class Icon extends UI5Element {
 
 	static async onDefine() {
 		this.createGlobalStyle(); // hide all icons until the first icon has rendered (and added the Icon.css)
-		await fetchI18nBundle("@ui5/webcomponents");
 	}
 
 	_onfocusin(event) {
@@ -194,9 +230,17 @@ class Icon extends UI5Element {
 	}
 
 	_onkeydown(event) {
-		if (this.interactive && isEnter(event)) {
+		if (!this.interactive) {
+			return;
+		}
+
+		if (isEnter(event)) {
 			this.fireEvent("click");
 		}
+
+		if (isSpace(event)) {
+			event.preventDefault(); // prevent scrolling
+		}
 	}
 
 	_onkeyup(event) {
@@ -205,12 +249,10 @@ class Icon extends UI5Element {
 		}
 	}
 
-	_onclick(event) {
-		if (this.interactive) {
-			event.preventDefault();
-			// Prevent the native event and fire custom event because otherwise the noConfict event won't be thrown
-			this.fireEvent("click");
-		}
+	_onClickHandler(event) {
+		// prevent the native event and fire custom event to ensure the noConfict "ui5-click" is fired
+		event.stopPropagation();
+		this.fireEvent("click");
 	}
 
 	get _dir() {
@@ -225,35 +267,53 @@ class Icon extends UI5Element {
 		return this.effectiveDir;
 	}
 
+	get effectiveAriaHidden() {
+		if (this.ariaHidden === "") {
+			if (this.isDecorative) {
+				return true;
+			}
+
+			return;
+		}
+
+		return this.ariaHidden;
+	}
+
 	get tabIndex() {
 		return this.interactive ? "0" : "-1";
 	}
 
-	get role() {
+	get isDecorative() {
+		return this.effectiveAccessibleRole === PRESENTATION_ROLE;
+	}
+
+	get effectiveAccessibleRole() {
+		if (this.role) {
+			return this.role;
+		}
+
 		if (this.interactive) {
 			return "button";
 		}
 
-		return this.accessibleNameText ? "img" : "presentation";
+		return this.effectiveAccessibleName ? "img" : PRESENTATION_ROLE;
 	}
 
 	static createGlobalStyle() {
-		if (!window.ShadyDOM) {
-			return;
-		}
-		const styleElement = document.head.querySelector(`style[data-ui5-icon-global]`);
-		if (!styleElement) {
-			createStyleInHead(`ui5-icon { display: none !important; }`, { "data-ui5-icon-global": "" });
+		if (isLegacyBrowser()) {
+			const styleElement = document.head.querySelector(`style[data-ui5-icon-global]`);
+			if (!styleElement) {
+				createStyleInHead(`ui5-icon { display: none !important; }`, { "data-ui5-icon-global": "" });
+			}
 		}
 	}
 
 	static removeGlobalStyle() {
-		if (!window.ShadyDOM) {
-			return;
-		}
-		const styleElement = document.head.querySelector(`style[data-ui5-icon-global]`);
-		if (styleElement) {
-			document.head.removeChild(styleElement);
+		if (isLegacyBrowser()) {
+			const styleElement = document.head.querySelector(`style[data-ui5-icon-global]`);
+			if (styleElement) {
+				document.head.removeChild(styleElement);
+			}
 		}
 	}
 
@@ -271,7 +331,7 @@ class Icon extends UI5Element {
 		if (iconData === ICON_NOT_FOUND) {
 			this.invalid = true;
 			/* eslint-disable-next-line */
-			return console.warn(`Required icon is not registered. You can either import the icon as a module in order to use it e.g. "@ui5/webcomponents-icons/dist/${name.replace("sap-icon://", "")}.js", or setup a JSON build step and import "@ui5/webcomponents-icons/dist/Assets.js".`);
+			return console.warn(`Required icon is not registered. You can either import the icon as a module in order to use it e.g. "@ui5/webcomponents-icons/dist/${name.replace("sap-icon://", "")}.js", or setup a JSON build step and import "@ui5/webcomponents-icons/dist/AllIcons.js".`);
 		}
 
 		if (!iconData) {
@@ -285,18 +345,20 @@ class Icon extends UI5Element {
 		this.pathData = iconData.pathData;
 		this.accData = iconData.accData;
 		this.ltr = iconData.ltr;
-	}
+		this.packageName = iconData.packageName;
 
-	get hasIconTooltip() {
-		return this.showTooltip && this.accessibleNameText;
-	}
+		this._onclick = this.interactive ? this._onClickHandler.bind(this) : undefined;
 
-	get accessibleNameText() {
 		if (this.accessibleName) {
-			return this.accessibleName;
+			this.effectiveAccessibleName = this.accessibleName;
+		} else if (this.accData) {
+			const i18nBundle = await getI18nBundle(this.packageName);
+			this.effectiveAccessibleName = i18nBundle.getText(this.accData) || undefined;
 		}
+	}
 
-		return this.i18nBundle.getText(this.accData) || undefined;
+	get hasIconTooltip() {
+		return this.showTooltip && this.effectiveAccessibleName;
 	}
 
 	async onEnterDOM() {