@openui5/sap.ui.table 1.136.1 → 1.138.0

package/REUSE.toml

@@ -238,27 +238,6 @@ SPDX-FileCopyrightText = [
 SPDX-License-Identifier = "Apache-2.0 and MIT"
 SPDX-FileComment = "these files contain content from SAP and JUnit Reporter for QUnit: qunit-junit.js is overall written by SAP, but contains a modified copy of JUnit Reporter for QUnit (qunit-reporter-junit)"
 
-[[annotations]]
-path = "src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2012 Matteo Spinelli"
-SPDX-License-Identifier = "MIT"
-SPDX-FileComment = "these files belong to: cubiq.org - iScroll"
-
-[[annotations]]
-path = "src/sap.ui.core/src/sap/ui/thirdparty/iscroll-lite.js"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2011 Matteo Spinelli"
-SPDX-License-Identifier = "MIT"
-SPDX-FileComment = "these files belong to: cubiq.org - iScroll Lite"
-
-[[annotations]]
-path = "src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2012 Matteo Spinelli"
-SPDX-License-Identifier = "MIT"
-SPDX-FileComment = "these files belong to: cubiq.org - swipeview"
-
 [[annotations]]
 path = "src/sap.ui.core/src/sap/ui/thirdparty/zyngascroll.js"
 precedence = "aggregate"
@@ -308,13 +287,6 @@ SPDX-FileCopyrightText = "1991-2024 Unicode, Inc."
 SPDX-License-Identifier = "LicenseRef-Unicode-3.0"
 SPDX-FileComment = "these files belong to: Unicode Common Locale Data Repository"
 
-[[annotations]]
-path = "src/sap.ui.core/src/sap/ui/thirdparty/mobiscroll/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2010-2013, Acid Media"
-SPDX-License-Identifier = "MIT"
-SPDX-FileComment = "these files belong to: MobiScroll"
-
 [[annotations]]
 path = [
     "src/sap.ui.core/src/sap/ui/thirdparty/sinon.js",

package/THIRDPARTY.txt

@@ -133,24 +133,6 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-reporter-junit.js
 	src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
 
-Component: cubiq.org - iScroll, version: 4.2.5
-Copyright: 2012 Matteo Spinelli
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js
-
-Component: cubiq.org - iScroll Lite, version: 4.1.6
-Copyright: 2011 Matteo Spinelli
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/iscroll-lite.js
-
-Component: cubiq.org - swipeview, version: 1.0
-Copyright: 2012 Matteo Spinelli
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js
-
 Component: Zynga Scroller, version: 1.2.1-0-g5d43806
 Copyright: 2011 Zynga Inc.
 License: MIT
@@ -193,12 +175,6 @@ License: LicenseRef-Unicode-3.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-Unicode-3.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cldr/**
 
-Component: MobiScroll, version: 2.9.0
-Copyright: 2010-2013, Acid Media
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/mobiscroll/**
-
 Component: SinonJS, version: 1.14.1
 Copyright: 2010-2014, Christian Johansen, christian@cjohansen.no
 License: BSD-3-Clause
@@ -462,7 +438,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.29.1
+Component: SAP Theming Base Content, version: 11.31.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.136.1",
+  "version": "1.138.0",
   "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/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.136.1",
-    "@openui5/sap.ui.unified": "1.136.1"
+    "@openui5/sap.ui.core": "1.138.0",
+    "@openui5/sap.ui.unified": "1.138.0"
   }
 }

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.136.1</version>
+  <version>1.138.0</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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -165,7 +165,7 @@ sap.ui.define([
 						if (oBinding) {
 							this._oBindingLabel = TableUtils._getTableTemplateHelper().createLabel();
 							this.addDependent(this._oBindingLabel);
-							TableUtils.Binding.metadataLoaded(oParent).then(function() {
+							oParent._metadataLoaded().then(function() {
 								this._oBindingLabel.setText(oBinding.getPropertyLabel(this.getLeadingProperty()));
 							}.bind(this));
 						}

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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @see https://github.com/SAP/odata-vocabularies/blob/main/docs/v2-annotations.md
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -231,7 +231,7 @@ sap.ui.define([
 		this._aGroupedColumns = [];
 		this._bSuspendUpdateAnalyticalInfo = false;
 
-		TableUtils.Grouping.setToDefaultGroupMode(this);
+		TableUtils.Grouping.setHierarchyMode(this, TableUtils.Grouping.HierarchyMode.Group);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.UpdateState, updateRowState, this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.Expand, expandRow, this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.Collapse, collapseRow, this);
@@ -355,12 +355,31 @@ sap.ui.define([
 
 		if (sName === "rows") {
 			this._updateTotalRow(true);
-			TableUtils.Binding.metadataLoaded(this).then(function() {
+			this._metadataLoaded().then(function() {
 				this._updateColumns(true);
 			}.bind(this));
 		}
 	};
 
+	AnalyticalTable.prototype._metadataLoaded = function() {
+		const oModel = this.getBinding()?.getModel() ?? null;
+		const oMetadataLoaded = Promise.withResolvers();
+
+		if (!oModel) {
+			oMetadataLoaded.reject();
+		} else if (oModel.metadataLoaded) { // v2
+			oModel.metadataLoaded().then(() => oMetadataLoaded.resolve());
+		} else if (oModel.attachMetadataLoaded) { // v1
+			if (oModel.oMetadata?.isLoaded()) {
+				oMetadataLoaded.resolve();
+			} else {
+				oModel.attachMetadataLoaded(() => oMetadataLoaded.resolve());
+			}
+		}
+
+		return oMetadataLoaded.promise;
+	};
+
 	AnalyticalTable.prototype._applyAnalyticalBindingInfo = function(oBindingInfo) {
 		// Make sure all necessary parameters are given.
 		// The ODataModelAdapter (via bindList) needs these properties to determine if an AnalyticalBinding should be instantiated.
@@ -508,13 +527,6 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * @inheritDoc
-	 */
-	AnalyticalTable.prototype.getContextByIndex = function(iIndex) {
-		return this._oProxy.getContextByIndex(iIndex);
-	};
-
 	/**
 	 * Gets a node object by an index.
 	 *
@@ -1035,7 +1047,7 @@ sap.ui.define([
 	 */
 	AnalyticalTable.prototype.getAnalyticalInfoOfRow = function(oRow) {
 		const oBinding = this.getBinding();
-		const oContext = oRow ? oRow.getRowBindingContext() : null;
+		const oContext = oRow ? TableUtils.getBindingContextOfRow(oRow) : null;
 
 		if (!TableUtils.isA(oRow, "sap.ui.table.Row") || oRow.getParent() !== this || !oBinding || !oContext) {
 			return null;

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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -1337,9 +1337,51 @@ sap.ui.define([
 			throw new Error("Column is not rendered");
 		}
 
-		TableUtils.Column.autoResizeColumn(this);
+		const oTable = this._getTable();
+		const sCurrentWidth = this.getWidth();
+		const iNewWidth = calculateColumnWidth(this);
+
+		if (iNewWidth + "px" !== sCurrentWidth) {
+			TableUtils.Column.resizeColumn(oTable, this, iNewWidth);
+		}
 	};
 
+	/**
+	 * Calculates the widest content width of the currently visible column cells including headers.
+	 * Headers with column span are not taken into account.
+	 *
+	 * @param {sap.ui.table.Column} oColumn The column control
+	 * @returns {int} iWidth Calculated column width
+	 * @private
+	 */
+	function calculateColumnWidth(oColumn) {
+		const oTableElement = oColumn._getTable().getDomRef();
+		const oHiddenArea = document.createElement("div");
+
+		oHiddenArea.classList.add("sapUiTableHiddenSizeDetector", "sapUiTableHeaderDataCell", "sapUiTableDataCell");
+		oTableElement.appendChild(oHiddenArea);
+
+		// Create a copy of all visible cells in the column, including the header cells without colspan
+		const aCells = Array.from(oTableElement.querySelectorAll(`td[data-sap-ui-colid="${oColumn.getId()}"]:not([colspan])`))
+			.filter((element) => !element.classList.contains("sapUiTableHidden"))
+			.map((element) => element.firstElementChild.cloneNode(true));
+
+		aCells.forEach((cell) => {
+			cell.removeAttribute('id');
+			oHiddenArea.appendChild(cell);
+		});
+
+		// Determine the column width
+		let iWidth = oHiddenArea.getBoundingClientRect().width + 4; // widest cell + 4px for borders and rounding
+		const iTableWidth = oTableElement.querySelector('.sapUiTableCnt').getBoundingClientRect().width;
+		iWidth = Math.min(iWidth, iTableWidth); // no wider as the table
+		iWidth = Math.max(iWidth, TableUtils.Column.getMinColumnWidth()); // not too small
+
+		oTableElement.removeChild(oHiddenArea);
+
+		return Math.round(iWidth);
+	}
+
 	Column.prototype.getFieldHelpInfo = function() {
 		return {
 			label: TableUtils.Column.getHeaderText(this)

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.136.1
+	 * @version 1.138.0
 	 *
 	 * @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.136.1
+	 * @version 1.138.0
 	 *
 	 * @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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -368,10 +368,6 @@ sap.ui.define([
 		this._updateTableCells(oTable);
 	};
 
-	Row.prototype.getRowBindingContext = function() {
-		return state(this).context;
-	};
-
 	Row.prototype.setBindingContext = function(oContext, sModelName) {
 		return Element.prototype.setBindingContext.call(this, oContext || null, sModelName);
 	};
@@ -382,7 +378,7 @@ sap.ui.define([
 		const iAbsoluteRowIndex = this.getIndex();
 		const bHasTableCellUpdate = !!oTable._updateTableCell;
 		let oCell; let $Td; let bHasCellUpdate;
-		const oBindingContext = this.getRowBindingContext();
+		const oBindingContext = TableUtils.getBindingContextOfRow(this);
 
 		for (let i = 0; i < aCells.length; i++) {
 			oCell = aCells[i];
@@ -405,7 +401,14 @@ sap.ui.define([
 	 * @private
 	 */
 	Row.prototype.getType = function() {
-		return state(this).type;
+		const sType = state(this).type;
+
+		if (sType === RowType.GroupHeader && TableUtils.Grouping.isInTreeMode(this.getTable())) {
+			// In tree mode, the row type GroupHeader is ignored and treated like row type Standard.
+			return RowType.Standard;
+		}
+
+		return sType;
 	};
 
 	/**

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * If more action items are available as the available space allows to display an overflow mechanism is provided.
 	 * This control must only be used in the context of the <code>sap.ui.table.Table</code> control to define row actions.
 	 * @extends sap.ui.core.Control
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @since 1.45
 	 *
 	 * @constructor

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.136.1
+	 * @version 1.138.0
 	 *
 	 * @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.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -3060,7 +3060,7 @@ sap.ui.define([
 			const oCell = oRow && oRow.getCells()[iCol];
 			const iRealRowIndex = oRow && oRow.getIndex();
 			const sColId = Column.ofCell(oCell).getId();
-			const oRowBindingContext = oRow.getRowBindingContext();
+			const oRowBindingContext = TableUtils.getBindingContextOfRow(oRow);
 			const mParams = {
 				rowIndex: iRealRowIndex,
 				columnIndex: iCol,
@@ -4146,7 +4146,7 @@ sap.ui.define([
 	};
 
 	Table.prototype._getDefaultContextMenu = function() {
-		let oDefaultContextMenu = this.getAggregation("_hiddenDependents").find((oElement) => oElement.isA("sap.ui.table.menus.ContextMenu"));
+		let oDefaultContextMenu = this.getAggregation("_hiddenDependents")?.find((oElement) => oElement.isA("sap.ui.table.menus.ContextMenu"));
 
 		if (!oDefaultContextMenu) {
 			oDefaultContextMenu = new ContextMenu();

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

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

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

@@ -934,7 +934,7 @@ sap.ui.define([
 			// check whether the row can be clicked to change the selection
 			const bSelectOnCellsAllowed = TableUtils.isRowSelectionAllowed(oTable);
 			const bRowsDraggable = oTable.getDragDropConfig().some(function(oDragDropInfo) {
-				return oDragDropInfo.getMetadata().isInstanceOf("sap.ui.core.dnd.IDragInfo") && oDragDropInfo.getSourceAggregation() === "rows";
+				return oDragDropInfo.isDraggable(oTable, "rows");
 			});
 
 			const iLastFixedColumnIndex = this.getLastFixedColumnIndex(oTable);

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

@@ -4,31 +4,25 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.ui.table.TreeTable.
 sap.ui.define([
-	'./Table',
+	"./Table",
 	"./TableRenderer",
-	'sap/ui/model/ClientTreeBindingAdapter',
-	'sap/ui/model/TreeBindingCompatibilityAdapter',
-	'./library',
-	'./utils/TableUtils',
+	"./utils/TableUtils",
 	"./plugins/BindingSelection",
 	"sap/base/Log",
-	"sap/base/assert",
+	"sap/ui/model/ClientTreeBindingAdapter",
+	"sap/ui/model/TreeBindingCompatibilityAdapter",
 	"sap/ui/model/controlhelper/TreeBindingProxy"
-],
-	function(
-		Table,
-		TableRenderer,
-		ClientTreeBindingAdapter,
-		TreeBindingCompatibilityAdapter,
-		library,
-		TableUtils,
-		BindingSelectionPlugin,
-		Log,
-		assert,
-		TreeBindingProxy
-	) {
+], function(
+	Table,
+	TableRenderer,
+	TableUtils,
+	BindingSelectionPlugin,
+	Log,
+	ClientTreeBindingAdapter,
+	TreeBindingCompatibilityAdapter,
+	TreeBindingProxy
+) {
 	"use strict";
 
 	const _private = TableUtils.createWeakMapFacade();
@@ -42,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * The TreeTable control provides a comprehensive set of features to display hierarchical data.
 	 * @extends sap.ui.table.Table
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 *
 	 * @constructor
 	 * @public
@@ -52,10 +46,8 @@ sap.ui.define([
 	 * @see {@link fiori:/tree-table/ Tree Table}
 	 */
 	const TreeTable = Table.extend("sap.ui.table.TreeTable", /** @lends sap.ui.table.TreeTable.prototype */ {metadata: {
-
 		library: "sap.ui.table",
 		properties: {
-
 			/**
 			 * Specifies whether the first level is expanded.
 			 *
@@ -129,7 +121,6 @@ sap.ui.define([
 			rootLevel: {type: "int", group: "Data", defaultValue: 0, deprecated: true}
 		},
 		events: {
-
 			/**
 			 * Fired when a row has been expanded or collapsed by user interaction. Only available in hierarchical mode.
 			 */
@@ -164,7 +155,7 @@ sap.ui.define([
 
 		_private(this).bPendingRequest = false;
 
-		TableUtils.Grouping.setToDefaultTreeMode(this);
+		TableUtils.Grouping.setHierarchyMode(this, TableUtils.Grouping.HierarchyMode.Tree);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.UpdateState, updateRowState, this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.Expand, expandRow, this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.Collapse, collapseRow, this);
@@ -213,7 +204,7 @@ sap.ui.define([
 		const bIsExpanded = this._oProxy.isExpanded(iIndex);
 
 		if (typeof bIsExpanded === "boolean") {
-			this._onGroupHeaderChanged(iIndex, bIsExpanded);
+			this._onGroupHeaderChanged(oRow, bIsExpanded);
 		}
 	}
 
@@ -224,7 +215,7 @@ sap.ui.define([
 		const bIsExpanded = this._oProxy.isExpanded(iIndex);
 
 		if (typeof bIsExpanded === "boolean") {
-			this._onGroupHeaderChanged(iIndex, bIsExpanded);
+			this._onGroupHeaderChanged(oRow, bIsExpanded);
 		}
 	}
 
@@ -309,10 +300,10 @@ sap.ui.define([
 		return aRowContexts;
 	}
 
-	TreeTable.prototype._onGroupHeaderChanged = function(iRowIndex, bExpanded) {
+	TreeTable.prototype._onGroupHeaderChanged = function(oRow, bExpanded) {
 		this.fireToggleOpenState({
-			rowIndex: iRowIndex,
-			rowContext: this.getContextByIndex(iRowIndex),
+			rowIndex: oRow.getIndex(),
+			rowContext: TableUtils.getBindingContextOfRow(oRow),
 			expanded: bExpanded
 		});
 	};
@@ -465,13 +456,6 @@ sap.ui.define([
 	 * @name sap.ui.table.TreeTable#selectAll
 	 */
 
-	/**
-	 * @inheritDoc
-	 */
-	TreeTable.prototype.getContextByIndex = function(iRowIndex) {
-		return this._oProxy.getContextByIndex(iRowIndex);
-	};
-
 	/*
 	 * Set the rootLevel for the hierarchy
 	 * The root level is the level of the topmost tree nodes, which will be used as an entry point for OData services.
@@ -576,9 +560,9 @@ sap.ui.define([
 		if (oTable.getUseGroupMode()) {
 			TableUtils.Grouping.setHierarchyMode(oTable, TableUtils.Grouping.HierarchyMode.GroupedTree);
 		} else if (oTable._bFlatMode) {
-			TableUtils.Grouping.setToDefaultFlatMode(oTable);
+			TableUtils.Grouping.setHierarchyMode(oTable, TableUtils.Grouping.HierarchyMode.Flat);
 		} else if (!oTable._bFlatMode) {
-			TableUtils.Grouping.setToDefaultTreeMode(oTable);
+			TableUtils.Grouping.setHierarchyMode(oTable, TableUtils.Grouping.HierarchyMode.Tree);
 		}
 	}
 

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

@@ -220,20 +220,20 @@ sap.ui.define([
 			return aLabels;
 		},
 
-		/*
-		 * Returns whether the given cell is hidden
+		/**
+		 * Checks whether the given cell is hidden.
+		 *
+		 * @param {jQuery} $Cell The cell DOM element
+		 * @param {sap.ui.table.Column} oCell The control in the cell
+		 * @param {sap.ui.table.Row} oRow The row the cell is inside
+		 * @returns {boolean} Whether the cell is hidden
 		 */
-		isHiddenCell: function($Cell, oCell) {
-			const bGroup = TableUtils.Grouping.isInGroupHeaderRow($Cell);
-			const bSum = TableUtils.Grouping.isInSummaryRow($Cell);
-			const bSupportStyleClass = !!oCell && !!oCell.hasStyleClass;
-
-			const bIsRowHidden = $Cell.parent().hasClass("sapUiTableRowHidden");
+		isHiddenCell: function($Cell, oCell, oRow) {
 			const bIsCellHidden = $Cell.hasClass("sapUiTableCellHidden");
-			const bGroupCellHiddenByApp = bGroup && bSupportStyleClass && oCell.hasStyleClass("sapUiAnalyticalTableGroupCellHidden");
-			const bSumCellHiddenByApp = bSum && bSupportStyleClass && oCell.hasStyleClass("sapUiAnalyticalTableSumCellHidden");
+			const bGroupCellHiddenByApp = oRow.isGroupHeader() && (oCell?.hasStyleClass?.("sapUiAnalyticalTableGroupCellHidden") ?? false);
+			const bSumCellHiddenByApp = oRow.isSummary() && (oCell?.hasStyleClass?.("sapUiAnalyticalTableSumCellHidden") ?? false);
 
-			return bIsRowHidden || bIsCellHidden || bGroupCellHiddenByApp || bSumCellHiddenByApp;
+			return oRow.isContentHidden() || bIsCellHidden || bGroupCellHiddenByApp || bSumCellHiddenByApp;
 		},
 
 		/*
@@ -422,7 +422,7 @@ sap.ui.define([
 			let oInfo = null;
 			const oRow = oTableInstances.row;
 			const sRowId = oRow.getId();
-			const bHidden = ExtensionHelper.isHiddenCell($Cell, oTableInstances.cell);
+			const bHidden = ExtensionHelper.isHiddenCell($Cell, oTableInstances.cell, oRow);
 			const bIsTreeColumnCell = ExtensionHelper.isTreeColumnCell(this, $Cell);
 			const aDefaultLabels = ExtensionHelper.getAriaAttributesForDataCell(this, {
 					index: iCol,
@@ -448,7 +448,7 @@ sap.ui.define([
 
 			aLabels = aLabels.concat(aDefaultLabels);
 
-			if (!bHidden) {
+			if (!bHidden && oTableInstances.cell) {
 				oInfo = ACCInfoHelper.getAccInfoOfControl(oTableInstances.cell);
 				aLabels.push(oInfo ? (sTableId + "-cellacc") : oTableInstances.cell.getId());
 			}
@@ -594,7 +594,7 @@ sap.ui.define([
 			const $Cell = jQuery(oCellInfo.cell);
 			const oRow = oTable.getRows()[oCellInfo.rowIndex];
 			const sRowId = oRow.getId();
-			const bHidden = ExtensionHelper.isHiddenCell($Cell);
+			const bHidden = ExtensionHelper.isHiddenCell($Cell, null, oRow);
 			const aDefaultLabels = ExtensionHelper.getAriaAttributesForRowAction(this)["aria-labelledby"] || [];
 			const aLabels = [].concat(aDefaultLabels);
 			const aDescriptions = [];
@@ -1126,10 +1126,15 @@ sap.ui.define([
 		/**
 		 * Returns the aria attributes for the header of the row actions column.
 		 *
+		 * @param {sap.ui.table.extensions.Accessibility} oExtension The accessibility extension
 		 * @returns {object} An object containing the aria attributes
 		 */
-		getAriaAttributesForRowActionHeader: function() {
-			return {"aria-hidden": "true"};
+		getAriaAttributesForRowActionHeader: function(oExtension) {
+			const oTable = oExtension.getTable();
+			return {
+				"role": "columnheader",
+				"aria-colindex": TableUtils.getVisibleColumnCount(oTable) + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0)
+			};
 		},
 
 		/**
@@ -1150,7 +1155,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.136.1
+	 * @version 1.138.0
 	 * @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.136.1
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender