@openui5/sap.ui.table 1.93.3 → 1.96.2

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

@@ -94,7 +94,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -899,7 +899,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @name sap.ui.table.Table#getDragDropConfig
-	 * @returns sap.ui.core.dnd.DragDropBase[]
+	 * @returns {sap.ui.core.dnd.DragDropBase[]}
 	 * @function
 	 * @public
 	 * @since 1.52
@@ -971,8 +971,7 @@ sap.ui.define([
 		// text selection for column headers?
 		this._bAllowColumnHeaderTextSelection = false;
 
-		this._iPendingRequests = 0;
-		this._bPendingRequest = false; // Fallback in case a counter is not applicable.
+		_private(this).iPendingRequests = 0;
 		this._iBindingLength = null;
 
 		this._bFirstRendering = true;
@@ -1024,11 +1023,21 @@ sap.ui.define([
 		if (this._bExtensionsInitialized) {
 			return;
 		}
+
 		ExtensionBase.enrich(this, PointerExtension);
 		ExtensionBase.enrich(this, ScrollExtension);
 		ExtensionBase.enrich(this, KeyboardExtension);
 		ExtensionBase.enrich(this, AccExtension); // Must be registered after keyboard to reach correct delegate order
 		ExtensionBase.enrich(this, DragAndDropExtension);
+
+		if (Device.os.ios) {
+			sap.ui.require(["sap/ui/table/extensions/ScrollingIOS"], function(ScrollingIOSExtension) {
+				if (!this.bIsDestroyed) {
+					ExtensionBase.enrich(this, ScrollingIOSExtension);
+				}
+			}.bind(this));
+		}
+
 		this._bExtensionsInitialized = true;
 	};
 
@@ -1043,8 +1052,7 @@ sap.ui.define([
 		this._cleanUpTimers();
 		this._detachEvents();
 		TableUtils.Menu.cleanupDefaultContentCellContextMenu(this);
-		clearTimeout(this._dataReceivedHandlerId);
-		delete this._dataReceivedHandlerId;
+		clearHideBusyIndicatorTimeout(this);
 		delete this._aTableHeaders;
 	};
 
@@ -1101,7 +1109,7 @@ sap.ui.define([
 		var bLangChanged = oChanges.hasOwnProperty("language");
 		this._adaptLocalization(bRtlChanged, bLangChanged).then(function() {
 			this.invalidate();
-		}.bind(this));
+		}.bind(this)).catch(function() {});
 	};
 
 	/**
@@ -1543,11 +1551,6 @@ sap.ui.define([
 			});
 		}, this);
 
-		var oScrollExtension = this._getScrollExtension();
-		oScrollExtension.updateHorizontalScrollbar(oTableSizes);
-		oScrollExtension.updateVerticalScrollbarPosition();
-		oScrollExtension.updateVerticalScrollbarVisibility();
-
 		var $this = this.$();
 
 		if (TableUtils.hasRowActions(this) || TableUtils.hasRowNavigationIndicators(this)) {
@@ -1564,7 +1567,10 @@ sap.ui.define([
 					}
 					return iColumnsWidth;
 				}.bind(this), 0);
-				var bDummyColumnHasWidth = iTableWidth > iColumnsWidth;
+				var bDummyColumnHasWidth = iTableWidth > iColumnsWidth + 1;
+				// when the column widths contain subpixels, iTableWidth might be higher than iColumnsWidth
+				// for just a fraction of a pixel even though no dummy column is needed. To avoid left positioning
+				// of the row actions instead of absolute right, the calculation is adjusted with +1 pixel.
 
 				if (!bHasFlexibleRowActions && bDummyColumnHasWidth) {
 					var iRowActionPos = iColumnsWidth + oTableSizes.tableRowHdrScrWidth + oTableSizes.tableCtrlFixedWidth;
@@ -1589,12 +1595,14 @@ sap.ui.define([
 		TableUtils.Hook.call(this, Hook.UpdateSizes, sReason);
 	};
 
+	/*
+	 * @see JSDoc generated by SAPUI5 control
+	 */
 	Table.prototype.setShowOverlay = function(bShow) {
-		bShow = !!bShow;
 		this.setProperty("showOverlay", bShow, true);
 
 		if (this.getDomRef()) {
-			this.$().toggleClass("sapUiTableOverlay", bShow);
+			this.$().toggleClass("sapUiTableOverlay", this.getShowOverlay());
 			this._getAccExtension().updateAriaStateForOverlayAndNoData();
 			this._getKeyboardExtension().updateNoDataAndOverlayFocus();
 		}
@@ -1908,6 +1916,7 @@ sap.ui.define([
 		resetBindingFlags(this);
 		this._bRowsBeingBound = true;
 		destroyVirtualRow(this);
+		updateAutomaticBusyIndicator(this);
 
 		// Temporary fix for the Support Assistant hacks. Support Assistant should implement a selection plugin.
 		// TODO: Before we recommend to implement a selection plugin -> Complete BLI CPOUIFTEAMB-1464
@@ -1924,10 +1933,6 @@ sap.ui.define([
 		//Table._addBindingListener(oBindingInfo, "dataRequested", this._onBindingDataRequested, this);
 		//Table._addBindingListener(oBindingInfo, "dataReceived", this._onBindingDataReceived, this);
 
-		if (this.getEnableBusyIndicator()) {
-			this.setBusy(false);
-		}
-
 		TableUtils.Hook.call(this, Hook.BindRows, oBindingInfo);
 		Control.prototype.bindAggregation.call(this, "rows", oBindingInfo);
 		this._bRowsBeingBound = false;
@@ -2007,13 +2012,13 @@ sap.ui.define([
 		}
 
 		resetBindingFlags(this);
+		updateAutomaticBusyIndicator(this);
 	};
 
 	function resetBindingFlags(oTable) {
 		oTable._bRowsBeingBound = false;
 		oTable._bContextsAvailable = false;
-		oTable._iPendingRequests = 0;
-		oTable._bPendingRequest = false;
+		_private(oTable).iPendingRequests = 0;
 		oTable._iBindingLength = null;
 	}
 
@@ -2347,8 +2352,13 @@ sap.ui.define([
 	Table.prototype._getRowContexts = function(iRequestLength, bSuppressAdjustToBindingLength, bSecondCall) {
 		var oBinding = this.getBinding();
 		var iRowCount = this.getRows().length;
+		var iThreshold = this.getThreshold();
 
 		iRequestLength = iRequestLength == null ? iRowCount : iRequestLength;
+
+		// If the threshold is not explicitly disabled by setting it to 0, the default threshold should be the number of rows.
+		iThreshold = iThreshold > 0 ? Math.max(iRequestLength, iThreshold) : 0;
+
 		iRequestLength = Math.max(iRequestLength, this._getRowMode().getMinRequestLength());
 
 		if (!oBinding || iRequestLength <= 0) {
@@ -2370,10 +2380,6 @@ sap.ui.define([
 		var iMergeOffsetScrollRows = 0;
 		var iMergeOffsetBottomRow = iLength;
 
-		// If the threshold is not explicitly disabled by setting it to 0, the default threshold should be the number of rows.
-		var iThreshold = this.getThreshold();
-		iThreshold = iThreshold ? Math.max(iRowCount, iThreshold) : 0;
-
 		// data can be requested with a single getContexts call if the fixed rows and the scrollable rows overlap.
 		var iStartIndex = iFirstRenderedRowIndex;
 
@@ -2444,20 +2450,12 @@ sap.ui.define([
 	 * @private
 	 */
 	Table.prototype._adjustToTotalRowCount = function() {
-		var oBinding = this.getBinding();
 		var iTotalRowCount = this._getTotalRowCount();
 
 		if (this._iBindingLength !== iTotalRowCount) {
 			this._iBindingLength = iTotalRowCount;
 			this._updateFixedBottomRows();
 			TableUtils.Hook.call(this, Hook.TotalRowCountChanged);
-
-			if (!oBinding || !TableUtils.hasPendingRequests(this)) {
-				// A client binding -or- an $expand filled list binding does not fire dataReceived events. Therefore we need to update the no data area here.
-				// When the binding has been removed, the table might not be completely re-rendered (just the content). But the cached binding
-				// length changes. In this case the no data area needs to be updated.
-				this._updateNoData();
-			}
 		}
 	};
 
@@ -2685,18 +2683,20 @@ sap.ui.define([
 	// =============================================================================
 
 	/**
-	 * Show or hide the no data container.
+	 * Show or hide the NoData container.
+	 *
+	 * @param {sap.ui.table.Table} oTable Instance of the table.
 	 * @private
 	 */
-	Table.prototype._updateNoData = function() {
-		if (!this.getDomRef()) {
-			return;
-		}
+	function updateNoData(oTable) {
+		var oDomRef = oTable.getDomRef();
 
-		this.$().toggleClass("sapUiTableEmpty", TableUtils.isNoDataVisible(this));
-		this._getAccExtension().updateAriaStateForOverlayAndNoData();
-		this._getKeyboardExtension().updateNoDataAndOverlayFocus();
-	};
+		if (oDomRef) {
+			oTable.getDomRef().classList.toggle("sapUiTableEmpty", TableUtils.isNoDataVisible(oTable));
+			oTable._getAccExtension().updateAriaStateForOverlayAndNoData();
+			oTable._getKeyboardExtension().updateNoDataAndOverlayFocus();
+		}
+	}
 
 	/*
 	 * @see JSDoc generated by SAPUI5 control API generator
@@ -3782,23 +3782,6 @@ sap.ui.define([
 		return TableUtils.BaseSize[sContentDensity];
 	};
 
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.setShowNoData = function(bShowNoData) {
-		var bSuppressInvalidate = true;
-
-		if (this.getShowNoData() && bShowNoData === false && this.getRows().length === 0) {
-			// If the NoData text is disabled, but there is no data, the table needs to be invalidated to make sure that empty rows are rendered.
-			bSuppressInvalidate = false;
-		}
-
-		this.setProperty("showNoData", bShowNoData, bSuppressInvalidate);
-		this._updateNoData();
-
-		return this;
-	};
-
 	/*
 	 * @see JSDoc generated by SAPUI5 control API generator
 	 */
@@ -3961,66 +3944,63 @@ sap.ui.define([
 	 */
 	Table.prototype.setEnableBusyIndicator = function(bValue) {
 		this.setProperty("enableBusyIndicator", bValue, true);
-		if (!bValue) {
+
+		if (this.getEnableBusyIndicator()) {
+			updateAutomaticBusyIndicator(this);
+		} else {
 			this.setBusy(false);
+			clearHideBusyIndicatorTimeout(this);
 		}
+
 		return this;
 	};
 
 	/**
-	 *
 	 * @private
 	 */
-	Table.prototype._onBindingDataRequested = function(oEvent) {
-		if (oEvent.getSource() != this.getBinding() || oEvent.getParameter("__simulateAsyncAnalyticalBinding")) {
-			return;
-		}
-
-		this._iPendingRequests++;
-		this._bPendingRequest = true;
-
-		var bCanUsePendingRequestsCounter = TableUtils.canUsePendingRequestsCounter(this);
-
-		if (this.getEnableBusyIndicator()
-			&& (bCanUsePendingRequestsCounter && this._iPendingRequests === 1
-				|| !bCanUsePendingRequestsCounter)) {
-			this.setBusy(true);
-		}
+	Table.prototype._onBindingDataRequested = function() {
+		_private(this).iPendingRequests++;
+		updateAutomaticBusyIndicator(this);
+	};
 
-		clearTimeout(this._dataReceivedHandlerId);
-		delete this._dataReceivedHandlerId;
+	/**
+	 * @private
+	 */
+	Table.prototype._onBindingDataReceived = function() {
+		_private(this).iPendingRequests--;
+		updateAutomaticBusyIndicator(this);
 	};
 
 	/**
-	 *
 	 * @private
 	 */
-	Table.prototype._onBindingDataReceived = function(oEvent) {
-		if (oEvent.getSource() != this.getBinding() || oEvent.getParameter("__simulateAsyncAnalyticalBinding")) {
+	Table.prototype._hasPendingRequests = function() {
+		return _private(this).iPendingRequests > 0;
+	};
+
+	function updateAutomaticBusyIndicator(oTable) {
+		if (!oTable.getEnableBusyIndicator()) {
 			return;
 		}
 
-		this._iPendingRequests--;
-		this._bPendingRequest = false;
+		clearHideBusyIndicatorTimeout(oTable);
 
-		// The AnalyticalBinding updates the length after it fires dataReceived, therefore the total row count will not change here. Later,
-		// when the contexts are retrieved in Table#_getRowContexts, the AnalyticalBinding updates the length and Table#_adjustToTotalRowCount
-		// will be called again and actually perform the update.
-		this._adjustToTotalRowCount();
-
-		if (!TableUtils.hasPendingRequests(this)) {
+		if (oTable._hasPendingRequests()) {
+			oTable.setBusy(true);
+		} else {
 			// This timer should avoid flickering of the busy indicator and unnecessary updates of NoData in case a request will be sent
 			// (dataRequested) immediately after the last response was received (dataReceived).
-			clearTimeout(this._dataReceivedHandlerId);
-			this._dataReceivedHandlerId = setTimeout(function() {
-				if (this.getEnableBusyIndicator()) {
-					this.setBusy(false);
-				}
-				this._updateNoData();
-				delete this._dataReceivedHandlerId;
-			}.bind(this), 0);
+			_private(oTable).hideBusyIndicatorTimeoutId = setTimeout(function() {
+				oTable.setBusy(false);
+				clearHideBusyIndicatorTimeout(oTable);
+			}, 0);
 		}
-	};
+	}
+
+	function clearHideBusyIndicatorTimeout(oTable) {
+		clearTimeout(_private(oTable).hideBusyIndicatorTimeoutId);
+		delete _private(oTable).hideBusyIndicatorTimeoutId;
+	}
 
 	/**
 	 * Lets you control in which situation the <code>Scrollbar</code> fires scroll events.
@@ -4366,6 +4346,7 @@ sap.ui.define([
 		TableUtils.Grouping.updateGroups(this);
 		this._getAccExtension()._updateAriaRowIndices();
 		this._updateSelection();
+		updateNoData(this);
 
 		// TODO: Move somewhere else. Row or GroupingUtils
 		this.getRows().forEach(function(oRow) {

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @since 1.21.1
 	 *
 	 * @constructor

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

@@ -5,9 +5,9 @@
  */
 
 //Provides default renderer for control sap.ui.table.Table
-sap.ui.define(['sap/ui/core/Control', 'sap/ui/core/theming/Parameters', 'sap/ui/Device', './library', "./Column", './utils/TableUtils', "./extensions/ExtensionBase",
+sap.ui.define(['sap/ui/core/Control', 'sap/ui/Device', './library', "./Column", './utils/TableUtils', "./extensions/ExtensionBase",
 			   'sap/ui/core/Renderer', 'sap/ui/core/IconPool', "sap/base/Log"],
-	function(Control, Parameters, Device, library, Column, TableUtils, ExtensionBase, Renderer, IconPool, Log) {
+	function(Control, Device, library, Column, TableUtils, ExtensionBase, Renderer, IconPool, Log) {
 	"use strict";
 
 
@@ -95,7 +95,7 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/core/theming/Parameters', 'sap/ui/
 			rm.class("sapUiTableRowNavIndicator");
 		}
 
-		if (TableUtils.isNoDataVisible(oTable) && !TableUtils.hasPendingRequests(oTable)) {
+		if (TableUtils.isNoDataVisible(oTable) && !oTable._hasPendingRequests()) {
 			rm.class("sapUiTableEmpty"); // no data!
 		}
 
@@ -1242,10 +1242,16 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/core/theming/Parameters', 'sap/ui/
 
 	TableRenderer.renderVSbExternal = function(rm, oTable) {
 		if (ExtensionBase.isEnrichedWith(oTable, "sap.ui.table.extensions.Synchronization")) {
+			rm.openStart("div");
+			rm.style("position", "relative");
+			rm.openEnd();
+
 			this.renderVSb(rm, oTable, {
 				cssClass: "sapUiTableVSbExternal",
 				tabIndex: false
 			});
+
+			rm.close("div");
 		} else {
 			Log.error("This method can only be used with synchronization enabled.", oTable, "TableRenderer.renderVSbExternal");
 		}

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

@@ -29,6 +29,8 @@ sap.ui.define([
 	) {
 	"use strict";
 
+	var _private = TableUtils.createWeakMapFacade();
+
 	/**
 	 * Constructor for a new TreeTable.
 	 *
@@ -38,7 +40,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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -159,6 +161,9 @@ sap.ui.define([
 	 */
 	TreeTable.prototype.init = function() {
 		Table.prototype.init.apply(this, arguments);
+
+		_private(this).bPendingRequest = false;
+
 		TableUtils.Grouping.setToDefaultTreeMode(this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.UpdateState, updateRowState, this);
 		TableUtils.Hook.register(this, TableUtils.Hook.Keys.Row.Expand, expandRow, this);
@@ -166,6 +171,8 @@ sap.ui.define([
 	};
 
 	TreeTable.prototype._bindRows = function(oBindingInfo) {
+		_private(this).bPendingRequest = false;
+
 		if (!oBindingInfo.parameters) {
 			oBindingInfo.parameters = {};
 		}
@@ -690,6 +697,24 @@ sap.ui.define([
 		return new BindingSelectionPlugin();
 	};
 
-	return TreeTable;
+	// If the ODataTreeBindingFlat adapter is applied to the TreeBinding, the adapter fires a dataRequested event on every call of getNodes,
+	// even if no request is sent. This can happen if the adapter ignores the request, because it finds out there is a pending request which
+	// covers it. When a request is ignored, no dataReceived event is fired.
+	// Therefore, a more limited method using a flag has to be used instead of a counter.
+
+	TreeTable.prototype._onBindingDataRequested = function(oEvent) {
+		_private(this).bPendingRequest = true;
+		Table.prototype._onBindingDataRequested.apply(this, arguments);
+	};
+
+	TreeTable.prototype._onBindingDataReceived = function(oEvent) {
+		_private(this).bPendingRequest = false;
+		Table.prototype._onBindingDataReceived.apply(this, arguments);
+	};
 
+	TreeTable.prototype._hasPendingRequests = function() {
+		return _private(this).bPendingRequest;
+	};
+
+	return TreeTable;
 });

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

@@ -239,6 +239,33 @@ sap.ui.define([
 			return null;
 		},
 
+		/**
+		 * Gets the aria-relevant numbers of columns and rows in the table, taking into account virtualization and internal columns like the row
+		 * action column.
+		 *
+		 * @returns {{columnCount: int, rowCount: int}}
+		 */
+		getGridSize: function(oTable) {
+			var bHasRowHeader = TableUtils.hasRowHeader(oTable);
+			var bHasRowActions = TableUtils.hasRowActions(oTable);
+			var iColumnCount = TableUtils.getVisibleColumnCount(oTable) + (bHasRowHeader ? 1 : 0) + (bHasRowActions ? 1 : 0);
+			var iContentRowCount = TableUtils.isNoDataVisible(oTable) ? 0 : Math.max(oTable._getTotalRowCount(), oTable._getRowCounts().count);
+
+			return {
+				columnCount: iColumnCount,
+				rowCount: TableUtils.getHeaderRowCount(oTable) + iContentRowCount
+			};
+		},
+
+		/**
+		 * Gets the aria-relevant index of a row, taking into account virtualization and the number of header rows.
+		 *
+		 * @returns {int}
+		 */
+		getRowIndex: function(oRow) {
+			return oRow.getIndex() + 1 + TableUtils.getHeaderRowCount(oRow.getTable());
+		},
+
 		/*
 		 * Determines the current row and column and updates the hidden description texts of the table accordingly.
 		 */
@@ -248,25 +275,21 @@ sap.ui.define([
 				bIsRowChanged = false,
 				bIsColChanged = false,
 				bIsInitial = false,
-				bHasRowHeader = TableUtils.hasRowHeader(oTable),
-				bHasRowActions = TableUtils.hasRowActions(oTable);
+				bHasRowHeader = TableUtils.hasRowHeader(oTable);
 
 			if (oIN) {
 				// +1 -> we want to announce a count and not the index, the action column is handled like a normal column
 				var iColumnNumber = ExtensionHelper.getColumnIndexOfFocusedCell(oExtension) + 1 + (bHasRowHeader ? 1 : 0);
-				// same here + take virtualization into account
-				var iRowNumber = TableUtils.getRowIndexOfFocusedCell(oTable) + oTable._getFirstRenderedRowIndex() + 1;
-				var iColCount = TableUtils.getVisibleColumnCount(oTable) + (bHasRowHeader ? 1 : 0) + (bHasRowActions ? 1 : 0);
-				var iRowCount = TableUtils.isNoDataVisible(oTable) ? 0 : Math.max(oTable._getTotalRowCount(), oTable._getRowCounts().count);
+				var oRow = oTable.getRows()[TableUtils.getRowIndexOfFocusedCell(oTable)];
+				var iRowNumber = oRow ? ExtensionHelper.getRowIndex(oRow) : 0;
+				var mGridSize = ExtensionHelper.getGridSize(oTable);
 
-				bIsRowChanged = oExtension._iLastRowNumber != iRowNumber || (oExtension._iLastRowNumber == iRowNumber
-																			 && oExtension._iLastColumnNumber == iColumnNumber);
+				bIsRowChanged = oExtension._iLastRowNumber != iRowNumber || (oExtension._iLastRowNumber == iRowNumber && oExtension._iLastColumnNumber == iColumnNumber);
 				bIsColChanged = oExtension._iLastColumnNumber != iColumnNumber;
 				bIsInitial = oExtension._iLastRowNumber == null && oExtension._iLastColumnNumber == null;
-
-				oTable.$("rownumberofrows").text(bIsRowChanged && iRowNumber > 0 ? TableUtils.getResourceText("TBL_ROW_ROWCOUNT", [iRowNumber, iRowCount]) : " ");
-				oTable.$("colnumberofcols").text(bIsColChanged ? TableUtils.getResourceText("TBL_COL_COLCOUNT", [iColumnNumber, iColCount]) : " ");
-				oTable.$("ariacount").text(bIsInitial ? TableUtils.getResourceText("TBL_DATA_ROWS_COLS", [iRowCount, iColCount]) : " ");
+				oTable.$("rownumberofrows").text(bIsRowChanged && iRowNumber > 0 ? TableUtils.getResourceText("TBL_ROW_ROWCOUNT", [iRowNumber, mGridSize.rowCount]) : " ");
+				oTable.$("colnumberofcols").text(bIsColChanged ? TableUtils.getResourceText("TBL_COL_COLCOUNT", [iColumnNumber, mGridSize.columnCount]) : " ");
+				oTable.$("ariacount").text(bIsInitial ? TableUtils.getResourceText("TBL_DATA_ROWS_COLS", [mGridSize.rowCount, mGridSize.columnCount]) : " ");
 
 				oExtension._iLastRowNumber = iRowNumber;
 				oExtension._iLastColumnNumber = iColumnNumber;
@@ -689,12 +712,8 @@ sap.ui.define([
 					mAttributes["role"] = "gridcell";
 					mAttributes["aria-colindex"] = mParams.index + 1 + (TableUtils.hasRowHeader(oTable) ? 1 : 0);
 
-					var aLabels = [],
-						oColumn = mParams && mParams.column ? mParams.column : null;
-
-					if (oColumn) {
-						aLabels = ExtensionHelper.getRelevantColumnHeaders(oTable, oColumn);
-						mAttributes["headers"] = aLabels.join(" ");
+					if (mParams.column) {
+						var aLabels = ExtensionHelper.getRelevantColumnHeaders(oTable, mParams.column);
 
 						for (var i = 0; i < aLabels.length; i++) {
 							aLabels[i] = aLabels[i] + "-inner";
@@ -703,9 +722,9 @@ sap.ui.define([
 						if (mParams && mParams.fixed) {
 							aLabels.push(sTableId + "-ariafixedcolumn");
 						}
-					}
 
-					mAttributes["aria-labelledby"] = aLabels;
+						mAttributes["aria-labelledby"] = aLabels;
+					}
 					break;
 
 				case AccExtension.ELEMENTTYPES.ROOT: //The tables root dom element
@@ -717,7 +736,6 @@ sap.ui.define([
 					break;
 
 				case AccExtension.ELEMENTTYPES.CONTAINER: //The table container
-					mAttributes["role"] = "application";
 					break;
 
 				case AccExtension.ELEMENTTYPES.CONTENT: //The content area of the table which contains all the table elements, rowheaders, columnheaders, etc
@@ -738,6 +756,7 @@ sap.ui.define([
 					var bHasFixedBottomRows = mRowCounts.fixedBottom > 0;
 					var bHasRowHeader = TableUtils.hasRowHeader(oTable);
 					var bHasRowActions = TableUtils.hasRowActions(oTable);
+					var mGridSize = ExtensionHelper.getGridSize(oTable);
 
 					mAttributes["aria-owns"] = [sTableId + "-table"];
 					if (bHasFixedColumns) {
@@ -762,8 +781,8 @@ sap.ui.define([
 						mAttributes["aria-owns"].push(sTableId + "-sapUiTableRowActionScr");
 					}
 
-					mAttributes["aria-rowcount"] = oTable._getTotalRowCount();
-					mAttributes["aria-colcount"] = oTable._getVisibleColumns().length + (bHasRowHeader ? 1 : 0) + (bHasRowActions ? 1 : 0);
+					mAttributes["aria-rowcount"] = mGridSize.rowCount;
+					mAttributes["aria-colcount"] = mGridSize.columnCount;
 
 					if (oTable.isA("sap.ui.table.AnalyticalTable")) {
 						mAttributes["aria-roledescription"] = TableUtils.getResourceText("TBL_ANALYTICAL_TABLE_ROLE_DESCRIPTION");
@@ -883,7 +902,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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility
@@ -1060,7 +1079,7 @@ sap.ui.define([
 
 		for (i = 0; i < aRows.length; i++) {
 			oRow = aRows[i];
-			oRow.getDomRefs(true).row.attr("aria-rowindex", oRow.getIndex() + 1);
+			oRow.getDomRefs(true).row.attr("aria-rowindex", ExtensionHelper.getRowIndex(oRow));
 		}
 	};
 
@@ -1073,7 +1092,7 @@ sap.ui.define([
 		var $Table = oTable.$("sapUiTableGridCnt");
 
 		if ($Table) {
-			$Table.attr("aria-rowcount", oTable._getTotalRowCount());
+			$Table.attr("aria-rowcount", ExtensionHelper.getGridSize(oTable).rowCount);
 		}
 	};
 

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

@@ -42,7 +42,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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender

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

@@ -244,7 +244,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase