@openui5/sap.ui.table 1.138.0 → 1.139.1

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.138.0
+	 * @version 1.139.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.138.0
+	 * @version 1.139.1
 	 *
 	 * @constructor
 	 * @public

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.138.0
+	 * @version 1.139.1
 	 *
 	 * @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.138.0
+	 * @version 1.139.1
 	 * @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.138.0
+	 * @version 1.139.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.138.0
+	 * @version 1.139.1
 	 *
 	 * @constructor
 	 * @public
@@ -2506,12 +2506,13 @@ sap.ui.define([
 	 * @see sap.ui.model.ListBinding#getContexts
 	 */
 	Table.prototype._getContexts = function(iStartIndex, iLength, iThreshold, bKeepCurrent) {
-		if (!this.getVisible()) {
+		const oBinding = this.getBinding();
+
+		if (!oBinding || !this.getVisible() && oBinding.isSuspended()) {
 			return [];
 		}
 
-		const oBinding = this.getBinding();
-		return oBinding ? oBinding.getContexts(iStartIndex, iLength, iThreshold, bKeepCurrent) : [];
+		return oBinding.getContexts(iStartIndex, iLength, iThreshold, bKeepCurrent);
 	};
 
 	/**

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

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

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

@@ -390,12 +390,8 @@ sap.ui.define([
 			rm.class("sapUiTableHeaderCell");
 			rm.class("sapUiTableRowActionHeaderCell");
 			rm.attr("tabindex", "-1");
+			rm.attr("aria-label", TableUtils.getResourceText("TBL_ROW_ACTION_COLUMN_LABEL"));
 			rm.openEnd();
-			rm.openStart("span");
-
-			rm.openEnd();
-			rm.text(TableUtils.getResourceText("TBL_ROW_ACTION_COLUMN_LABEL"));
-			rm.close("span");
 
 			rm.close("div");
 		}
@@ -508,8 +504,7 @@ sap.ui.define([
 
 		const mAccParams = {
 			column: oColumn,
-			headerId: sHeaderId,
-			index: iIndex
+			headerId: sHeaderId
 		};
 
 		if (nSpan > 1) {
@@ -1151,7 +1146,6 @@ sap.ui.define([
 			const bIsLastFixedColumn = bFixedTable && iLastFixedColumnIndex === iColIndex;
 
 			const oParams = {
-				index: iColIndex,
 				column: oColumn,
 				row: oRow,
 				fixed: bFixedTable,

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

@@ -36,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.138.0
+	 * @version 1.139.1
 	 *
 	 * @constructor
 	 * @public
@@ -265,7 +265,7 @@ sap.ui.define([
 	};
 
 	TreeTable.prototype._getContexts = function(iStartIndex, iLength, iThreshold, bKeepCurrent) {
-		if (!this.getVisible()) {
+		if (!this.getVisible() && this.getBinding()?.isSuspended()) {
 			return [];
 		}
 

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

@@ -371,9 +371,9 @@ sap.ui.define([
 		 * @see ExtensionHelper.getRowColChange
 		 * @see ExtensionHelper.storeDefaultsBeforeCellModifications
 		 */
-		performCellModifications: function(oExtension, $Cell, aDefaultLabels, aDefaultDescriptions, aLabels, aDescriptions, sText, fAdapt) {
+		performCellModifications: function(oExtension, $Cell, aDefaultLabels, aDefaultDescriptions, aLabels, aDescriptions, sText, oChangeInfo, fAdapt) {
 			ExtensionHelper.storeDefaultsBeforeCellModifications(oExtension, $Cell, aDefaultLabels, aDefaultDescriptions);
-			const oChangeInfo = ExtensionHelper.getRowColChange(oExtension);
+
 			const oTable = oExtension.getTable();
 			const sTableId = oTable.getId();
 			oTable.$("cellacc").text(sText || "."); //set the custom text to the prepared hidden element
@@ -406,7 +406,7 @@ sap.ui.define([
 		 * Modifies the labels and descriptions of a data cell.
 		 * @see ExtensionHelper.performCellModifications
 		 */
-		modifyAccOfDataCell: function(oCellInfo) {
+		modifyAccOfDataCell: function(oCellInfo, oChangeInfo) {
 			const oTable = this.getTable();
 			const sTableId = oTable.getId();
 			const oIN = oTable._getItemNavigation();
@@ -424,13 +424,8 @@ sap.ui.define([
 			const sRowId = oRow.getId();
 			const bHidden = ExtensionHelper.isHiddenCell($Cell, oTableInstances.cell, oRow);
 			const bIsTreeColumnCell = ExtensionHelper.isTreeColumnCell(this, $Cell);
-			const aDefaultLabels = ExtensionHelper.getAriaAttributesForDataCell(this, {
-					index: iCol,
-					column: oTableInstances.column,
-					fixed: TableUtils.isFixedColumn(oTable, iCol)
-				})["aria-labelledby"] || [];
 			const aDescriptions = [];
-			let aLabels = [];
+			const aLabels = [];
 			const bIsGroupHeader = oRow.isGroupHeader();
 			const bIsSummary = oRow.isSummary();
 
@@ -442,12 +437,10 @@ sap.ui.define([
 				aLabels.push(sTableId + "-ariagrouptotallabel");
 			}
 
-			if (TableUtils.hasRowHighlights(oTable) && !bIsGroupHeader && !bIsSummary) {
+			if (TableUtils.hasRowHighlights(oTable) && !bIsGroupHeader && !bIsSummary && oChangeInfo.rowChange) {
 				aLabels.push(sRowId + "-highlighttext");
 			}
 
-			aLabels = aLabels.concat(aDefaultLabels);
-
 			if (!bHidden && oTableInstances.cell) {
 				oInfo = ACCInfoHelper.getAccInfoOfControl(oTableInstances.cell);
 				aLabels.push(oInfo ? (sTableId + "-cellacc") : oTableInstances.cell.getId());
@@ -468,7 +461,7 @@ sap.ui.define([
 				}
 			}
 
-			ExtensionHelper.performCellModifications(this, $Cell, aDefaultLabels, null, aLabels, aDescriptions, sText,
+			ExtensionHelper.performCellModifications(this, $Cell, null, null, aLabels, aDescriptions, sText, oChangeInfo,
 				function(aLabels, aDescriptions, bRowChange, bColChange) {
 					if (bIsGroupHeader && bRowChange) {
 						aLabels.splice(1, 0, sRowId + "-groupHeader");
@@ -488,7 +481,7 @@ sap.ui.define([
 		 * Modifies the labels and descriptions of a row header cell.
 		 * @see ExtensionHelper.performCellModifications
 		 */
-		modifyAccOfRowHeader: function(oCellInfo) {
+		modifyAccOfRowHeader: function(oCellInfo, oChangeInfo) {
 			const oTable = this.getTable();
 			const sTableId = oTable.getId();
 			const $Cell = jQuery(oCellInfo.cell);
@@ -500,7 +493,7 @@ sap.ui.define([
 			if (!oRow.isSummary() && !oRow.isGroupHeader() && !oRow.isContentHidden()) {
 				aLabels.push(sRowId + "-rowselecttext");
 
-				if (TableUtils.hasRowHighlights(oTable)) {
+				if (TableUtils.hasRowHighlights(oTable) && oChangeInfo.rowChange) {
 					aLabels.push(sRowId + "-highlighttext");
 				}
 			}
@@ -517,31 +510,26 @@ sap.ui.define([
 				aLabels.push(sTableId + "-ariagrouptotallabel");
 			}
 
-			ExtensionHelper.performCellModifications(this, $Cell, aDefaultLabels, null, aLabels, null, null);
+			ExtensionHelper.performCellModifications(this, $Cell, aDefaultLabels, null, aLabels, null, null, oChangeInfo);
 		},
 
 		/*
 		 * Modifies the labels and descriptions of a column header cell.
 		 * @see ExtensionHelper.performCellModifications
 		 */
-		modifyAccOfColumnHeader: function(oCellInfo) {
+		modifyAccOfColumnHeader: function(oCellInfo, oChangeInfo) {
 			const oTable = this.getTable();
 			const $Cell = jQuery(oCellInfo.cell);
 			const oColumn = Element.getElementById($Cell.attr("data-sap-ui-colid"));
-			const oColumnLabel = TableUtils.Column.getHeaderLabel(oColumn);
 			const mAttributes = ExtensionHelper.getAriaAttributesForColumnHeader(this, {
 					headerId: $Cell.attr("id"),
 					column: oColumn,
-					index: $Cell.attr("data-sap-ui-colindex")
+					index: oTable._getVisibleColumns().indexOf(oColumn)
 				});
 			const sText = ExtensionHelper.getColumnTooltip(oColumn);
 			const aLabels = mAttributes["aria-labelledby"] || [];
 			const iSpan = oCellInfo.columnSpan;
 
-			if (oColumnLabel?.getRequired?.()) {
-				aLabels.push(oTable.getId() + "-ariarequired");
-			}
-
 			if (iSpan > 1) {
 				aLabels.push(oTable.getId() + "-ariacolspan");
 				// Update Span information
@@ -556,12 +544,8 @@ sap.ui.define([
 				aLabels.push(oTable.getId() + "-ariacolfiltered");
 			}
 
-			if (aLabels.length > 0) {
-				aLabels.unshift($Cell.attr("id") + "-inner");
-			}
-
 			ExtensionHelper.performCellModifications(this, $Cell, mAttributes["aria-labelledby"], mAttributes["aria-describedby"],
-				aLabels, mAttributes["aria-describedby"], sText
+				aLabels, mAttributes["aria-describedby"], sText, oChangeInfo
 			);
 		},
 
@@ -569,7 +553,7 @@ sap.ui.define([
 		 * Modifies the labels and descriptions of the column row header.
 		 * @see ExtensionHelper.performCellModifications
 		 */
-		modifyAccOfColumnRowHeader: function(oCellInfo) {
+		modifyAccOfColumnRowHeader: function(oCellInfo, oChangeInfo) {
 			const oTable = this.getTable();
 			const $Cell = jQuery(oCellInfo.cell);
 			const bEnabled = $Cell.hasClass("sapUiTableSelAllVisible");
@@ -580,7 +564,7 @@ sap.ui.define([
 			);
 			const aLabels = mAttributes["aria-labelledby"] || [];
 			ExtensionHelper.performCellModifications(this, $Cell, [], mAttributes["aria-describedby"],
-				aLabels, mAttributes["aria-describedby"], null
+				aLabels, mAttributes["aria-describedby"], null, oChangeInfo
 			);
 		},
 
@@ -588,7 +572,7 @@ sap.ui.define([
 		 * Modifies the labels and descriptions of a row action cell.
 		 * @see ExtensionHelper.performCellModifications
 		 */
-		modifyAccOfRowAction: function(oCellInfo) {
+		modifyAccOfRowAction: function(oCellInfo, oChangeInfo) {
 			const oTable = this.getTable();
 			const sTableId = oTable.getId();
 			const $Cell = jQuery(oCellInfo.cell);
@@ -611,7 +595,7 @@ sap.ui.define([
 				aLabels.push(sTableId + "-ariagrouptotallabel");
 			}
 
-			if (TableUtils.hasRowHighlights(oTable) && !oRow.isGroupHeader() && !oRow.isSummary()) {
+			if (TableUtils.hasRowHighlights(oTable) && !oRow.isGroupHeader() && !oRow.isSummary() && oChangeInfo.rowChange) {
 				aLabels.push(sRowId + "-highlighttext");
 			}
 
@@ -627,7 +611,7 @@ sap.ui.define([
 				}
 			}
 
-			ExtensionHelper.performCellModifications(this, $Cell, aDefaultLabels, [], aLabels, aDescriptions, sText,
+			ExtensionHelper.performCellModifications(this, $Cell, aDefaultLabels, [], aLabels, aDescriptions, sText, oChangeInfo,
 				function(aLabels, aDescriptions, bRowChange) {
 					if (bIsGroupHeader && bRowChange) {
 						const iIndex = aLabels.indexOf(sTableId + "-ariarowgrouplabel") + 1;
@@ -676,12 +660,12 @@ sap.ui.define([
 			if (mRenderConfig.headerSelector.visible) {
 				if (mRenderConfig.headerSelector.type === "toggle") {
 					mAttributes["role"] = ["checkbox"];
-					if (mParams && mParams.enabled) {
+					if (mParams.enabled) {
 						mAttributes["aria-checked"] = mParams.checked ? "true" : "false";
 					}
 				} else if (mRenderConfig.headerSelector.type === "custom") {
 					mAttributes["role"] = ["button"];
-					if (!mParams || !mParams.enabled) {
+					if (!mParams.enabled) {
 						mAttributes["aria-disabled"] = "true";
 					}
 				}
@@ -750,14 +734,21 @@ sap.ui.define([
 			const oTable = oExtension.getTable();
 			const sTableId = oTable.getId();
 
-			const oColumn = mParams && mParams.column;
-			const bHasColSpan = mParams && mParams.colspan;
+			const oColumn = mParams.column;
+			const iColIndex = oTable._getVisibleColumns().indexOf(oColumn);
+			const bHasColSpan = mParams.colspan;
+			const oColumnLabel = TableUtils.Column.getHeaderLabel(oColumn);
 
 			mAttributes["role"] = "columnheader";
-			mAttributes["aria-colindex"] = mParams.index + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0);
+			mAttributes["aria-colindex"] = iColIndex + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0);
 
-			if (mParams && (mParams.index < oTable.getComputedFixedColumnCount())) {
-				mAttributes["aria-labelledby"] = [sTableId + "-ariafixedcolumn"];
+			mAttributes["aria-labelledby"] = [mParams.headerId + "-inner"];
+			if (iColIndex < oTable.getComputedFixedColumnCount()) {
+				mAttributes["aria-labelledby"].push([sTableId + "-ariafixedcolumn"]);
+			}
+
+			if (oColumnLabel?.getRequired?.()) {
+				mAttributes["aria-labelledby"].push(sTableId + "-ariarequired");
 			}
 
 			if (!bHasColSpan && oColumn) {
@@ -787,7 +778,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, column: sap.ui.table.Column, row: sap.ui.table.Row,	fixed: boolean,	rowSelected: boolean}} mParams An object
+		 * @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
 		 * @returns {object} An object containing the aria attributes
@@ -795,14 +786,11 @@ sap.ui.define([
 		getAriaAttributesForDataCell: function(oExtension, mParams) {
 			const mAttributes = {};
 			const oTable = oExtension.getTable();
-			const sTableId = oTable.getId();
+			const oColumn = mParams.column;
 
 			mAttributes["role"] = "gridcell";
-			mAttributes["aria-colindex"] = mParams.index + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0);
+			mAttributes["aria-colindex"] = oTable._getVisibleColumns().indexOf(oColumn) + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0);
 
-			if (mParams.column && mParams.fixed) {
-				mAttributes["aria-labelledby"] = [sTableId + "-ariafixedcolumn"];
-			}
 			return mAttributes;
 		},
 
@@ -1024,7 +1012,7 @@ sap.ui.define([
 					"role": ""
 				};
 				if (oTable.getBinding()) {
-					if (mParams && mParams.row) {
+					if (mParams.row) {
 						if (mParams.row.isExpandable()) {
 							const sText = TableUtils.getResourceText("TBL_COLLAPSE_EXPAND");
 							mAttributes["title"] = sText;
@@ -1155,7 +1143,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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility
@@ -1166,7 +1154,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			this._accMode = ControlBehavior.isAccessibilityEnabled();
 			this._busyCells = [];
 
@@ -1379,7 +1367,8 @@ sap.ui.define([
 			}
 		}
 
-		ExtensionHelper["modifyAccOf" + sCellType].apply(this, [oInfo]);
+		const oChangeInfo = ExtensionHelper.getRowColChange(this);
+		ExtensionHelper["modifyAccOf" + sCellType].apply(this, [oInfo, oChangeInfo]);
 	};
 
 	/**

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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender
@@ -56,7 +56,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			return "AccRenderExtension";
 		},
 

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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.DragAndDrop
@@ -286,7 +286,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			this._oDelegate = ExtensionDelegate;
 
 			TableUtils.addDelegate(oTable, this._oDelegate, oTable);

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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase
@@ -33,14 +33,6 @@ sap.ui.define([
 		 */
 		_table: null,
 
-		/**
-		 * The type of the table this extension is applied to.
-		 *
-		 * @type {sap.ui.table.extensions.ExtensionBase.TABLETYPES}
-		 * @protected
-		 */
-		_type: null,
-
 		/**
 		 * The settings this extension instance has been initialized with.
 		 *
@@ -55,14 +47,7 @@ sap.ui.define([
 			this._table = oTable;
 			this._settings = mSettings || {};
 
-			this._type = ExtensionBase.TABLETYPES.STANDARD;
-			if (oTable.isA("sap.ui.table.TreeTable")) {
-				this._type = ExtensionBase.TABLETYPES.TREE;
-			} else if (oTable.isA("sap.ui.table.AnalyticalTable")) {
-				this._type = ExtensionBase.TABLETYPES.ANALYTICAL;
-			}
-
-			const sExtensionName = this._init(this._table, this._type, this._settings);
+			const sExtensionName = this._init(this._table, this._settings);
 
 			// Attach a getter to the table to get the instance of this extension.
 			if (sExtensionName) {
@@ -77,7 +62,6 @@ sap.ui.define([
 		 */
 		destroy: function() {
 			this._table = null;
-			this._type = null;
 			this.bIsDestroyed = true;
 			BaseObject.prototype.destroy.apply(this, arguments);
 		},
@@ -89,19 +73,6 @@ sap.ui.define([
 		getInterface: function() { return this; }
 	});
 
-	/**
-	 * Type of the table.
-	 *
-	 * @type {{TREE: string, ANALYTICAL: string, STANDARD: string}}
-	 * @public
-	 * @static
-	 */
-	ExtensionBase.TABLETYPES = {
-		TREE: "TREE",
-		ANALYTICAL: "ANALYTICAL",
-		STANDARD: "STANDARD"
-	};
-
 	/**
 	 * Returns the related table control.
 	 *
@@ -117,13 +88,12 @@ sap.ui.define([
 	 * Initialize the extension.
 	 *
 	 * @param {sap.ui.table.Table} oTable Instance of the table.
-	 * @param {sap.ui.table.extensions.ExtensionBase.TABLETYPES} sTableType The type of the table.
 	 * @param {Object} [mSettings] Additional settings.
 	 * @returns {string|null} Derived classes should return the name of the extension.
 	 * @abstract
 	 * @protected
 	 */
-	ExtensionBase.prototype._init = function(oTable, sTableType, mSettings) { return null; };
+	ExtensionBase.prototype._init = function(oTable, mSettings) { return null; };
 
 	/**
 	 * Hook which allows the extension to attach for additional native event listeners after the rendering of the table control.

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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard
@@ -277,11 +277,11 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			this._itemNavigation = null;
 			this._itemNavigationInvalidated = false; // determines whether item navigation should be reapplied from scratch
 			this._itemNavigationSuspended = false; // switch off event forwarding to item navigation
-			this._delegate = new KeyboardDelegate(sTableType);
+			this._delegate = new KeyboardDelegate();
 			this._actionMode = false;
 
 			// Register the delegates in correct order

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

@@ -64,30 +64,12 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate
 	 */
-	const KeyboardDelegate = BaseObject.extend("sap.ui.table.extensions.KeyboardDelegate", /* @lends sap.ui.table.extensions.KeyboardDelegate */ {
-		constructor: function(sType) {
-			BaseObject.call(this);
-		},
-
-		/*
-		 * @see sap.ui.base.Object#destroy
-		 */
-		destroy: function() {
-			BaseObject.prototype.destroy.apply(this, arguments);
-		},
-
-		/*
-		 * @see sap.ui.base.Object#getInterface
-		 */
-		getInterface: function() {
-			return this;
-		}
-	});
+	const KeyboardDelegate = BaseObject.extend("sap.ui.table.extensions.KeyboardDelegate");
 
 	/**
 	 * Moves the focus one row down, but stays in the same column. The focus is set to the cell, or the first interactive element inside that cell.
@@ -406,6 +388,9 @@ sap.ui.define([
 		} else if (oCellInfo.isOfType(CellType.ROWHEADER)) {
 			selectItems();
 
+		} else if (oCellInfo.isOfType(CellType.COLUMNHEADER)) {
+			TableUtils.Menu.openContextMenu(oTable, oEvent);
+
 		} else if (oCellInfo.isOfType(CellType.DATACELL | CellType.ROWACTION)) {
 			// The action mode should only be entered when cellClick is not handled and no selection is performed.
 			let bEnterActionMode = !oTable.hasListeners("cellClick");
@@ -832,7 +817,13 @@ sap.ui.define([
 			const oBusyIndicator = this.getDomRef("busyIndicator");
 			if (oBusyIndicator) {
 				oKeyboardExtension.setSilentFocus(oBusyIndicator);
-			} else if (this.getColumnHeaderVisible() && (TableUtils.getVisibleColumnCount(this) || TableUtils.hasRowHeader(this))) {
+			} else if (!this.getColumnHeaderVisible()) {
+				if (this.getRows().length && !TableUtils.isNoDataVisible(this)) {
+					restoreFocusOnLastFocusedDataCell(this, oEvent);
+				} else if (bNoData) {
+					oKeyboardExtension.setSilentFocus(this.$("noDataCnt"));
+				}
+			} else if (TableUtils.getVisibleColumnCount(this) || TableUtils.hasRowHeader(this)) {
 				setFocusOnColumnHeaderOfLastFocusedDataCell(this, oEvent);
 			} else if (bNoData) {
 				oKeyboardExtension.setSilentFocus(this.$("noDataCnt"));
@@ -1024,11 +1015,7 @@ sap.ui.define([
 			delete this._oRangeSelection;
 		}
 
-		if (oCellInfo.isOfType(CellType.COLUMNHEADER)) {
-			if (KeyboardDelegate._isKeyCombination(oEvent, KeyCodes.SPACE) || KeyboardDelegate._isKeyCombination(oEvent, KeyCodes.ENTER)) {
-				TableUtils.Menu.openContextMenu(this, oEvent);
-			}
-		} else if (KeyboardDelegate._isKeyCombination(oEvent, KeyCodes.SPACE)) {
+		if (KeyboardDelegate._isKeyCombination(oEvent, KeyCodes.SPACE)) {
 			handleSpaceAndEnter(this, oEvent);
 		} else if (KeyboardDelegate._isKeyCombination(oEvent, KeyCodes.SPACE, ModKey.SHIFT)) {
 			TableUtils.toggleRowSelection(this, oCellInfo.rowIndex);

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

@@ -668,7 +668,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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer
@@ -680,7 +680,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			this._delegate = ExtensionDelegate;
 
 			// Register the delegate
@@ -688,7 +688,6 @@ sap.ui.define([
 
 			oTable._iLastHoveredVisibleColumnIndex = 0;
 			oTable._bIsColumnResizerMoving = false;
-			oTable._iFirstReorderableIndex = sTableType === ExtensionBase.TABLETYPES.TREE ? 1 : 0;
 
 			return "PointerExtension";
 		},

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

@@ -2327,7 +2327,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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling
@@ -2338,7 +2338,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 * @returns {string} The name of this extension.
 		 */
-		_init: function(oTable, sTableType, mSettings) {
+		_init: function(oTable, mSettings) {
 			const _ = _private(oTable);
 
 			// Horizontal scrolling

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

@@ -27,7 +27,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.138.0
+	 * @version 1.139.1
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS