@ui5/webcomponents 0.0.0-8db0ce01a → 0.0.0-a3eca7ade

package/dist/TableGroupRow.js

@@ -0,0 +1,164 @@
+import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
+import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import CheckBox from "./CheckBox.js";
+import TableGroupRowTemplate from "./generated/templates/TableGroupRowTemplate.lit.js";
+import TableMode from "./types/TableMode.js";
+
+// Texts
+import {
+	TABLE_GROUP_ROW_ARIA_LABEL,
+} from "./generated/i18n/i18n-defaults.js";
+
+// Styles
+import styles from "./generated/themes/TableGroupRow.css.js";
+
+/**
+ * @public
+ */
+const metadata = {
+	tag: "ui5-table-group-row",
+	slots: /** @lends sap.ui.webcomponents.main.TableGroupRow.prototype */ {
+		/**
+		 * Defines the text of the component.
+		 * <br>
+		 * <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
+		 * @public
+		 */
+		"default": {
+			type: Node,
+		},
+	},
+	properties: /** @lends sap.ui.webcomponents.main.TableGroupRow.prototype */ {
+		/**
+		 * Defines the mode of the row
+		 *
+		 * <br><br>
+		 * <b>Note:</b>
+		 * Available options are:
+		 * <ul>
+		 * <li><code>None</code></li>
+		 * <li><code>SingleSelect</code></li>
+		 * <li><code>MultiSelect</code></li>
+		 * </ul>
+		 * @type {TableMode}
+		 * @defaultvalue "None"
+		 * @private
+		 */
+		mode: {
+			type: TableMode,
+			defaultValue: TableMode.None,
+		},
+		_columnsInfo: {
+			type: Object,
+			multiple: true,
+		},
+		_tabIndex: {
+			type: String,
+			defaultValue: "-1",
+		},
+		_busy: {
+			type: Boolean,
+		},
+		_ariaPosition: {
+			type: String,
+			defaultValue: "",
+			noAttribute: true,
+		},
+	},
+};
+
+/**
+ * @class
+ *
+ * <h3 class="comment-api-title">Overview</h3>
+ *
+ * The <code>ui5-table-group-row</code> component represents a group row in the <code>ui5-table</code>.
+ *
+ * <h3>CSS Shadow Parts</h3>
+ *
+ * <ui5-link target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/CSS/::part">CSS Shadow Parts</ui5-link> allow developers to style elements inside the Shadow DOM.
+ * <br>
+ * The <code>ui5-table-group-row</code> exposes the following CSS Shadow Parts:
+ * <ul>
+ * <li>group-row - Used to style the native <code>tr</code> element.</li>
+ * </ul>
+ *
+ * @constructor
+ * @author SAP SE
+ * @alias sap.ui.webcomponents.main.TableGroupRow
+ * @extends sap.ui.webcomponents.base.UI5Element
+ * @tagname ui5-table-group-row
+ * @since 1.0.0-rc.15
+ * @implements sap.ui.webcomponents.main.ITableRow
+ * @public
+ */
+class TableGroupRow extends UI5Element {
+	static get metadata() {
+		return metadata;
+	}
+
+	static get styles() {
+		return styles;
+	}
+
+	static get render() {
+		return litRender;
+	}
+
+	static get template() {
+		return TableGroupRowTemplate;
+	}
+
+	static get dependencies() {
+		return [
+			CheckBox,
+		];
+	}
+
+	constructor() {
+		super();
+	}
+
+	get colSpan() {
+		return this._colSpan;
+	}
+
+	get ariaLabelText() {
+		return `${TableGroupRow.i18nBundle.getText(TABLE_GROUP_ROW_ARIA_LABEL)} ${this.innerText}. ${this._ariaPosition}`;
+	}
+
+	visibleColCount() {
+		let count = this._columnsInfo.reduce((acc, column) => {
+			return column.visible ? ++acc : acc;
+		}, 0);
+
+		if (this.mode === TableMode.MultiSelect) {
+			count++;
+		}
+
+		return count;
+	}
+
+	onBeforeRendering() {
+		if (!this._columnsInfo || this._columnsInfo.length === 0) {
+			return;
+		}
+		this._colSpan = this.visibleColCount();
+	}
+
+	_onfocusin(event) {
+		this.parentElement._itemNavigation.setCurrentItem(this);
+	}
+
+	static async onDefine() {
+		TableGroupRow.i18nBundle = await getI18nBundle("@ui5/webcomponents");
+	}
+}
+
+TableGroupRow.define();
+
+export default TableGroupRow;

package/dist/TableRow.js

@@ -1,7 +1,14 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
-import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
+import {
+	isSpace,
+	isEnter,
+	isF7,
+	isTabNext,
+	isTabPrevious,
+} from "@ui5/webcomponents-base/dist/Keys.js";
+import CheckBox from "./CheckBox.js";
 import TableMode from "./types/TableMode.js";
 import TableRowType from "./types/TableRowType.js";
 import TableRowTemplate from "./generated/templates/TableRowTemplate.lit.js";
@@ -18,7 +25,7 @@ const metadata = {
 	managedSlots: true,
 	slots: /** @lends sap.ui.webcomponents.main.TableRow.prototype */ {
 		/**
-		 * Defines the cells of the <code>ui5-table-row</code>.
+		 * Defines the cells of the component.
 		 * <br><br>
 		 * <b>Note:</b> Use <code>ui5-table-cell</code> for the intended design.
 		 *
@@ -45,13 +52,13 @@ const metadata = {
 			defaultValue: TableMode.None,
 		},
 		/**
-		 * Defines the visual indication and behavior of the <code>ui5-table-row</code>.
+		 * Defines the visual indication and behavior of the component.
 		 * <br><br>
 		 * Available options are:
 		 * <ul>
 		 * <li><code>Active</code></li>
 		 * <li><code>Inactive</code></li>
-		 * <ul>
+		 * </ul>
 		 * <br><br>
 		 * <b>Note:</b> When set to <code>Active</code>, the item will provide visual response upon press,
 		 * while with type <code>Inactive</code> - will not.
@@ -101,6 +108,18 @@ const metadata = {
 		_busy: {
 			type: Boolean,
 		},
+		_ariaPosition: {
+			type: String,
+			defaultValue: "",
+			noAttribute: true,
+		},
+		_tabbableElements: {
+			type: Object,
+			multiple: true,
+		},
+		_tabMarked: {
+			type: Boolean,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.TableRow.prototype */ {
 		/**
@@ -137,7 +156,7 @@ const metadata = {
  * The <code>ui5-table-row</code> exposes the following CSS Shadow Parts:
  * <ul>
  * <li>row - Used to style the native <code>tr</code> element</li>
- * <li>popin-row - Used to style the <code>tr</code> element</li> when a row pops in
+ * <li>popin-row - Used to style the <code>tr</code> element when a row pops in</li>
  * </ul>
  *
  * @constructor
@@ -165,10 +184,8 @@ class TableRow extends UI5Element {
 		return TableRowTemplate;
 	}
 
-	constructor() {
-		super();
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
+	static get dependencies() {
+		return [CheckBox];
 	}
 
 	_onmouseup() {
@@ -179,10 +196,18 @@ class TableRow extends UI5Element {
 		const itemActive = this.type === TableRowType.Active;
 		const isSingleSelect = this.isSingleSelect;
 		const itemSelectable = isSingleSelect || this.isMultiSelect;
-		const isRowFocused = this._getActiveElementTagName() === "ui5-table-row";
+		const isRowFocused = this._activeElementHasAttribute("ui5-table-row");
 		const checkboxPressed = event.target.classList.contains("ui5-multi-select-checkbox");
 
-		if (isSpace(event)) {
+		if (isTabNext(event) || isTabPrevious(event)) {
+			this._tabMarked = true;
+		}
+
+		if (isTabNext(event) || isTabPrevious(event)) {
+			this._tabMarked = true;
+		}
+
+		if (isSpace(event) && event.target.tagName.toLowerCase() === "tr") {
 			event.preventDefault();
 		}
 
@@ -198,6 +223,11 @@ class TableRow extends UI5Element {
 				}
 			}
 		}
+
+		if (isF7(event)) {
+			event.preventDefault();
+			this._handleF7(event.target);
+		}
 	}
 
 	_onkeyup(event) {
@@ -214,16 +244,26 @@ class TableRow extends UI5Element {
 		this.deactivate();
 	}
 
-	_onfocusout() {
+	_onfocusout(event) {
 		this.deactivate();
+
+		if (!this._tabMarked) {
+			this._tabbableElements.forEach(el => el.setAttribute("tabindex", -1));
+		} else {
+			this._tabMarked = false;
+		}
 	}
 
 	_onfocusin(event, forceSelfFocus = false) {
-		if (forceSelfFocus || this._getActiveElementTagName() === "ui5-table-cell") {
-			this.shadowRoot.querySelector(".ui5-table-row-root").focus();
+		const tableRowRoot = this.shadowRoot.querySelector(".ui5-table-row-root");
+
+		if (forceSelfFocus || this._activeElementHasAttribute("ui5-table-cell")) {
+			tableRowRoot.focus();
 			this.activate();
 		}
 
+		this._tabbableElements.forEach(el => el.setAttribute("tabindex", 0));
+
 		this.fireEvent("_focused", event);
 	}
 
@@ -236,7 +276,7 @@ class TableRow extends UI5Element {
 			return;
 		}
 
-		if (!this.contains(document.activeElement)) {
+		if (!this.contains(this.getRootNode().activeElement)) {
 			// If the user clickes on non-focusable element within the ui5-table-cell,
 			// the focus goes to the body, se we have to bring it back to the row.
 			// If the user clicks on input, button or similar clickable element,
@@ -245,7 +285,7 @@ class TableRow extends UI5Element {
 			this.deactivate();
 		}
 
-		if (this._getActiveElementTagName() === "ui5-table-row") {
+		if (this._activeElementHasAttribute("ui5-table-row")) {
 			if (this.isSingleSelect) {
 				this._handleSelection();
 			}
@@ -260,8 +300,46 @@ class TableRow extends UI5Element {
 		this.fireEvent("selection-requested", { row: this });
 	}
 
-	_getActiveElementTagName() {
-		return document.activeElement.localName.toLocaleLowerCase();
+	/**
+	 * 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);
 	}
 
 	activate() {
@@ -278,7 +356,7 @@ class TableRow extends UI5Element {
 
 	get shouldPopin() {
 		return this._columnsInfo.filter(el => {
-			return el.demandPopin;
+			return el.demandPopin || !el.visible;
 		}).length;
 	}
 
@@ -341,15 +419,16 @@ class TableRow extends UI5Element {
 	}
 
 	get ariaLabelText() {
-		return this.cells.map((cell, index) => {
+		const ariaLabel = this.cells.map((cell, index) => {
 			const columText = this.getColumnTextByIdx(index);
 			const cellText = this.getCellText(cell);
 			return `${columText} ${cellText}`;
 		}).join(" ");
+		return `${ariaLabel}. ${this._ariaPosition}`;
 	}
 
 	get ariaLabelRowSelection() {
-		return this.i18nBundle.getText(ARIA_LABEL_ROW_SELECTION);
+		return TableRow.i18nBundle.getText(ARIA_LABEL_ROW_SELECTION);
 	}
 
 	get isSingleSelect() {
@@ -379,7 +458,7 @@ class TableRow extends UI5Element {
 	}
 
 	static async onDefine() {
-		await fetchI18nBundle("@ui5/webcomponents");
+		TableRow.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }