@ui5/webcomponents 1.2.2 → 1.3.0

package/src/Table.js

@@ -6,6 +6,8 @@ import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
 import NavigationMode from "@ui5/webcomponents-base/dist/types/NavigationMode.js";
 import { isIE } from "@ui5/webcomponents-base/dist/Device.js";
 import {
+	isTabNext,
+	isTabPrevious,
 	isSpace,
 	isEnter,
 	isCtrlA,
@@ -18,7 +20,10 @@ import {
 	isHomeShift,
 	isEndShift,
 } from "@ui5/webcomponents-base/dist/Keys.js";
-import { getTabbableElements } from "@ui5/webcomponents-base/dist/util/TabbableElements.js";
+import getNormalizedTarget from "@ui5/webcomponents-base/dist/util/getNormalizedTarget.js";
+import getActiveElement from "@ui5/webcomponents-base/dist/util/getActiveElement.js";
+import { getLastTabbableElement, getTabbableElements } from "@ui5/webcomponents-base/dist/util/TabbableElements.js";
+import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
 import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import debounce from "@ui5/webcomponents-base/dist/util/debounce.js";
 import isElementInView from "@ui5/webcomponents-base/dist/util/isElementInView.js";
@@ -43,6 +48,8 @@ import styles from "./generated/themes/Table.css.js";
 
 const GROWING_WITH_SCROLL_DEBOUNCE_RATE = 250; // ms
 
+const PAGE_UP_DOWN_SIZE = 20;
+
 /**
  * @public
  */
@@ -246,6 +253,32 @@ const metadata = {
 			defaultValue: TableMode.None,
 		},
 
+		/**
+		 * Defines the accessible aria name of the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue: ""
+		 * @public
+		 * @since 1.3.0
+		 */
+		accessibleName: {
+			type: String,
+			defaultValue: undefined,
+		},
+
+		/**
+		 * Receives id(or many ids) of the elements that label the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.3.0
+		 */
+		accessibleNameRef: {
+			type: String,
+			defaultValue: "",
+		},
+
 		_hiddenColumns: {
 			type: Object,
 			multiple: true,
@@ -397,7 +430,8 @@ const metadata = {
  * <li>[ALT]+[DOWN]/[UP] - Switches focus between header, last focused item, and More button (if applies) in either direction.</li>
  * <li>[SHIFT]+[DOWN]/[UP] - Selects the next/previous item in a MultiSelect table, if the current item is selected (Range selection). Otherwise, deselects them (Range deselection).</li>
  * <li>[SHIFT]+[HOME]/[END] - Range selection to the first/last item of the List.</li>
- * <li>[CTRL]+[HOME]/[END] - Same behavior as HOME & END.</li> * </ul>
+ * <li>[CTRL]+[HOME]/[END] - Same behavior as HOME & END.</li>
+ * </ul>
  *
  * <h3>ES6 Module Import</h3>
  *
@@ -455,17 +489,28 @@ class Table extends UI5Element {
 			navigationMode: NavigationMode.Vertical,
 			affectedPropertiesNames: ["_columnHeader"],
 			getItemsCallback: () => [this._columnHeader, ...this.rows],
-			skipItemsSize: 20,
+			skipItemsSize: PAGE_UP_DOWN_SIZE,
 		});
 
 		this.fnOnRowFocused = this.onRowFocused.bind(this);
 
 		this._handleResize = this.popinContent.bind(this);
 
+		this.fnHandleF7 = this._handleF7.bind(this);
+
 		this.tableEndObserved = false;
 
 		this.addEventListener("ui5-selection-requested", this._handleSelect.bind(this));
+		this.addEventListener("ui5-_forward-after", this._onForwardAfter.bind(this));
+		this.addEventListener("ui5-_forward-before", this._onForwardBefore.bind(this));
+
+		// Stores the last focused element within the table.
+		this.lastFocusedElement = null;
+
+		// Indicates whether the table is forwarding focus before or after the current table row.
+		this._forwardingFocus = false;
 
+		// Stores the last focused nested element index (within a table row) for F7 navigation.
 		this._prevNestedElementIndex = 0;
 	}
 
@@ -485,6 +530,8 @@ class Table extends UI5Element {
 			row._busy = this.busy;
 			row.removeEventListener("ui5-_focused", this.fnOnRowFocused);
 			row.addEventListener("ui5-_focused", this.fnOnRowFocused);
+			row.removeEventListener("ui5-f7-pressed", this.fnHandleF7);
+			row.addEventListener("ui5-f7-pressed", this.fnHandleF7);
 			row.mode = this.mode;
 		});
 
@@ -497,7 +544,7 @@ class Table extends UI5Element {
 
 		this._allRowsSelected = selectedRows.length === this.rows.length;
 
-		this._previousFocusedRow = this._previousFocusedRow || this.rows[0] || null;
+		this._prevFocusedRow = this._prevFocusedRow || this.rows[0];
 	}
 
 	onAfterRendering() {
@@ -516,14 +563,6 @@ class Table extends UI5Element {
 		ResizeHandler.register(this.getDomRef(), this._handleResize);
 
 		this._itemNavigation.setCurrentItem(this.rows.length ? this.rows[0] : this._columnHeader);
-
-		this.rows.forEach((row, index) => {
-			row._tabbableElements = getTabbableElements(row);
-
-			if (index > 0) {
-				row._tabbableElements.forEach(el => el.setAttribute("tabindex", "-1"));
-			}
-		});
 	}
 
 	onExitDOM() {
@@ -537,16 +576,17 @@ class Table extends UI5Element {
 	}
 
 	_onkeydown(event) {
+		if (isTabNext(event) || isTabPrevious(event)) {
+			this._handleTab(event);
+		}
+
 		if (isCtrlA(event)) {
 			event.preventDefault();
 			this.isMultiSelect && this._selectAll(event);
-			return;
 		}
 
-		const isAltUp = isUpAlt(event);
-
-		if (isAltUp || isDownAlt(event)) {
-			return this._handleArrowAlt(isAltUp, event.target);
+		if (isUpAlt(event) || isDownAlt(event)) {
+			this._handleArrowAlt(event);
 		}
 
 		if ((isUpShift(event) || isDownShift(event)) && this.isMultiSelect) {
@@ -574,6 +614,50 @@ class Table extends UI5Element {
 		}
 	}
 
+	_handleTab(event) {
+		const isNext = isTabNext(event);
+		const target = getNormalizedTarget(event.target);
+		const targetType = this.getFocusedElementType(event.target);
+
+		if (this.columnHeaderTabbables.includes(target)) {
+			if (isNext && this.columnHeaderLastElement === target) {
+				return this._focusNextElement(event);
+			}
+
+			return;
+		}
+
+		if (isNext && targetType === "columnHeader" && !this.columnHeaderTabbables.length) {
+			return this._focusNextElement(event);
+		}
+
+		if (targetType === "tableRow" || !targetType) {
+			return;
+		}
+
+		switch (targetType) {
+		case "tableGroupRow":
+			return isNext ? this._focusNextElement(event) : this._focusForwardElement(event, false);
+		case "columnHeader":
+			return !isNext && this._focusForwardElement(event, false);
+		case "moreButton":
+			if (isNext) {
+				this._focusForwardElement(event, true);
+			} else {
+				event.preventDefault();
+				this.currentElement.focus();
+			}
+		}
+	}
+
+	_focusNextElement(event) {
+		if (!this.growsWithButton) {
+			this._focusForwardElement(event, true);
+		} else {
+			this.morеBtn.focus();
+		}
+	}
+
 	_handleArrowNav(event) {
 		const isRowFocused = this.currentElement.localName === "tr";
 
@@ -654,40 +738,39 @@ class Table extends UI5Element {
 	 * Handles Alt + Up/Down.
 	 * Switches focus between column header, last focused item, and "More" button (if applicable).
 	 * @private
-	 * @param {boolean} shouldMoveUp Whether to move focus upward
-	 * @param {object} focusedElement The element currently in focus
+	 * @param {CustomEvent} event
 	 */
-	_handleArrowAlt(shouldMoveUp, focusedElement) {
-		const focusedElementType = this.getFocusedElementType(focusedElement);
-		const moreButton = this.getMoreButton();
+	_handleArrowAlt(event) {
+		const shouldMoveUp = isUpAlt(event);
+		const focusedElementType = this.getFocusedElementType(event.target);
 
 		if (shouldMoveUp) {
 			switch (focusedElementType) {
 			case "tableRow":
-				this._previousFocusedRow = focusedElement;
-				return this._onColumnHeaderClick();
+			case "tableGroupRow":
+				this._prevFocusedRow = event.target;
+				return this._onColumnHeaderClick(event);
 			case "columnHeader":
-				return moreButton ? moreButton.focus() : this._previousFocusedRow.focus();
+				return this.morеBtn ? this.morеBtn.focus() : this._prevFocusedRow.focus();
 			case "moreButton":
-				return this._previousFocusedRow ? this._previousFocusedRow.focus() : this._onColumnHeaderClick();
+				return this._prevFocusedRow ? this._prevFocusedRow.focus() : this._onColumnHeaderClick(event);
 			}
 		} else {
 			switch (focusedElementType) {
 			case "tableRow":
-				this._previousFocusedRow = focusedElement;
-				return moreButton ? moreButton.focus() : this._onColumnHeaderClick();
+			case "tableGroupRow":
+				this._prevFocusedRow = event.target;
+				return this.morеBtn ? this.morеBtn.focus() : this._onColumnHeaderClick(event);
 			case "columnHeader":
-				if (this._previousFocusedRow) {
-					return this._previousFocusedRow.focus();
-				}
-
-				if (moreButton) {
-					return moreButton.focus();
+				if (this._prevFocusedRow) {
+					this._prevFocusedRow.focus();
+				} else if (this.morеBtn) {
+					this.morеBtn.focus();
 				}
 
 				return;
 			case "moreButton":
-				return this._onColumnHeaderClick();
+				return this._onColumnHeaderClick(event);
 			}
 		}
 	}
@@ -695,32 +778,133 @@ class Table extends UI5Element {
 	/**
 	 * Determines the type of the currently focused element.
 	 * @private
-	 * @param {object} element The object representation of the DOM element
-	 * @returns {("columnHeader"|"tableRow"|"moreButton")} A string identifier
+	 * @param {object} element The DOM element
+	 * @returns {("columnHeader"|"tableRow"|"tableGroupRow"|"moreButton")} A string identifier
 	 */
 	getFocusedElementType(element) {
-		if (element === this.getColumnHeader()) {
+		if (element === this.columnHeader) {
 			return "columnHeader";
 		}
 
-		if (element === this.getMoreButton()) {
+		if (element === this.morеBtn) {
 			return "moreButton";
 		}
 
 		if (this.rows.includes(element)) {
-			return "tableRow";
+			const isGroupRow = element.hasAttribute("ui5-table-group-row");
+			return isGroupRow ? "tableGroupRow" : "tableRow";
 		}
 	}
 
+	/**
+	 * Toggles focus between the table row's root and the last focused nested element.
+	 * @private
+	 * @param {CustomEvent} event "ui5-f7-pressed"
+	 */
+	_handleF7(event) {
+		const row = event.detail.row;
+		row._tabbables = getTabbableElements(row);
+		const activeElement = getActiveElement();
+		const lastFocusedElement = row._tabbables[this._prevNestedElementIndex] || row._tabbables[0];
+		const targetIndex = row._tabbables.indexOf(activeElement);
+
+		if (!row._tabbables.length) {
+			return;
+		}
+
+		if (activeElement === row.root) {
+			lastFocusedElement.focus();
+		} else if (targetIndex > -1) {
+			this._prevNestedElementIndex = targetIndex;
+			row.root.focus();
+		}
+	}
+
+	_onfocusin(event) {
+		const target = getNormalizedTarget(event.target);
+
+		if (!this._isForwardElement(target)) {
+			this.lastFocusedElement = target;
+			return;
+		}
+
+		if (!this._forwardingFocus) {
+			if (this.lastFocusedElement) {
+				this.lastFocusedElement.focus();
+			} else {
+				this.currentElement.focus();
+			}
+
+			event.stopImmediatePropagation();
+		}
+
+		this._forwardingFocus = false;
+	}
+
+	_onForwardBefore(event) {
+		this.lastFocusedElement = event.detail.target;
+		this._focusForwardElement(event, false);
+		event.stopImmediatePropagation();
+	}
+
+	_onForwardAfter(event) {
+		this.lastFocusedElement = event.detail.target;
+
+		if (!this.growsWithButton) {
+			this._focusForwardElement(event, true);
+		} else {
+			this.morеBtn.focus();
+		}
+	}
+
+	_focusForwardElement(event, isAfter) {
+		this._forwardingFocus = true;
+		this.shadowRoot.querySelector(`#${this._id}-${isAfter ? "after" : "before"}`).focus();
+	}
+
+	_isForwardElement(node) {
+		const nodeId = node.id;
+		const afterElement = this._getForwardElement(true);
+		const beforeElement = this._getForwardElement(false);
+
+		if (this._id === nodeId || (beforeElement && beforeElement.id === nodeId)) {
+			return true;
+		}
+
+		return afterElement && afterElement.id === nodeId;
+	}
+
+	_getForwardElement(isAfter) {
+		const dir = isAfter ? "after" : "before";
+
+		if (!this[`_${dir}Element`]) {
+			this[`_${dir}Element`] = this.shadowRoot.querySelector(`#${this._id}-${dir}`);
+		}
+
+		return this[`_${dir}Element`];
+	}
+
 	onRowFocused(event) {
 		this._itemNavigation.setCurrentItem(event.target);
 	}
 
-	_onColumnHeaderClick(event) {
-		this.getColumnHeader().focus();
+	_onColumnHeaderFocused(event) {
 		this._itemNavigation.setCurrentItem(this._columnHeader);
 	}
 
+	_onColumnHeaderClick(event) {
+		if (!event.target) {
+			this.columnHeader.focus();
+		}
+
+		const target = getNormalizedTarget(event.target);
+		const isNestedElement = this.columnHeaderTabbables.includes(target);
+
+		if (!isNestedElement) {
+			this.columnHeader.focus();
+		}
+	}
+
 	_onColumnHeaderKeydown(event) {
 		if (isSpace(event)) {
 			event.preventDefault();
@@ -841,11 +1025,11 @@ class Table extends UI5Element {
 		this.getRowParent(parent);
 	}
 
-	getColumnHeader() {
+	get columnHeader() {
 		return this.getDomRef() && this.getDomRef().querySelector(`#${this._id}-columnHeader`);
 	}
 
-	getMoreButton() {
+	get morеBtn() {
 		return this.growsWithButton && this.getDomRef() && this.getDomRef().querySelector(`#${this._id}-growingButton`);
 	}
 
@@ -960,6 +1144,10 @@ class Table extends UI5Element {
 		return `${headerRowText} ${columnsTitle}`;
 	}
 
+	get tableAriaLabelText() {
+		return getEffectiveAriaLabelText(this);
+	}
+
 	get ariaLabelSelectAllText() {
 		return Table.i18nBundle.getText(ARIA_LABEL_SELECT_ALL_CHECKBOX);
 	}
@@ -1003,6 +1191,14 @@ class Table extends UI5Element {
 	get currentElement() {
 		return this._itemNavigation._getCurrentItem();
 	}
+
+	get columnHeaderTabbables() {
+		return getTabbableElements(this.columnHeader);
+	}
+
+	get columnHeaderLastElement() {
+		return getLastTabbableElement(this.columnHeader);
+	}
 }
 
 Table.define();

package/src/TableGroupRow.js

@@ -69,6 +69,9 @@ const metadata = {
 			noAttribute: true,
 		},
 	},
+	events: /** @lends sap.ui.webcomponents.main.TableGroupRow.prototype */ {
+		_focused: {},
+	},
 };
 
 /**
@@ -151,7 +154,7 @@ class TableGroupRow extends UI5Element {
 	}
 
 	_onfocusin(event) {
-		this.parentElement._itemNavigation.setCurrentItem(this);
+		this.fireEvent("_focused", event);
 	}
 
 	static async onDefine() {

package/src/TableRow.js

@@ -8,6 +8,8 @@ import {
 	isTabNext,
 	isTabPrevious,
 } from "@ui5/webcomponents-base/dist/Keys.js";
+import getActiveElement from "@ui5/webcomponents-base/dist/util/getActiveElement.js";
+import { getLastTabbableElement } from "@ui5/webcomponents-base/dist/util/TabbableElements.js";
 import CheckBox from "./CheckBox.js";
 import TableMode from "./types/TableMode.js";
 import TableRowType from "./types/TableRowType.js";
@@ -113,13 +115,6 @@ const metadata = {
 			defaultValue: "",
 			noAttribute: true,
 		},
-		_tabbableElements: {
-			type: Object,
-			multiple: true,
-		},
-		_tabMarked: {
-			type: Boolean,
-		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.TableRow.prototype */ {
 		/**
@@ -139,6 +134,14 @@ const metadata = {
 		 * @private
 		 */
 		"selection-requested": {},
+		/**
+		 * Fired when F7 is pressed.
+		 *
+		 * @event sap.ui.webcomponents.main.TableRow#f7-pressed
+		 * @since 1.2.0
+		 * @private
+		 */
+		"f7-pressed": {},
 	},
 };
 
@@ -188,23 +191,35 @@ class TableRow extends UI5Element {
 		return [CheckBox];
 	}
 
+	constructor() {
+		super();
+
+		this._ontouchstart = {
+			handleEvent(event) {
+				this.activate();
+			},
+			passive: true,
+		};
+	}
+
 	_onmouseup() {
 		this.deactivate();
 	}
 
 	_onkeydown(event) {
+		const activeElement = getActiveElement();
 		const itemActive = this.type === TableRowType.Active;
 		const isSingleSelect = this.isSingleSelect;
 		const itemSelectable = isSingleSelect || this.isMultiSelect;
 		const isRowFocused = this._activeElementHasAttribute("ui5-table-row");
 		const checkboxPressed = event.target.classList.contains("ui5-multi-select-checkbox");
 
-		if (isTabNext(event) || isTabPrevious(event)) {
-			this._tabMarked = true;
+		if (isTabNext(event) && activeElement === (getLastTabbableElement(this) || this.root)) {
+			this.fireEvent("_forward-after", { target: activeElement });
 		}
 
-		if (isTabNext(event) || isTabPrevious(event)) {
-			this._tabMarked = true;
+		if (isTabPrevious(event) && activeElement === this.root) {
+			this.fireEvent("_forward-before", { target: activeElement });
 		}
 
 		if (isSpace(event) && event.target.tagName.toLowerCase() === "tr") {
@@ -226,7 +241,7 @@ class TableRow extends UI5Element {
 
 		if (isF7(event)) {
 			event.preventDefault();
-			this._handleF7(event.target);
+			this.fireEvent("f7-pressed", { row: this });
 		}
 	}
 
@@ -236,34 +251,20 @@ class TableRow extends UI5Element {
 		}
 	}
 
-	_ontouchstart(event) {
-		this.activate();
-	}
-
 	_ontouchend() {
 		this.deactivate();
 	}
 
-	_onfocusout(event) {
+	_onfocusout() {
 		this.deactivate();
-
-		if (!this._tabMarked) {
-			this._tabbableElements.forEach(el => el.setAttribute("tabindex", -1));
-		} else {
-			this._tabMarked = false;
-		}
 	}
 
 	_onfocusin(event, forceSelfFocus = false) {
-		const tableRowRoot = this.shadowRoot.querySelector(".ui5-table-row-root");
-
 		if (forceSelfFocus || this._activeElementHasAttribute("ui5-table-cell")) {
-			tableRowRoot.focus();
+			this.root.focus();
 			this.activate();
 		}
 
-		this._tabbableElements.forEach(el => el.setAttribute("tabindex", 0));
-
 		this.fireEvent("_focused", event);
 	}
 
@@ -300,44 +301,6 @@ class TableRow extends UI5Element {
 		this.fireEvent("selection-requested", { row: this });
 	}
 
-	/**
-	 * Toggles focus between the table row's root and the last focused nested element.
-	 * @private
-	 * @param {Object} activeElement The currently focused element
-	 */
-	_handleF7(activeElement) {
-		const elements = this._tabbableElements;
-
-		if (!elements.length) {
-			return;
-		}
-
-		const table = this.parentElement;
-		const tableRowRoot = this.shadowRoot.querySelector(".ui5-table-row-root");
-		const prevFocusedIdx = table._prevNestedElementIndex;
-
-		if (activeElement === tableRowRoot) {
-			const lastFocusedElement = elements[prevFocusedIdx];
-
-			if (lastFocusedElement) {
-				lastFocusedElement.focus();
-			} else {
-				elements[0].focus();
-			}
-
-			return;
-		}
-
-		const shadowRoot = activeElement.shadowRoot;
-		const target = shadowRoot ? shadowRoot.activeElement : activeElement;
-		const targetIndex = elements.indexOf(target);
-
-		if (targetIndex > -1) {
-			table._prevNestedElementIndex = targetIndex;
-			tableRowRoot.focus();
-		}
-	}
-
 	_activeElementHasAttribute(attr) {
 		return this.getRootNode().activeElement.hasAttribute(attr);
 	}
@@ -439,6 +402,10 @@ class TableRow extends UI5Element {
 		return this.mode === "MultiSelect";
 	}
 
+	get root() {
+		return this.shadowRoot.querySelector(".ui5-table-row-root");
+	}
+
 	getCellText(cell) {
 		return this.getNormilzedTextContent(cell.textContent);
 	}

package/src/TimePicker.js

@@ -150,9 +150,7 @@ class TimePicker extends TimePickerBase {
 			"ariaRoledescription": this.dateAriaDescription,
 			"ariaHasPopup": "dialog",
 			"ariaAutoComplete": "none",
-			"role": "combobox",
 			"ariaControls": `${this._id}-responsive-popover`,
-			"ariaExpanded": this.isOpen(),
 		};
 	}
 

package/src/TimePickerBase.js

@@ -256,8 +256,10 @@ class TimePickerBase extends UI5Element {
 			value = this.normalizeValue(value); // transform valid values (in any format) to the correct format
 		}
 
-		this.value = ""; // Do not remove! DurationPicker use case -> value is 05:10, user tries 05:12, after normalization value is changed back to 05:10 so no invalidation happens, but the input still shows 05:12. Thus we enforce invalidation with the ""
-		this.value = value;
+		if (!events.includes("input")) {
+			this.value = ""; // Do not remove! DurationPicker use case -> value is 05:10, user tries 05:12, after normalization value is changed back to 05:10 so no invalidation happens, but the input still shows 05:12. Thus we enforce invalidation with the ""
+			this.value = value;
+		}
 		this.tempValue = value; // if the picker is open, sync it
 		this._updateValueState(); // Change the value state to Error/None, but only if needed
 		events.forEach(event => {
@@ -440,6 +442,13 @@ class TimePickerBase extends UI5Element {
 		this._updateValueAndFireEvents(newValue, true, ["change", "value-changed"]);
 	}
 
+	/**
+	 *
+	 * @param {event} e Wheel Event
+	 * @private
+	 *
+	 * The listener for this event can't be passive as it calls preventDefault()
+	 */
 	_handleWheel(e) {
 		e.preventDefault();
 	}