@openui5/sap.ui.table 1.142.0 → 1.142.1

package/REUSE.toml

@@ -385,7 +385,7 @@ SPDX-FileComment = "these files belong to: handlebars"
 [[annotations]]
 path = "src/sap.ui.core/src/sap/ui/thirdparty/require.js"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "2010-2012, The Dojo Foundation"
+SPDX-FileCopyrightText = "2010-2024, jQuery Foundation and other contributors"
 SPDX-License-Identifier = "MIT"
 SPDX-FileComment = "these files belong to: requireJS"
 

package/THIRDPARTY.txt

@@ -254,8 +254,8 @@ License: MIT
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/handlebars.js
 
-Component: requireJS, version: 2.1.8
-Copyright: 2010-2012, The Dojo Foundation
+Component: requireJS, version: 2.3.7
+Copyright: 2010-2024, jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/require.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.142.0",
+  "version": "1.142.1",
   "description": "OpenUI5 UI Library sap.ui.table",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/UI5/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.142.0",
-    "@openui5/sap.ui.unified": "1.142.0"
+    "@openui5/sap.ui.core": "1.142.1",
+    "@openui5/sap.ui.unified": "1.142.1"
   }
 }

package/src/sap/ui/table/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.142.0</version>
+  <version>1.142.1</version>
 
   <documentation>Table-like controls, mainly for desktop scenarios.</documentation>
 

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './utils/TableUtil
 	 * @extends sap.ui.table.ColumnMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @see {@link topic:148892ff9aea4a18b912829791e38f3e Tables: Which One Should I Choose?}
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @class
 	 * The column allows you to define column specific properties that will be applied when rendering the table.
 	 * @extends sap.ui.core.Element
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * The column menu provides all common actions that can be performed on a column.
 	 * @extends sap.ui.unified.Menu
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * <code>sap.ui.commons</code> library.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @class
 	 * The row.
 	 * @extends sap.ui.core.Element
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * of the order in the <code>items</code> aggregation.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @since 1.45
 	 *
 	 * @constructor
@@ -100,9 +100,6 @@ sap.ui.define([
 		return TableUtils.isA(oParent, "sap.ui.table.RowAction") ? oParent : null;
 	};
 
-	/**
-	 * @inheritDoc
-	 */
 	Item.prototype.setIcon = function(sIcon) {
 		this.setProperty("icon", sIcon, true);
 		if (this._oIcon) {
@@ -111,9 +108,6 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
-	 * @inheritDoc
-	 */
 	Item.prototype.setText = function(sText) {
 		this.setProperty("text", sText, true);
 		if (this._oIcon) {

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.142.0
+	 * @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.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @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
 		}
@@ -186,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);
@@ -206,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");
 
@@ -415,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");
 
@@ -458,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();
 
@@ -627,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
@@ -688,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);
@@ -725,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) {
@@ -824,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) {
@@ -890,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");
 				}
@@ -915,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");
 		}
 
@@ -1016,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();
 
 		//
@@ -1068,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");
@@ -1118,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();
 
@@ -1130,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();
 
@@ -1153,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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @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.142.0
+	 * @version 1.142.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization

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

@@ -40,14 +40,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.table
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @since 0.8
 	 * @public
 	 */
 	const thisLib = Library.init({
 		name: "sap.ui.table",
 		apiVersion: 2,
-		version: "1.142.0",
+		version: "1.142.1",
 		dependencies: ["sap.ui.core", "sap.ui.unified"],
 		...{
 			interactionDocumentation: true
@@ -114,7 +114,7 @@ sap.ui.define([
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @deprecated As of version 1.38, the concept has been discarded.
 	 * @public
@@ -145,7 +145,7 @@ sap.ui.define([
 	/**
 	 * Row Action types.
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @public
 	 */
@@ -176,7 +176,7 @@ sap.ui.define([
 	/**
 	 * Selection behavior of the table
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @public
 	 */
@@ -207,7 +207,7 @@ sap.ui.define([
 	/**
 	 * Selection mode of the table
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @public
 	 */
@@ -245,7 +245,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @public
 	 * @deprecated As of version 1.120, replaced with <code>sap.ui.core.SortOrder</code>
@@ -272,7 +272,7 @@ sap.ui.define([
 	/**
 	 * VisibleRowCountMode of the table
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @deprecated As of version 1.119, see the <code>rowMode</code> aggregation of <code>sap.ui.table.Table</code> for more details.
 	 * @public
@@ -317,7 +317,7 @@ sap.ui.define([
 	 *
 	 * Contains IDs of shared DOM references, which should be accessible to inheriting controls via getDomRef() function.
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @enum {string}
 	 * @public
 	 */
@@ -418,7 +418,7 @@ sap.ui.define([
 	 *
 	 * This is an alias for {@link sap.ui.model.TreeAutoExpandMode} and kept for compatibility reasons.
 	 *
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @typedef {sap.ui.model.TreeAutoExpandMode}
 	 * @public
 	 * @deprecated As of version 1.120, replaced by <code>sap.ui.model.TreeAutoExpandMode</code>

package/src/sap/ui/table/menus/AnalyticalTableContextMenu.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.table.menus.ContextMenu
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @private
 	 * @alias sap.ui.table.menus.AnalyticalTableContextMenu
 	 */

package/src/sap/ui/table/menus/ColumnHeaderMenuAdapter.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @private
 	 * @alias sap.ui.table.menus.ColumnHeaderMenuAdapter
 	 */

package/src/sap/ui/table/menus/ContextMenu.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @private
 	 * @alias sap.ui.table.menus.ContextMenu
 	 */

package/src/sap/ui/table/menus/MobileColumnHeaderMenuAdapter.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.menus.ColumnHeaderMenuAdapter
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @private
 	 * @alias sap.ui.table.menus.MobileColumnHeaderMenuAdapter
 	 */

package/src/sap/ui/table/messagebundle.properties

@@ -91,6 +91,12 @@ TBL_DESELECT_ALL=Deselect All
 #XACT: accessibility text for announcing the cell content
 TBL_CELL_INCLUDES=Includes {0}
 
+#XACT: accessibility text for announcing the expand button in a tree table
+TBL_EXPAND_BUTTON=Expand Button
+
+#XACT: accessibility text for announcing the collapse button in a tree table
+TBL_COLLAPSE_BUTTON=Collapse Button
+
 #XTOL: Tooltip of the button to expand/collapse a tree table node
 TBL_COLLAPSE_EXPAND=Expand / Collapse Node
 
@@ -184,9 +190,15 @@ TBL_ROW_STATE_NAVIGATED=Navigated
 #XACT: accessibilty description for expanding the table row via keyboard
 TBL_ROW_EXPAND_KEY=To expand row press SPACEBAR
 
+#XACT: accessibilty description for expanding the table row via keyboard when cell selection is enabled
+TBL_ROW_EXPAND_KEY_ALTERNATIVE=To expand row press ENTER
+
 #XACT: accessibilty description for collapsing the table row via keyboard
 TBL_ROW_COLLAPSE_KEY=To collapse row press SPACEBAR
 
+#XACT: accessibilty description for collapsing the table row via keyboard when cell selection is enabled
+TBL_ROW_COLLAPSE_KEY_ALTERNATIVE=To collapse row press ENTER
+
 #XBUT: Text of the apply button to save the data entered in the "creation row", a form in the table for creating new rows.
 TBL_CREATIONROW_APPLY=Add Row
 

package/src/sap/ui/table/plugins/BindingSelection.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 
 	 * @private
 	 * @alias sap.ui.table.plugins.BindingSelection

package/src/sap/ui/table/plugins/MultiSelectionPlugin.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.64

package/src/sap/ui/table/plugins/ODataV4Aggregation.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.140

package/src/sap/ui/table/plugins/ODataV4Hierarchy.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.140

package/src/sap/ui/table/plugins/ODataV4MultiLevel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.PluginBase
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @private
 	 * @alias sap.ui.table.plugins.ODataV4MultiLevel

package/src/sap/ui/table/plugins/ODataV4MultiSelection.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.140

package/src/sap/ui/table/plugins/ODataV4Selection.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @private
 	 * @alias sap.ui.table.plugins.ODataV4Selection

package/src/sap/ui/table/plugins/ODataV4SingleSelection.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.140

package/src/sap/ui/table/plugins/PluginBase.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @private
 	 * @experimental Since 1.75

package/src/sap/ui/table/plugins/SelectionModelSelection.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.plugins.SelectionPlugin
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @private
 	 * @alias sap.ui.table.plugins.SelectionModelSelection

package/src/sap/ui/table/plugins/SelectionPlugin.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @since 1.64

package/src/sap/ui/table/rowmodes/Auto.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 */
 	const AutoRowMode = RowMode.extend("sap.ui.table.rowmodes.Auto", /** @lends sap.ui.table.rowmodes.Auto.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/Fixed.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 */
 	const FixedRowMode = RowMode.extend("sap.ui.table.rowmodes.Fixed", /** @lends sap.ui.table.rowmodes.Fixed.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/Interactive.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 */
 	const InteractiveRowMode = RowMode.extend("sap.ui.table.rowmodes.Interactive", /** @lends sap.ui.table.rowmodes.Interactive.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/RowMode.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 */
 	const RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/Variable.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.rowmodes.RowMode
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/table/rules/ColumnTemplate.support.js

@@ -47,9 +47,9 @@ sap.ui.define([
 		minversion: "1.38",
 		categories: [Categories.Usage],
 		title: "Column template validation - 'sap.m.Text'",
-		description: "The 'wrapping' and/or 'renderWhitespace' property of the control 'sap.m.Text' is set to 'true' "
+		description: "The 'wrapping' property of the control 'sap.m.Text' is set to 'true' "
 					 + "although the control is used as a column template.",
-		resolution: "Set the 'wrapping' and 'renderWhitespace' property of the control 'sap.m.Text' to 'false' if the "
+		resolution: "Set the 'wrapping' property of the control 'sap.m.Text' to 'false' if the "
 					+ "control is used as a column template.",
 		check: function(oIssueManager, oCoreFacade, oScope) {
 			checkColumnTemplate(function(oTable, oColumn, oMTextTemplate) {
@@ -59,11 +59,6 @@ sap.ui.define([
 					SupportHelper.reportIssue(oIssueManager, "Column '" + sColumnId + "' of table '" + oTable.getId() + "' uses an "
 															 + "'sap.m.Text' control with wrapping enabled.", Severity.High, sColumnId);
 				}
-				if (oMTextTemplate.isBound("renderWhitespace") || (!oMTextTemplate.isBound("renderWhitespace")
-																   && oMTextTemplate.getRenderWhitespace())) {
-					SupportHelper.reportIssue(oIssueManager, "Column '" + sColumnId + "' of table '" + oTable.getId() + "' uses an "
-															 + "'sap.m.Text' control with renderWhitespace enabled.", Severity.High, sColumnId);
-				}
 			}, oScope, "sap.m.Text");
 		}
 	});

package/src/sap/ui/table/utils/TableUtils.js

@@ -208,7 +208,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private

package/src/sap/ui/table/utils/_ColumnUtils.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Column...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @namespace
 	 * @alias sap.ui.table.utils._ColumnUtils
 	 * @private

package/src/sap/ui/table/utils/_GroupingUtils.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Grouping...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @namespace
 	 * @alias sap.ui.table.utils._GroupingUtils
 	 * @private

package/src/sap/ui/table/utils/_HookUtils.js

@@ -21,7 +21,7 @@ sap.ui.define(["sap/ui/base/DataType", "sap/ui/model/ChangeReason"], function(Da
 	 * - There is no concept for public or protected hooks. Never expose a hook directly, only indirectly as can be seen in the examples.
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

package/src/sap/ui/table/utils/_MenuUtils.js

@@ -14,7 +14,7 @@ sap.ui.define([], function() {
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Menu...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.142.0
+	 * @version 1.142.1
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private