@openui5/sap.ui.table 1.141.2 → 1.142.1

package/src/sap/ui/table/RowActionRenderer.js

@@ -5,8 +5,11 @@
  */
 
 //Provides default renderer for control sap.ui.table.RowAction
-sap.ui.define([],
-	function() {
+sap.ui.define([
+	"./library"
+], function(
+	library
+) {
 	"use strict";
 
 	/**
@@ -42,13 +45,45 @@ sap.ui.define([],
 
 		rm.openEnd();
 
-		const aIcons = oAction.getAggregation("_icons");
-		rm.renderControl(aIcons[0]);
-		rm.renderControl(aIcons[1]);
+		// special handling is needed for the navigation item
+		const aItems = [];
+		const aNavigationItems = [];
+		oAction._getVisibleItems().forEach((oItem) => {
+			oItem.getType() === library.RowActionType.Navigation ? aNavigationItems.push(oItem) : aItems.push(oItem);
+		});
+
+		if (oAction._getSize() >= aItems.length + aNavigationItems.length /*No overflow*/) {
+			aItems.forEach((oItem) => {
+				renderItem(rm, oItem);
+			});
+
+			aNavigationItems.forEach((oItem) => {
+				renderItem(rm, oItem);
+			});
+		} else {
+			const iItemsBeforeOverflow = Math.max(0, oAction._getSize() - aNavigationItems.length - 1);
+			for (let i = 0; i < iItemsBeforeOverflow; i++) {
+				renderItem(rm, aItems[i]);
+			}
+
+			const oIcon = oAction._getOverflowIcon(aItems, aNavigationItems, iItemsBeforeOverflow);
+			rm.renderControl(oIcon);
+
+			for (let i = 0; i < Math.min(aNavigationItems.length, oAction._getSize() - 1); i++) {
+				renderItem(rm, aNavigationItems[i]);
+			}
+		}
 
 		rm.close("div");
 	};
 
+	function renderItem(rm, oActionItem) {
+		const oIcon = oActionItem._getIcon();
+		oIcon.addStyleClass("sapUiTableActionIcon");
+
+		rm.renderControl(oIcon);
+	}
+
 	return RowActionRenderer;
 
 }, /* bExport= */ true);

package/src/sap/ui/table/RowSettings.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * The <code>RowSettings</code> control allows you to configure a row.
 	 * You can only use this control in the context of the <code>sap.ui.table.Table</code> control to define row settings.
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/table/Table.js

@@ -106,7 +106,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public
@@ -398,8 +398,9 @@ sap.ui.define([
 			enableBusyIndicator: {type: "boolean", group: "Behavior", defaultValue: false},
 
 			/**
-			 * Number of row actions made visible which determines the width of the row action column.
-			 * The values <code>0</code>, <code>1</code> and <code>2</code> are possible.
+			 * Number of row actions made visible, hence this property also determines the width of the row action column.
+			 * The maximum number of visible row actions is 3. If the <code>rowActionTemplate</code> contains more <code>rowActionItems</code>, they
+			 * are shown in an overflow menu.
 			 * @since 1.45.0
 			 */
 			rowActionCount: {type: "int", group: "Appearance", defaultValue: 0},
@@ -1977,6 +1978,63 @@ sap.ui.define([
 		oTable.getRows()[Math.min(iIndex, iTotalRowCount - 1) - iFirstRenderedRowIndex]._setFocus(bFirstInteractiveElement);
 	}
 
+	/**
+	 * Scrolls to the specified row index. If the <code>iIndex</code> is not in the visible area,
+	 * it scrolls the row into view.
+	 *
+	 * If the given index is already in the visible area, it resolves the promise immediately without scrolling.
+	 *
+	 * @param {number} iIndex The index of the row to scroll into the visible area
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @returns {Promise} A <code>Promise</code> that resolves after scrolling is finished if scrolling was required
+	 * @throws {Error} If the table has fixed top rows
+	 * @throws {Error} If the index is not a number or less than -1
+	 */
+	Table.prototype._scrollToIndex = function(iIndex) {
+		const mRowCounts = this._getRowCounts();
+
+		if (mRowCounts.fixedTop > 0) {
+			throw new Error("The table has fixed top rows. Scrolling to a specific row index is not supported in this case.");
+		}
+
+		if (typeof iIndex !== "number" || iIndex < -1) {
+			throw new Error("Invalid index: " + iIndex);
+		}
+
+		const iRowCount = this._getRowCounts().count;
+
+		if (iRowCount === 0) {
+			return Promise.resolve();
+		}
+
+		if (iIndex === -1) {
+			// Instead of _getMaxFirstVisibleRowIndex() we use _getTotalRowCount() here.
+			// Scenario: The table displays 5 rows, the first visible row is 7, the total row count is 16.
+			// Rows 7 to 11 are displayed. The user calls _scrollToIndex(-1) to scroll to the last row.
+			// _getMaxFirstVisibleRowIndex() would return 11. Since 11 is currently the last visible row, no scrolling would happen.
+			iIndex = this._getTotalRowCount();
+		}
+
+		const iFirstVisibleRow = this.getFirstVisibleRow();
+
+		if (iIndex >= iFirstVisibleRow && iIndex <= iFirstVisibleRow + iRowCount) {
+			return Promise.resolve();
+		}
+
+		const bExpectRowsUpdated = this._setFirstVisibleRowIndex(iIndex);
+
+		return new Promise((resolve) => {
+			this.attachEventOnce("_rowsUpdated", () => {
+				if (!bExpectRowsUpdated) {
+					this._scrollToIndex(iIndex);
+				}
+				resolve();
+			});
+		});
+	};
+
 	// enable calling 'bindAggregation("rows")' without a factory
 	Table.getMetadata().getAggregation("rows")._doesNotRequireFactory = true;
 
@@ -4055,7 +4113,7 @@ sap.ui.define([
 
 	Table.prototype.setRowActionCount = function(iCount) {
 		if (typeof iCount === "number") {
-			iCount = Math.max(0, Math.min(iCount, 2));
+			iCount = Math.max(0, Math.min(iCount, 3));
 		}
 
 		return this.setProperty("rowActionCount", iCount);

package/src/sap/ui/table/TablePersoController.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @since 1.21.1
 	 *
 	 * @constructor

package/src/sap/ui/table/TableRenderer.js

@@ -97,6 +97,7 @@ sap.ui.define([
 		}
 
 		const oScrollExtension = oTable._getScrollExtension();
+		const oAccRenderExtension = oTable._getAccRenderExtension();
 		if (oScrollExtension.isVerticalScrollbarRequired() && !oScrollExtension.isVerticalScrollbarExternal()) {
 			rm.class("sapUiTableVScr"); // show vertical scrollbar
 		}
@@ -108,8 +109,15 @@ sap.ui.define([
 		}
 
 		if (TableUtils.hasRowActions(oTable)) {
+			rm.class("sapUiTableRAct");
 			const iRowActionCount = oTable.getRowActionCount();
-			rm.class(iRowActionCount === 1 ? "sapUiTableRActS" : "sapUiTableRAct");
+			if (iRowActionCount === 1) {
+				rm.class("sapUiTableRActS");
+			} else if (iRowActionCount === 2) {
+				rm.class("sapUiTableRActM");
+			} else {
+				rm.class("sapUiTableRActL");
+			}
 		} else if (TableUtils.hasRowNavigationIndicators(oTable)) {
 			rm.class("sapUiTableRowNavIndicator");
 		}
@@ -179,7 +187,7 @@ sap.ui.define([
 		this.renderTabElement(rm, "sapUiTableCtrlBefore", bDummyTabbable ? "0" : "-1");
 
 		rm.openStart("div", oTable.getId() + "-sapUiTableGridCnt");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Content");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Content");
 		rm.openEnd();
 
 		this.renderColRsz(rm, oTable);
@@ -199,12 +207,12 @@ sap.ui.define([
 		this.renderHSbBackground(rm, oTable);
 		this.renderHSb(rm, oTable);
 
-		oTable._getAccRenderExtension().writeHiddenAccTexts(rm, oTable);
+		oAccRenderExtension.writeHiddenAccTexts(rm, oTable);
 
 		rm.openStart("div", oTable.getId() + "-overlay");
 		rm.class("sapUiTableOverlayArea");
 		rm.attr("tabindex", "0");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Overlay");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Overlay");
 		rm.openEnd();
 		rm.close("div");
 
@@ -408,12 +416,28 @@ sap.ui.define([
 		let bEnabled = false;
 		let bSelAll = false;
 		const mRenderConfig = oTable._getSelectionPlugin().getRenderConfig();
+		const oAccRenderExtension = oTable._getAccRenderExtension();
 
 		rm.openStart("div");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderRow");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderRow");
 		rm.openEnd();
-		rm.openStart("div", oTable.getId() + "-rowcolhdr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderCell");
+
+		const iHeaderRowCount = TableUtils.getHeaderRowCount(oTable);
+		if (iHeaderRowCount > 1) {
+			// In multi label scenario extra hidden cells are rendered in order to maintain correct aria-ownns relationship for each header row. They
+			// are rendered in the same row which does not affect the announcement because the row has aria-hidden.
+			for (let i = 0; i < iHeaderRowCount - 1; i++) {
+				rm.openStart("div", oTable.getId() + "-rowcolhdr" + i);
+				oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderCell", {bLabel: false});
+				rm.openEnd();
+				rm.close("div");
+			}
+			rm.openStart("div", oTable.getId() + "-rowcolhdr" + (iHeaderRowCount - 1));
+		} else {
+			rm.openStart("div", oTable.getId() + "-rowcolhdr");
+		}
+
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderCell", {bLabel: true});
 		rm.openEnd();
 		rm.openStart("div", oTable.getId() + "-selall");
 
@@ -451,7 +475,7 @@ sap.ui.define([
 			enabled: bEnabled,
 			checked: bSelAll
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeader", oParams);
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeader", oParams);
 
 		rm.openEnd();
 
@@ -620,11 +644,12 @@ sap.ui.define([
 	// =============================================================================
 
 	TableRenderer.renderRowHdr = function(rm, oTable) {
+		const oAccRenderExtension = oTable._getAccRenderExtension();
 		rm.openStart("div", oTable.getId() + "-sapUiTableRowHdrScr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
 		rm.class("sapUiTableRowHdrScr");
 		rm.class("sapUiTableNoOpacity");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowHeaderCol");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "RowHeaderCol");
 		rm.openEnd();
 
 		// start with the first current top visible row
@@ -681,9 +706,10 @@ sap.ui.define([
 
 	TableRenderer.renderRowAddon = function(rm, oTable, oRow, iRowIndex, bHeader) {
 		const bRowSelected = oRow._isSelected();
+		const oAccRenderExtension = oTable._getAccRenderExtension();
 
 		rm.openStart("div");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowAddon");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "RowAddon");
 
 		rm.attr("data-sap-ui-related", oRow.getId());
 		rm.attr("data-sap-ui-rowindex", iRowIndex);
@@ -718,7 +744,7 @@ sap.ui.define([
 			rowSelected: bRowSelected,
 			rowHidden: oRow.isEmpty()
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "RowHeader" : "RowAction", oParams);
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, bHeader ? "RowHeader" : "RowAction", oParams);
 
 		rm.openEnd();
 		if (bHeader) {
@@ -817,7 +843,8 @@ sap.ui.define([
 			rm.class(sClass);
 		});
 
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "Presentation" : "Table");
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, bHeader ? "Presentation" : "Table");
 
 		rm.class("sapUiTableCtrl");
 		if (bHeader) {
@@ -883,7 +910,7 @@ sap.ui.define([
 			if (oColParam.shouldRender) {
 				if (iStartRow === 0) {
 					rm.openStart("th", oTable.getId() + sSuffix + iCol);
-					oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Th", {column: oColumn});
+					oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Th", {column: oColumn});
 				} else {
 					rm.openStart("th");
 				}
@@ -908,7 +935,7 @@ sap.ui.define([
 		// dummy column to fill the table width
 		if (bRenderDummyColumn) {
 			rm.openStart("th", bHeader && oTable.getId() + "-dummycolhdr");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd().close("th");
 		}
 
@@ -1009,7 +1036,8 @@ sap.ui.define([
 		rm.class("sapUiTableRow");
 		rm.class("sapUiTableHeaderRow");
 		rm.class("sapUiTableColHdrTr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnHeaderRow", {rowIndex: iRow});
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnHeaderRow", {rowIndex: iRow, fixedCol: bFixedTable});
 		rm.openEnd();
 
 		//
@@ -1061,7 +1089,7 @@ sap.ui.define([
 
 		if (!bFixedTable && bHasOnlyFixedColumns && aColumns.length > 0) {
 			rm.openStart("td").class("sapUiTableCellDummy");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd().close("td");
 		}
 		rm.close("tr");
@@ -1111,7 +1139,8 @@ sap.ui.define([
 			fixedCol: bFixedTable,
 			rowNavigated: oRowSettings ? oRowSettings.getNavigated() : false
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Tr", oParams);
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Tr", oParams);
 
 		rm.openEnd();
 
@@ -1123,14 +1152,14 @@ sap.ui.define([
 		}
 		if (!bFixedTable && bHasOnlyFixedColumns && aCells.length > 0) {
 			rm.openStart("td").class("sapUiTableCellDummy");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd();
 			rm.close("td");
 		}
 		rm.close("tr");
 	};
 
-	TableRenderer.renderTableCell = function(rm, oTable, oRow, oCell, iCellIndex, bFixedTable, iStartColumn, iEndColumn, aVisibleColumns, iLastFixedColumnIndex, bSelected) {
+	TableRenderer.renderTableCell = function(rm, oTable, oRow, oCell, iCellIndex, bFixedTable, iStartColumn, iEndColumn, aVisibleColumns, iLastFixedColumnIndex) {
 		const oColumn = Column.ofCell(oCell);
 		const iColIndex = oColumn.getIndex();
 
@@ -1146,10 +1175,7 @@ sap.ui.define([
 			const bIsLastFixedColumn = bFixedTable && iLastFixedColumnIndex === iColIndex;
 
 			const oParams = {
-				column: oColumn,
-				row: oRow,
-				fixed: bFixedTable,
-				rowSelected: bSelected
+				column: oColumn
 			};
 			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "DataCell", oParams);
 

package/src/sap/ui/table/TreeTable.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * The control can be used in combination with {@link sap.ui.model.json.JSONModel JSONModel} and {@link sap.ui.model.odata.v2.ODataModel ODataModel V2}.
 	 * For a tree-table-like behavior with OData V4 services, use the {@link sap.ui.table.Table Table} control with the {@link sap.ui.table.plugins.ODataV4Hierarchy ODataV4Hierarchy} plugin.
 	 * @extends sap.ui.table.Table
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/table/extensions/Accessibility.js

@@ -449,6 +449,12 @@ sap.ui.define([
 			let sText = "";
 			if (oInfo) {
 				sText = oInfo.description;
+				if (bIsTreeColumnCell && !bHidden) {
+					const sExpandCollapseButtonText = oTableInstances.row.isExpanded() ?
+						TableUtils.getResourceText("TBL_COLLAPSE_BUTTON") : TableUtils.getResourceText("TBL_EXPAND_BUTTON");
+
+					sText = sExpandCollapseButtonText.concat(" ", oInfo.description);
+				}
 				if (TableUtils.getInteractiveElements($Cell) !== null) {
 					sText = TableUtils.getResourceText("TBL_CELL_INCLUDES", [sText]);
 				}
@@ -634,10 +640,26 @@ sap.ui.define([
 
 		/**
 		 * Returns the aria attributes for the column row header cell.
+		 *
+		 * @param {sap.ui.table.extensions.Accessibility} oExtension The accessibility extension
+		 * @param {{bLabel: boolean}} mParams Whether an aria-label should be added
 		 * @returns {object} An object containing the aria attributes
 		 */
-		getAriaAttributesForColumnRowHeaderCell: function() {
-			return {"role": "columnheader"};
+		getAriaAttributesForColumnRowHeaderCell: function(oExtension, mParams) {
+			const mAttributes = {"role": "columnheader"};
+			const oTable = oExtension.getTable();
+			const sSelectionMode = oTable.getSelectionMode();
+
+			if (mParams.bLabel) {
+				if (sSelectionMode !== SelectionMode.None) {
+					mAttributes["aria-label"] = TableUtils.getResourceText("TBL_TABLE_SELECTION_COLUMNHEADER");
+				} else if (TableUtils.hasRowHeader(oTable)) {
+					// Table has no selection, but because group mode is active, selection column is still visible with focusable row header cells.
+					mAttributes["aria-label"] = TableUtils.getResourceText("TBL_ROW_SELECTION_COLUMN_LABEL");
+				}
+			}
+
+			return mAttributes;
 		},
 
 		/**
@@ -725,8 +747,8 @@ sap.ui.define([
 		 * Returns the aria attributes for a column header.
 		 *
 		 * @param {sap.ui.table.extensions.Accessibility} oExtension The accessibility extension
-		 * @param {{column: sap.ui.table.Column, headerId: string, index: int, colspan: boolean}} mParams An object containing the instance of the
-		 * column, the id of the header cell, the index of the column and whether the column has span
+		 * @param {{column: sap.ui.table.Column, headerId: string, colspan: boolean}} mParams An object containing the instance of the
+		 * column, the id of the header cell, and whether the column has span
 		 * @returns {object} An object containing the aria attributes
 		 */
 		getAriaAttributesForColumnHeader: function(oExtension, mParams) {
@@ -778,9 +800,7 @@ sap.ui.define([
 		 * Returns the aria attributes for a data cell.
 		 *
 		 * @param {sap.ui.table.extensions.Accessibility} oExtension The accessibility extension
-		 * @param {{index: int}} mParams An object
-		 * containing the index of the row, the instance of the column, the instance of the row, whether the column is fixed and whether the row is
-		 * selected
+		 * @param {{column: sap.ui.table.Column}} mParams An object containing the instance of the column
 		 * @returns {object} An object containing the aria attributes
 		 */
 		getAriaAttributesForDataCell: function(oExtension, mParams) {
@@ -820,7 +840,9 @@ sap.ui.define([
 			const sTableId = oTable.getId();
 
 			mAttributes["role"] = TableUtils.Grouping.isInGroupMode(oTable) || TableUtils.Grouping.isInTreeMode(oTable) ? "treegrid" : "grid";
-			mAttributes["aria-describedby"] = [sTableId + "-ariaselection"];
+			if (oTable.getSelectionMode() !== SelectionMode.None) {
+				mAttributes["aria-describedby"] = [sTableId + "-ariaselection"];
+			}
 			mAttributes["aria-labelledby"] = [].concat(oTable.getAriaLabelledBy());
 			if (oTable.getTitle()) {
 				mAttributes["aria-labelledby"].push(oTable.getTitle().getId());
@@ -891,23 +913,37 @@ sap.ui.define([
 		 * Returns the aria attributes for the row that contains the column headers.
 		 *
 		 * @param {sap.ui.table.extensions.Accessibility} oExtension The accessibility extension
-		 * @param {object} mParams An object for additional parameters
-		 * @param {int} mParams.rowIndex The index of the row
+		 * @param {{rowIndex: int, fixedCol: boolean}} mParams An object containing the index of the row and whether the column is fixed
 		 * @returns {object} An object containing the aria attributes
 		 */
 		getAriaAttributesForColumnHeaderRow: function(oExtension, mParams) {
 			const mAttributes = {"role": "row"};
+			if (mParams.fixedCol) {
+				return mAttributes;
+			}
 			const oTable = oExtension.getTable();
 			const sTableId = oTable.getId();
 
 			mAttributes["aria-rowindex"] = mParams.rowIndex + 1;
 			mAttributes["aria-owns"] = [];
-			if (TableUtils.hasRowHeader(oTable)) {
-				mAttributes["aria-owns"].push(sTableId + "-rowcolhdr");
-			}
 
-			for (let j = 0; j < TableUtils.getVisibleColumnCount(oTable); j++) {
-				mAttributes["aria-owns"].push(oTable._getVisibleColumns()[j].getId());
+			const aVisibleColumns = oTable._getVisibleColumns();
+			if (TableUtils.getHeaderRowCount(oTable) > 1) {
+				if (TableUtils.hasRowHeader(oTable)) {
+					mAttributes["aria-owns"].push(sTableId + "-rowcolhdr" + mParams.rowIndex);
+				}
+				let j = 0;
+				while (j < TableUtils.getVisibleColumnCount(oTable)) {
+					mAttributes["aria-owns"].push(aVisibleColumns[j].getId() + (mParams.rowIndex > 0 ? "_" + mParams.rowIndex : ""));
+					j += parseInt(aVisibleColumns[j].getHeaderSpan()[mParams.rowIndex]) || 1;
+				}
+			} else {
+				if (TableUtils.hasRowHeader(oTable)) {
+					mAttributes["aria-owns"].push(sTableId + "-rowcolhdr");
+				}
+				for (let j = 0; j < TableUtils.getVisibleColumnCount(oTable); j++) {
+					mAttributes["aria-owns"].push(aVisibleColumns[j].getId());
+				}
 			}
 
 			if (TableUtils.hasRowActions(oTable)) {
@@ -978,6 +1014,10 @@ sap.ui.define([
 				mAttributes["aria-current"] = true;
 			}
 
+			if (mParams.fixedCol) {
+				return mAttributes;
+			}
+
 			mAttributes["aria-owns"] = [];
 			if (TableUtils.hasRowHeader(oTable)) {
 				mAttributes["aria-owns"].push(sTableId + "-rowsel" + mParams.index);
@@ -1143,7 +1183,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility

package/src/sap/ui/table/extensions/AccessibilityRender.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.TableRenderer which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender

package/src/sap/ui/table/extensions/DragAndDrop.js

@@ -274,7 +274,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.DragAndDrop

package/src/sap/ui/table/extensions/ExtensionBase.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase

package/src/sap/ui/table/extensions/Keyboard.js

@@ -265,7 +265,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles keyboard related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard

package/src/sap/ui/table/extensions/KeyboardDelegate.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate

package/src/sap/ui/table/extensions/Pointer.js

@@ -670,7 +670,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles mouse and touch related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

package/src/sap/ui/table/extensions/Scrolling.js

@@ -2314,7 +2314,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles scrolling.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling

package/src/sap/ui/table/extensions/ScrollingIOS.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles the scrollbar on iOS.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

package/src/sap/ui/table/extensions/Synchronization.js

@@ -185,7 +185,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table that allows synchronization with a table.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization