@openui5/sap.ui.table 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 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.1.34
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.94.0",
+  "version": "1.97.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.94.0",
-    "@openui5/sap.ui.unified": "1.94.0"
+    "@openui5/sap.ui.core": "1.97.0",
+    "@openui5/sap.ui.unified": "1.97.0"
   }
 }

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

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

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -23,7 +23,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 	 * @extends sap.ui.table.ColumnMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @see http://scn.sap.com/docs/DOC-44986
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -423,8 +423,8 @@ sap.ui.define([
 			if (this._aGroupedColumns.indexOf(oColumn.getId()) > -1) {
 				continue;
 			}
-			// eslint-disable-next-line no-unsafe-negation
-			if (!oColumn instanceof AnalyticalColumn) {
+
+			if (!(oColumn instanceof AnalyticalColumn)) {
 				Log.error("You have to use AnalyticalColumns for the Analytical table");
 			}
 
@@ -1146,7 +1146,7 @@ sap.ui.define([
 	 * Invisible nodes (collapsed child nodes) will not be taken into account.
 	 *
 	 * Please also take notice of the fact, that "addSelectionInterval" does not change any other selection.
-	 * To override the current selection, please use "setSelctionInterval" or for a single entry use "setSelectedIndex".
+	 * To override the current selection, please use "setSelectionInterval" or for a single entry use "setSelectedIndex".
 	 *
 	 * @param {int} iFromIndex The starting index of the range which will be selected.
 	 * @param {int} iToIndex The starting index of the range which will be selected.

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

@@ -70,7 +70,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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -357,6 +357,8 @@ sap.ui.define([
 
 		_private(this).oSorter = null;
 		_private(this).mCellContentVisibilitySettings = normalizeCellContentVisibilitySettings(this);
+		_private(this).bHasDefaultLabel = false;
+		_private(this).bHasDefaultTemplate = false;
 
 		// for performance reasons, the cloned column templates shall be stored for later reuse
 		this._initTemplateClonePool();
@@ -436,11 +438,20 @@ sap.ui.define([
 	 */
 	Column.prototype.setLabel = function(vLabel) {
 		var oLabel = vLabel;
-		if (typeof (vLabel) === "string") {
+
+		if (typeof vLabel === "string") {
+			if (_private(this).bHasDefaultLabel) {
+				this.getLabel().setText(vLabel);
+				return this;
+			}
 			oLabel = library.TableHelper.createLabel({text: vLabel});
+			_private(this).bHasDefaultLabel = true;
+		} else if (_private(this).bHasDefaultLabel) {
+			this.destroyLabel();
+			_private(this).bHasDefaultLabel = false;
 		}
-		this.setAggregation("label", oLabel);
-		return this;
+
+		return this.setAggregation("label", oLabel);
 	};
 
 	/*
@@ -450,12 +461,24 @@ sap.ui.define([
 		var oTemplate = vTemplate;
 		var oTable = this._getTable();
 		var oOldTemplate = this.getTemplate();
+		var bNewTemplate = true;
 
 		if (typeof vTemplate === "string") {
-			oTemplate = library.TableHelper.createTextView().bindProperty("text", vTemplate);
+			if (_private(this).bHasDefaulTemplate) {
+				this.getTemplate().bindProperty("text", vTemplate);
+				bNewTemplate = false;
+			} else {
+				oTemplate = library.TableHelper.createTextView().bindProperty("text", vTemplate);
+				_private(this).bHasDefaulTemplate = true;
+			}
+		} else if (_private(this).bHasDefaulTemplate) {
+			this.destroyTemplate();
+			_private(this).bHasDefaulTemplate = false;
 		}
 
-		this.setAggregation("template", oTemplate, true);
+		if (bNewTemplate) {
+			this.setAggregation("template", oTemplate, true);
+		}
 
 		// manually invalidate the Column (because of the invalidate decoupling to
 		// prevent invalidations from the databinding part)

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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -510,6 +510,8 @@ sap.ui.define([
 			aSubmenuItems = oSubmenu.getItems();
 			aSubmenuItems[i].setProperty("icon", sIcon);
 			aSubmenuItems[i].setEnabled(!bVisible || aVisibleColumns.length > 1);
+			aSubmenuItems[i].removeAllAriaLabelledBy();
+			aSubmenuItems[i].addAriaLabelledBy(oTable.getId() + (bVisible ? "-ariahidecolmenu" : "-ariashowcolmenu"));
 		}
 
 		for (var i = aSubmenuItems.length; i > aColumns.length; i--) {

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.94.0
+	 * @version 1.97.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.94.0
+	 * @version 1.97.0
 	 *
 	 * @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.94.0
+	 * @version 1.97.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.94.0
+	 * @version 1.97.0
 	 * @since 1.45
 	 *
 	 * @constructor

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

@@ -24,7 +24,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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -55,7 +55,8 @@ sap.ui.define([
 				highlight : {type : "string", group : "Appearance", defaultValue : "None"},
 
 				/**
-				 * Defines the semantics of the {@link sap.ui.table.RowSettings#setHighlight highlight} property for accessibility purposes.
+				 * Defines the semantics of the {@link sap.ui.table.RowSettings#setHighlight highlight} property for accessibility purposes. It is
+				 * only used as an invisible text for screen reader support and does not add a tooltip to the highlight.
 				 *
 				 * @since 1.62
 				 */

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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -1109,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() {});
 	};
 
 	/**
@@ -1551,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)) {
@@ -2357,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) {
@@ -2380,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;
 

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @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";
 
 

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

@@ -40,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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -528,7 +528,7 @@ sap.ui.define([
 	 * Invisible nodes (collapsed child nodes) will not be regarded.
 	 *
 	 * Please also take notice of the fact, that "addSelectionInterval" does not change any other selection.
-	 * To override the current selection, please use "setSelctionInterval" or for a single entry use "setSelectedIndex".
+	 * To override the current selection, please use "setSelectionInterval" or for a single entry use "setSelectedIndex".
 	 *
 	 * @param {int} iIndexFrom Index from which the selection should start
 	 * @param {int} iIndexTo Index up to which to select

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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase