@ui5/webcomponents 1.7.0 → 1.8.0

package/dist/Tokenizer.js

@@ -242,14 +242,40 @@ class Tokenizer extends UI5Element {
 	}
 
 	_delete(event) {
+		if (!event.detail) { // if there are no details, the event is triggered by a click
+			this._tokenClickDelete(event, event.target);
+			return;
+		}
+
 		if (this._selectedTokens.length) {
-			this._selectedTokens.forEach(token => this._tokenDelete(event, token));
+			this._selectedTokens.forEach(token => this._tokenKeyboardDelete(event, token));
 		} else {
-			this._tokenDelete(event);
+			this._tokenKeyboardDelete(event);
+		}
+	}
+
+	_tokenClickDelete(event, token) {
+		const tokens = this._getVisibleTokens();
+		const deletedTokenIndex = token ? tokens.indexOf(token) : tokens.indexOf(event.target); // The index of the token that just got deleted
+		const nextTokenIndex = deletedTokenIndex === tokens.length - 1 ? deletedTokenIndex - 1 : deletedTokenIndex + 1; // The index of the next token that needs to be focused next due to the deletion
+		const nextToken = tokens[nextTokenIndex]; // if the last item was deleted this will be undefined
+
+		this._handleCurrentItemAfterDeletion(nextToken);
+
+		this.fireEvent("token-delete", { ref: token || event.target });
+	}
+
+	_handleCurrentItemAfterDeletion(nextToken) {
+		if (nextToken && !isPhone()) {
+			this._itemNav.setCurrentItem(nextToken); // update the item navigation with the new token or undefined, if the last was deleted
+
+			setTimeout(() => {
+				nextToken.focus();
+			}, 0);
 		}
 	}
 
-	_tokenDelete(event, token) {
+	_tokenKeyboardDelete(event, token) {
 		let nextTokenIndex; // The index of the next token that needs to be focused next due to the deletion
 
 		const tokens = this._getVisibleTokens();
@@ -272,13 +298,7 @@ class Tokenizer extends UI5Element {
 			nextToken = notSelectedTokens[0];
 		}
 
-		if (nextToken && !isPhone()) {
-			this._itemNav.setCurrentItem(nextToken); // update the item navigation with the new token or undefined, if the last was deleted
-
-			setTimeout(() => {
-				nextToken.focus();
-			}, 0);
-		}
+		this._handleCurrentItemAfterDeletion(nextToken);
 
 		this.fireEvent("token-delete", { ref: token || event.target });
 	}

package/dist/Tree.js

@@ -1,5 +1,6 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
+import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
 import TreeItem from "./TreeItem.js";
 import List from "./List.js";
 import TreeListItem from "./TreeListItem.js";
@@ -77,6 +78,31 @@ const metadata = {
 			type: String,
 		},
 
+		/**
+		 * Defines the accessible name of the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue: ""
+		 * @public
+		 * @since 1.8.0
+		 */
+		 accessibleName: {
+			type: String,
+		},
+
+		/**
+		 * Defines the IDs of the elements that label the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.8.0
+		 */
+		accessibleNameRef: {
+			type: String,
+			defaultValue: "",
+		},
+
 		/**
 		 * An array, containing a flat structure of list items to render
 		 *
@@ -325,6 +351,10 @@ class Tree extends UI5Element {
 		return "tree";
 	}
 
+	get _label() {
+		return getEffectiveAriaLabelText(this);
+	}
+
 	_onListItemStepIn(event) {
 		const listItem = event.detail.item;
 		const treeItem = listItem.treeItem;

package/dist/TreeItem.js

@@ -113,6 +113,18 @@ const metadata = {
 			defaultValue: ValueState.None,
 		},
 
+		/**
+		 * Defines the accessible name of the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue: ""
+		 * @public
+		 * @since 1.8.0
+		 */
+		accessibleName: {
+			type: String,
+		},
+
 		/**
 		 * Defines the tooltip of the component.
 		 * @type {string}

package/dist/TreeListItem.js

@@ -103,6 +103,18 @@ const metadata = {
 			defaultValue: ValueState.None,
 		},
 
+		/**
+		 * Defines the accessible name of the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue: ""
+		 * @public
+		 * @since 1.8.0
+		 */
+		 accessibleName: {
+			type: String,
+		},
+
 		/**
 		 * Defines whether the toggle button is shown at the end, rather than at the beginning of the item
 		 *
@@ -288,6 +300,10 @@ class TreeListItem extends ListItem {
 		return this.textContent.length && !this._minimal;
 	}
 
+	get _ariaLabel() {
+		return TreeListItem.i18nBundle.getText(TREE_ITEM_ARIA_LABEL);
+	}
+
 	get _accInfo() {
 		return {
 			role: "treeitem",
@@ -296,7 +312,7 @@ class TreeListItem extends ListItem {
 			posinset: this._posinset,
 			setsize: this._setsize,
 			ariaSelectedText: this.ariaSelectedText,
-			listItemAriaLabel: TreeListItem.i18nBundle.getText(TREE_ITEM_ARIA_LABEL),
+			listItemAriaLabel: !this.accessibleName ? this._ariaLabel : undefined,
 		};
 	}