@openui5/sap.ui.table 1.96.24 → 1.96.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.96.24",
+  "version": "1.96.25",
   "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.96.24",
-    "@openui5/sap.ui.unified": "1.96.24"
+    "@openui5/sap.ui.core": "1.96.25",
+    "@openui5/sap.ui.unified": "1.96.25"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.24</version>
+  <version>1.96.25</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.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @constructor
 	 * @public
@@ -298,19 +298,11 @@ sap.ui.define([
 		return oModel;
 	};
 
-	/**
-	 * handler for change events of the binding
-	 * @param {sap.ui.base.Event} oEvent change event
-	 * @private
-	 */
-	AnalyticalTable.prototype._onBindingChange = function(oEvent) {
-		Table.prototype._onBindingChange.apply(this, arguments);
-		// the column menus have to be invalidated when the amount
-		// of data changes in the Table; this happens on normal changes
-		// of the Table as well as when filtering
-		var sReason = typeof (oEvent) === "object" ? oEvent.getParameter("reason") : oEvent;
+	AnalyticalTable.prototype.updateRows = function(sReason) {
+		Table.prototype.updateRows.apply(this, arguments);
+
 		if (sReason !== "sort") {
-			this._invalidateColumnMenus();
+			this._invalidateColumnMenus(); // TODO: Is this needed?
 		}
 	};
 

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.96.24
+	 * @version 1.96.25
 	 *
 	 * @constructor
 	 * @public

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * The column menu provides all common actions that can be performed on a column.
 	 * @extends sap.ui.unified.Menu
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @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.96.24
+	 * @version 1.96.25
 	 * @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.96.24
+	 * @version 1.96.25
 	 *
 	 * @constructor
 	 * @public

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.96.24
+	 * @version 1.96.25
 	 *
 	 * @constructor
 	 * @public
@@ -1430,6 +1430,7 @@ sap.ui.define([
 		}
 
 		this._updateTableSizes(TableUtils.RowsUpdateReason.Render, true);
+		this._adjustFirstVisibleRowToTotalRowCount(); // The number of rendered rows might have changed.
 		TableUtils.registerResizeHandler(this, "Table", this._onTableResize.bind(this));
 
 		this._bFirstRendering = false;
@@ -2086,13 +2087,7 @@ sap.ui.define([
 	 * @param {sap.ui.base.Event} oEvent change event
 	 * @private
 	 */
-	Table.prototype._onBindingChange = function(oEvent) {
-		var sReason = oEvent.getParameter("reason");
-
-		if (sReason === ChangeReason.Sort || sReason === ChangeReason.Filter) {
-			this.setFirstVisibleRow(0);
-		}
-	};
+	Table.prototype._onBindingChange = function(oEvent) {};
 
 	/*
 	 * @see JSDoc generated by SAPUI5 control API generator
@@ -2349,101 +2344,53 @@ sap.ui.define([
 	 * @returns {Object[]} Array of row contexts returned from the binding.
 	 * @private
 	 */
-	Table.prototype._getRowContexts = function(iRequestLength, bSuppressAdjustToBindingLength, bSecondCall) {
+	Table.prototype._getRowContexts = function(iRequestLength) {
 		var oBinding = this.getBinding();
-		var iRowCount = this.getRows().length;
+		var mRowCounts = this._getRowCounts();
 		var iThreshold = this.getThreshold();
 
-		iRequestLength = iRequestLength == null ? iRowCount : iRequestLength;
+		iRequestLength = iRequestLength == null ? mRowCounts.count : 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;
+		// If the threshold is not explicitly disabled by setting it to 0, the threshold should be at least the number of scrollable rows.
+		if (iThreshold !== 0) {
+			iThreshold = Math.max(iRequestLength - mRowCounts.fixedTop - mRowCounts.fixedBottom, iThreshold);
+		}
 
-		iRequestLength = Math.max(iRequestLength, this._getRowMode().getMinRequestLength());
+		iRequestLength = Math.max(iRequestLength, this._getRowMode().getMinRequestLength(), 0);
 
-		if (!oBinding || iRequestLength <= 0) {
-			// Without binding there are no contexts to be retrieved.
+		if (!oBinding || iRequestLength === 0) {
 			return [];
 		}
 
-		bSuppressAdjustToBindingLength = bSuppressAdjustToBindingLength === true;
-		bSecondCall = bSecondCall === true;
+		// Data can be requested with a single getContexts call if the fixed and the scrollable rows overlap.
+		// Because of the AnalyticalTable, the fixed bottom rows can only be requested separately.
 
 		var iFirstRenderedRowIndex = this._getFirstRenderedRowIndex();
-		var mRowCounts = this._getRowCounts();
 		var aContexts = [];
-		var aTmpContexts;
-
-		// because of the analytical table the fixed bottom row must always be requested separately as it is the grand
-		// total row for the table.
-		var iLength = iRequestLength - mRowCounts.fixedBottom;
-		var iMergeOffsetScrollRows = 0;
-		var iMergeOffsetBottomRow = iLength;
-
-		// data can be requested with a single getContexts call if the fixed rows and the scrollable rows overlap.
-		var iStartIndex = iFirstRenderedRowIndex;
-
-		var fnMergeArrays = function(aTarget, aSource, iStartIndex) {
-			for (var i = 0; i < aSource.length; i++) {
-				aTarget[iStartIndex + i] = aSource[i];
-			}
-		};
 
 		if (mRowCounts.fixedTop > 0 && iFirstRenderedRowIndex > 0) {
-			// since there is a gap between first visible row and fixed rows it must be requested separately
-			// the first visible row always starts counting with 0 in the scroll part of the table no matter
-			// how many fixed rows there are.
-			iStartIndex = iFirstRenderedRowIndex + mRowCounts.fixedTop;
-			// length must be reduced by number of fixed rows since they were just requested separately
-			iLength -= mRowCounts.fixedTop;
-			iMergeOffsetScrollRows = mRowCounts.fixedTop;
-			// retrieve fixed rows separately
-			aTmpContexts = this._getFixedRowContexts();
-			aContexts = aContexts.concat(aTmpContexts);
-		}
-
-		// request scroll part contexts but may include fixed rows depending on scroll and length settings
-		// if this is done before requesting fixed bottom rows, it saves some performance for the analytical table
-		// since the tree gets only build once (as result of getContexts call). If first the fixed bottom row would
-		// be requested the analytical binding would build the tree twice.
-		aTmpContexts = this._getContexts(iStartIndex, iLength, iThreshold);
-
-		if (!bSuppressAdjustToBindingLength) {
-			this._adjustToTotalRowCount();
+			// If there is a gap between the first visible row and fixed top rows, the fixed top rows need to be requested separately.
+			// The first visible row always starts at index 0 in the scrollable part, no matter how many fixed top rows there are.
+			mergeContextArrays(aContexts, this._getFixedRowContexts(), 0);
+			mergeContextArrays(aContexts, this._getContexts(iFirstRenderedRowIndex + mRowCounts.fixedTop, iRequestLength - mRowCounts.fixedBottom - mRowCounts.fixedTop, iThreshold), mRowCounts.fixedTop);
+		} else {
+			mergeContextArrays(aContexts, this._getContexts(iFirstRenderedRowIndex, iRequestLength - mRowCounts.fixedBottom, iThreshold), 0);
 		}
 
-		var iTotalRowCount = this._getTotalRowCount();
-
-		// get the binding length after getContext call to make sure that for TreeBindings the client tree was correctly rebuilt
-		// this step can be moved to an earlier point when the TreeBindingAdapters all implement tree invalidation in case of getLength calls
-		fnMergeArrays(aContexts, aTmpContexts, iMergeOffsetScrollRows);
-
-		// request binding length after getContexts call to make sure that in case of tree binding and analytical binding
-		// the tree gets only built once (by getContexts call).
-		iMergeOffsetBottomRow = Math.min(iMergeOffsetBottomRow, Math.max(iTotalRowCount - mRowCounts.fixedBottom, 0));
 		if (mRowCounts.fixedBottom > 0) {
-			// retrieve fixed bottom rows separately
-			// instead of just concatenating them to the existing contexts it must be made sure that they are put
-			// to the correct row index otherwise they would flip into the scroll area in case data gets requested for
-			// the scroll part.
-			aTmpContexts = this._getFixedBottomRowContexts();
-			fnMergeArrays(aContexts, aTmpContexts, iMergeOffsetBottomRow);
-		}
-
-		// If the Binding#getContexts call triggers recalculation of the binding length, the first visible row index needs to be corrected and a new
-		// context range needs to be requested.
-
-		var iMaxRowIndex = this._getMaxFirstRenderedRowIndex();
-		if (iMaxRowIndex < iFirstRenderedRowIndex && this._bContextsAvailable && !bSecondCall) {
-			this._setFirstVisibleRowIndex(this.getFirstVisibleRow(), {
-				onlySetProperty: true
-			});
-			aContexts = this._getRowContexts(iRequestLength, bSuppressAdjustToBindingLength, true);
+			mergeContextArrays(aContexts, this._getFixedBottomRowContexts(),
+				Math.min(mRowCounts.fixedTop + mRowCounts.scrollable, Math.max(this._getTotalRowCount() - mRowCounts.fixedBottom, 0)));
 		}
 
 		return aContexts;
 	};
 
+	function mergeContextArrays(aTarget, aSource, iStartIndex) {
+		for (var i = 0; i < aSource.length; i++) {
+			aTarget[iStartIndex + i] = aSource[i];
+		}
+	}
+
 	/**
 	 * Updates the UI according to the current total row count.
 	 *
@@ -2455,10 +2402,20 @@ sap.ui.define([
 		if (this._iBindingLength !== iTotalRowCount) {
 			this._iBindingLength = iTotalRowCount;
 			this._updateFixedBottomRows();
+			this._adjustFirstVisibleRowToTotalRowCount();
 			TableUtils.Hook.call(this, Hook.TotalRowCountChanged);
 		}
 	};
 
+	Table.prototype._adjustFirstVisibleRowToTotalRowCount = function() {
+		var iCurrentIndex = this.getFirstVisibleRow();
+		var iMaxIndex = this._getMaxFirstVisibleRowIndex();
+
+		if (iMaxIndex < iCurrentIndex && this._bContextsAvailable) {
+			this._setFirstVisibleRowIndex(iMaxIndex, {onlySetProperty: true});
+		}
+	};
+
 	/**
 	 * Notifies about a binding refresh - called internally by the <code>ManagedObject</code> when the binding fires a "refresh" event.
 	 * Only relevant for server-side bindings. The table is expected to call <code>Binding#getContexts</code>, which triggers a data request. The
@@ -2504,6 +2461,12 @@ sap.ui.define([
 		}
 
 		this._bContextsAvailable = true;
+
+		if (sReason === ChangeReason.Sort || sReason === ChangeReason.Filter) {
+			this.setFirstVisibleRow(0);
+		}
+
+		this._adjustToTotalRowCount();
 		triggerRowsUpdate(this, sReason);
 	};
 

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

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

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.96.24
+	 * @version 1.96.25
 	 *
 	 * @constructor
 	 * @public
@@ -376,17 +376,33 @@ sap.ui.define([
 		}
 	};
 
-	TreeTable.prototype._getRowContexts = function() {
-		var iOldTotalRowCount = this._getTotalRowCount();
-		var aRowContexts = Table.prototype._getRowContexts.apply(this, arguments);
-		var iNewTotalRowCount = this._getTotalRowCount();
+	TreeTable.prototype._getRowContexts = function(iRequestLength) {
+		return getRowContexts(this, iRequestLength);
+	};
+
+	function getRowContexts(oTable, iRequestLength, bSecondCall) {
+		var iOldTotalRowCount = oTable._getTotalRowCount();
+		var aRowContexts = Table.prototype._getRowContexts.call(oTable, iRequestLength);
+
+		if (bSecondCall === true) {
+			return aRowContexts;
+		}
 
-		if (TableUtils.isVariableRowHeightEnabled(this) && iOldTotalRowCount !== iNewTotalRowCount) {
-			return Table.prototype._getRowContexts.apply(this, arguments);
+		var iNewTotalRowCount = oTable._getTotalRowCount();
+		var iFirstVisibleRow = oTable._getFirstRenderedRowIndex();
+		var iMaxRowIndex = oTable._getMaxFirstRenderedRowIndex();
+
+		oTable._adjustToTotalRowCount();
+
+		if (iMaxRowIndex < iFirstVisibleRow && oTable._bContextsAvailable) {
+			// Get the contexts again, this time with the maximum possible value for the first visible row.
+			aRowContexts = getRowContexts(oTable, iRequestLength, true);
+		} else if (iOldTotalRowCount !== iNewTotalRowCount) {
+			aRowContexts = getRowContexts(oTable, iRequestLength, true);
 		}
 
 		return aRowContexts;
-	};
+	}
 
 	TreeTable.prototype._onGroupHeaderChanged = function(iRowIndex, bExpanded) {
 		this.fireToggleOpenState({

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

@@ -902,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.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility

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

@@ -28,6 +28,8 @@ sap.ui.define([
 		oRm.openEnd();
 		if (sText) {
 			oRm.text(sText);
+		} else {
+			oRm.text("-"); // This is a workaround for a Chrome bug, BCP: 2370127818
 		}
 		oRm.close("span");
 	};
@@ -42,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.96.24
+	 * @version 1.96.25
 	 * @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.96.24
+	 * @version 1.96.25
 	 * @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.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase

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

@@ -267,7 +267,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.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate

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

@@ -792,7 +792,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.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

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

@@ -1869,6 +1869,13 @@ sap.ui.define([
 
 			} else if (!bHorizontalScrolling && (mOptions.scrollDirection === ScrollDirection.VERTICAL
 												 || mOptions.scrollDirection === ScrollDirection.BOTH)) {
+				if (oEvent.target instanceof window.HTMLTextAreaElement) {
+					var oTextAreaRef = oEvent.target;
+					if (oTextAreaRef.clientHeight < oTextAreaRef.scrollHeight) {
+						return;
+					}
+				}
+
 				var oVSb = oScrollExtension.getVerticalScrollbar();
 				var oVerticalScrollPosition = _private(this).oVerticalScrollPosition;
 
@@ -2291,7 +2298,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.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles the scrollbar on iOS.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

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

@@ -143,7 +143,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table that allows synchronization with a table.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization

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

@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : "sap.ui.table",
-		version: "1.96.24",
+		version: "1.96.25",
 		dependencies : ["sap.ui.core","sap.ui.unified"],
 		designtime: "sap/ui/table/designtime/library.designtime",
 		types: [
@@ -74,7 +74,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	 * @namespace
 	 * @alias sap.ui.table
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @since 0.8
 	 * @public
 	 */
@@ -83,7 +83,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -111,7 +111,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Row Action types.
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -142,7 +142,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Selection behavior of the table
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -173,7 +173,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Selection mode of the table
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -211,7 +211,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Sort order of a column
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -236,7 +236,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * VisibleRowCountMode of the table
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -268,7 +268,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	 *
 	 * Contains IDs of shared DOM references, which should be accessible to inheriting controls via getDomRef() function.
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @enum {string}
 	 * @public
 	 */
@@ -366,7 +366,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	 *
 	 * This is an alias for {@link sap.ui.model.TreeAutoExpandMode} and kept for compatibility reasons.
 	 *
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @typedef {sap.ui.model.TreeAutoExpandMode}
 	 * @public
 	 */

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

@@ -1,122 +1,197 @@
+#This is the resource bundle for the sap.ui.table library
+#
 
+#XMIT: Menuitem to filter
 TBL_FILTER=Filter
+#XMIT: Menuitem to e.g. open a filter dialog
 TBL_FILTER_ITEM=Filter...
+#XMIT: Menuitem to sort descending
 TBL_SORT_ASC=Sort Ascending
+#XMIT: Menuitem to sort descending
 TBL_SORT_DESC=Sort Descending
+#XMIT: Menuitem to group the column by its values
 TBL_GROUP=Group
+#XMIT: Menuitem to ungroup the column
 TBL_UNGROUP=Ungroup
+#XMIT: Menuitem to ungroup all columns
 TBL_UNGROUP_ALL=Ungroup All
+#XMIT: Menuitem to show the column visibility menu
 TBL_COLUMNS=Columns
+#XMIT: Menuitem to freeze the columns till the current one
 TBL_FREEZE=Freeze
+#XMIT: Menuitem to unfreeze the columns
 TBL_UNFREEZE=Unfreeze
+#XMIT:  Menuitem to move a group up one level
 TBL_MOVE_UP=Move Up
+#XMIT: Menuitem to move a group down one level
 TBL_MOVE_DOWN=Move Down
+#XMIT: Menuitem to expand all groups in a specific level
 TBL_EXPAND_LEVEL=Expand Level
+#XMIT: Menuitem to collapse all groups in a specific level
 TBL_COLLAPSE_LEVEL=Collapse Level
+#XMIT: Menuitem to expand all groups
 TBL_EXPAND_ALL=Expand All
+#XMIT: Menuitem to collapse all open groups
 TBL_COLLAPSE_ALL=Collapse All
+#XMIT: Menuitem to set grouped column visible
 TBL_SHOW_COLUMN=Show
+#XMIT: Menuitem to hide grouped column
 TBL_HIDE_COLUMN=Hide
+#XMIT: Menuitem in column visibility menu to set column visible
 TBL_COL_VISBILITY_MENUITEM_SHOW=Show Column
+#XMIT: Menuitem in column visibility menu to hide column
 TBL_COL_VISBILITY_MENUITEM_HIDE=Hide Column
 
+#XTOL: tooltip for row selection
 TBL_ROW_SELECT=Click to Select
+#XTOL: tooltip for row deselection
 TBL_ROW_DESELECT=Click to Deselect
+#XTOL: tooltip for row selection in multi toggle selection mode
 TBL_ROW_SELECT_MULTI_TOGGLE=Click to select or press SHIFT and click to select a range
 
+#XACT: accessibilty description for a table with enabled mutli-selection for rows (for the ScreenReader)
 TBL_TABLE_SELECTION_MULTI=Multi-Selection Table
+#XACT: accessibilty description for a table with enabled single-selection for rows (for the ScreenReader)
 TBL_TABLE_SELECTION_SINGLE=Single-Selection Table
 
+#XACT: accessibilty description for an invalid table (for the ScreenReader)
 TBL_TABLE_INVALID=Invalid Table
 
+#XACT: accessibilty description for count of rows and columns
 TBL_DATA_ROWS_COLS=Table contains {0} rows and {1} columns
 
+#XACT: accessibilty description for row selection via keyboard
 TBL_ROW_SELECT_KEY=To select row, press SPACEBAR
+#XACT: accessibilty description for row deselection via keyboard
 TBL_ROW_DESELECT_KEY=To deselect row, press SPACEBAR
 
+#XACT: accessability description for Analytical Table
 TBL_ANALYTICAL_TABLE_ROLE_DESCRIPTION=Analytical Table
 
+#XMSG: Table content text when all table columns are hidden
 TBL_NO_COLUMNS=Right now, there are no visible columns in the table. Please select the columns you need in the table settings.
 
+#XMSG: Table content text when no controls are rendered
 TBL_NO_DATA=No data
 
+#XTOL: Tooltip for the select all row header
 TBL_SELECT_ALL=Select All
+#XTOL: Tooltip for the select all row header
 TBL_DESELECT_ALL=Deselect All
 
+#XACT: accessibilty description for toggling the edit mode on a cell via keyboard
 TBL_TOGGLE_EDIT_KEY=To enter a table cell, press F2
 
+#XTOL: Expand a tree table node
 TBL_EXPAND=Expand Node
 
+#XTOL: Collapse a tree table node
 TBL_COLLAPSE=Collapse Node
 
+#XTOL: Tree Leaf Node
 TBL_LEAF=Node
 
+#XMIT: Menuitem to sum
 TBL_TOTAL=Total
 
+#XACT: accessability description for total summary row. This is a row that displays, for example, the sum, min, max or average values of the entire data.
 TBL_GRAND_TOTAL_ROW=Total summary
 
+#XACT: accessability description for group summary row. This is a row that displays, for example, the sum, min, max or average values of a group.
 TBL_GROUP_TOTAL_ROW=Group Summary
 
+#XACT: accessibilty description fixed columns
 TBL_FIXED_COLUMN=Fixed Column
 
+#XACT: accessibility description for focused row count
 TBL_ROW_ROWCOUNT=Row {0} of {1}
 
+#XACT: accessibility description for focused column count
 TBL_COL_COLCOUNT=Column {0} of {1}
 
+#XACT: accessibility label for a grouping row
 TBL_ROW_GROUP_LABEL=Group Row
 
+#XTXT: Title of group headers. For example: "Country: Germany"
 TBL_ROW_GROUP_TITLE={0}\: {1}
 
+#XTXT: Title of group headers with a combination of ID and text. For example: "Country: 001 - Germany"
 TBL_ROW_GROUP_TITLE_FULL={0}\: {1} - {2}
 
+#XACT: accessibility description for a selected row
 TBL_ROW_DESC_SELECTED=Row Selected
 
+#XACT: accessibility description for a column when menu is available
 TBL_COL_DESC_MENU=Menu Available
 
+#XACT: accessibility description for a filtered column
 TBL_COL_DESC_FILTERED=Filtered
 
+#XACT: accessibility description for a sorted column
 TBL_COL_DESC_SORTED_ASC=Sorted Ascending
 
+#XACT: accessibility description for a sorted column
 TBL_COL_DESC_SORTED_DES=Sorted Descending
 
+#XACT: accessibility description of how many columns are spanned by a column header
 TBL_COL_DESC_SPAN=Spans {0} columns
 
+#XACT: state which should be announced by screenreaders if the element in a table cell is disabled
 TBL_CTRL_STATE_DISABLED=Disabled
 
+#XACT: state which should be announced by screenreaders if the element in a table cell is readonly
 TBL_CTRL_STATE_READONLY=Read Only
 
+#XTIT: Title of the Row Action Column
 TBL_ROW_ACTION_COLUMN_LABEL=Row Actions
 
+#XACT: Screenreader should announce when no actions are available
 TBL_ROW_ACTION_NO_ACTION=No actions available
 
+#XACT: Screenreader should announce when a action is available
 TBL_ROW_ACTION_SINGLE_ACTION=1 action available
 
+#XACT: Screenreader should announce when several actions are available
 TBL_ROW_ACTION_MULTIPLE_ACTION={0} actions available
 
+#XTOL: Tooltip for Navigation Action Icon in Table Row
 TBL_ROW_ACTION_NAVIGATE=Details
 
+#XTOL: Tooltip for Delete Action Icon in Table Row
 TBL_ROW_ACTION_DELETE=Delete
 
+#XTOL: Tooltip for More Actions Icon in Table Row
 TBL_ROW_ACTION_MORE=More
 
+#XACT: ARIA announcement for the information state of the table row
 TBL_ROW_STATE_INFORMATION=Information
 
+#XACT: ARIA announcement for the error state of the table row
 TBL_ROW_STATE_ERROR=Error
 
+#XACT: ARIA announcement for the warning state of the table row
 TBL_ROW_STATE_WARNING=Warning
 
+#XACT: ARIA announcement for the success state of the table row
 TBL_ROW_STATE_SUCCESS=Success
 
+#XACT ARIA announcement for the navigated state of the table row
 TBL_ROW_STATE_NAVIGATED=Navigated
 
+#XACT: accessibilty description for expanding the table row via keyboard
 TBL_ROW_EXPAND_KEY=To expand a row, press the spacebar
 
+#XACT: accessibilty description for collapsing the table row via keyboard
 TBL_ROW_COLLAPSE_KEY=To collapse a row, press the spacebar
 
+#XBUT: Text of the apply button to save the data entered in the "creation row", a form in the table for creating new rows.
 TBL_CREATIONROW_APPLY=Add Row
 
+#XACT: Accessibilty label for the table creation row
 TBL_CREATEROW_LABEL=Create new table entry
 
+#XTIT: Title of the message popover on the last selected item, when the selection was limited
 TBL_SELECT_LIMIT_TITLE=Selection Limit
 
+#XMSG: Message popover on the last selected item, when the selection was limited
 TBL_SELECT_LIMIT=In this table, you cannot add more than {0} items to your selection at a time.\n\nYou can continue to add to your selection as often as you like, but only {0} items can be selected at a time.

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

@@ -69,7 +69,7 @@ TBL_ROW_GROUP_TITLE={0}\: {1}
 
 TBL_ROW_GROUP_TITLE_FULL={0}\: {1} - {2}
 
-TBL_ROW_DESC_SELECTED=Row Selected
+TBL_ROW_DESC_SELECTED=Red izabran
 
 TBL_COL_DESC_MENU=Meni dostupan
 
@@ -119,4 +119,4 @@ TBL_CREATEROW_LABEL=Kreiraj novi unos u tabelu
 
 TBL_SELECT_LIMIT_TITLE=Ograni\u010Denje odabira
 
-TBL_SELECT_LIMIT=U ovoj tabeli ne mo\u017Eete dodavati vi\u0161e od {0} stavki istovremeno u odabir.\n\nMo\u017Eete nastaviti da dodajete u odabir koliko god \u010Desto \u017Eelite, ali istovremeno mo\u017Ee biti odabrano samo {0} stavki.
+TBL_SELECT_LIMIT=U ovoj tabeli ne mo\u017Eete dodavati vi\u0161e od {0} stavki istovremenu u odabir.\n\nMo\u017Eete da nastavite da dodajete u odabir koliko \u017Eelite, ali samo {0} stavki mo\u017Ee biti odabrano istovremeno.

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

@@ -69,7 +69,7 @@ TBL_ROW_GROUP_TITLE={0}\: {1}
 
 TBL_ROW_GROUP_TITLE_FULL={0}\: {1} - {2}
 
-TBL_ROW_DESC_SELECTED=Row Selected
+TBL_ROW_DESC_SELECTED=\u0420\u0435\u0434 \u0438\u0437\u0430\u0431\u0440\u0430\u043D
 
 TBL_COL_DESC_MENU=\u041C\u0435\u043D\u0438 \u0434\u043E\u0441\u0442\u0443\u043F\u0430\u043D
 
@@ -119,4 +119,4 @@ TBL_CREATEROW_LABEL=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 \u043D\u043E\u043
 
 TBL_SELECT_LIMIT_TITLE=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u045A\u0435 \u043E\u0434\u0430\u0431\u0438\u0440\u0430
 
-TBL_SELECT_LIMIT=\u0423 \u043E\u0432\u043E\u0458 \u0442\u0430\u0431\u0435\u043B\u0438 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0434\u0430\u0432\u0430\u0442\u0438 \u0432\u0438\u0448\u0435 \u043E\u0434 {0} \u0441\u0442\u0430\u0432\u043A\u0438 \u0438\u0441\u0442\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043E \u0443 \u043E\u0434\u0430\u0431\u0438\u0440.\n\n\u041C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430 \u0434\u043E\u0434\u0430\u0458\u0435\u0442\u0435 \u0443 \u043E\u0434\u0430\u0431\u0438\u0440 \u043A\u043E\u043B\u0438\u043A\u043E \u0433\u043E\u0434 \u0447\u0435\u0441\u0442\u043E \u0436\u0435\u043B\u0438\u0442\u0435, \u0430\u043B\u0438 \u0438\u0441\u0442\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043E \u043C\u043E\u0436\u0435 \u0431\u0438\u0442\u0438 \u043E\u0434\u0430\u0431\u0440\u0430\u043D\u043E \u0441\u0430\u043C\u043E {0} \u0441\u0442\u0430\u0432\u043A\u0438.
+TBL_SELECT_LIMIT=\u0423 \u043E\u0432\u043E\u0458 \u0442\u0430\u0431\u0435\u043B\u0438 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0434\u0430\u0432\u0430\u0442\u0438 \u0432\u0438\u0448\u0435 \u043E\u0434 {0} \u0441\u0442\u0430\u0432\u043A\u0438 \u0438\u0441\u0442\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u0443 \u0443 \u043E\u0434\u0430\u0431\u0438\u0440.\n\n\u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043D\u0430\u0441\u0442\u0430\u0432\u0438\u0442\u0435 \u0434\u0430 \u0434\u043E\u0434\u0430\u0458\u0435\u0442\u0435 \u0443 \u043E\u0434\u0430\u0431\u0438\u0440 \u043A\u043E\u043B\u0438\u043A\u043E \u0436\u0435\u043B\u0438\u0442\u0435, \u0430\u043B\u0438 \u0441\u0430\u043C\u043E {0} \u0441\u0442\u0430\u0432\u043A\u0438 \u043C\u043E\u0436\u0435 \u0431\u0438\u0442\u0438 \u043E\u0434\u0430\u0431\u0440\u0430\u043D\u043E \u0438\u0441\u0442\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043E.

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @class Implements the selection methods for TreeTable and AnalyticalTable
 	 * @extends sap.ui.table.plugins.SelectionPlugin
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.BindingSelection

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 *
 	 * @private
 	 * @experimental Since 1.75

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class Implements the selection methods for a Table
 	 * @extends sap.ui.table.plugins.SelectionPlugin
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.SelectionModelSelection
@@ -79,7 +79,7 @@ sap.ui.define([
 		SelectionPlugin.prototype.onActivate.apply(this, arguments);
 		this.oSelectionModel.attachSelectionChanged(onSelectionChange, this);
 		TableUtils.Hook.register(oTable, TableUtils.Hook.Keys.Table.TotalRowCountChanged, onTotalRowCountChanged, this);
-		this._bIgnoreNextTotalRowCountChange = oTable._getTotalRowCount() === 0;
+		this._iTotalRowCount = oTable._getTotalRowCount();
 	};
 
 	/**
@@ -294,12 +294,6 @@ sap.ui.define([
 	 */
 	SelectionModelSelection.prototype.onTableRowsBound = function(oBinding) {
 		SelectionPlugin.prototype.onTableRowsBound.apply(this, arguments);
-		if (!this.hasOwnProperty("_bIgnoreNextTotalRowCountChange")) {
-			this._bIgnoreNextTotalRowCountChange = true;
-		}
-		if (!this.getTable()._bContextsAvailable) {
-			this._bWaitForBindingChange = true;
-		}
 		attachToBinding(this, oBinding);
 	};
 
@@ -341,20 +335,18 @@ sap.ui.define([
 		if (sReason === "sort" || sReason === "filter") {
 			this.clearSelection();
 		}
-
-		if (this._bWaitForBindingChange) {
-			this._bIgnoreNextTotalRowCountChange = true;
-			delete this._bWaitForBindingChange;
-		}
 	}
 
 	function onTotalRowCountChanged() {
-		if (!this._bIgnoreNextTotalRowCountChange) {
-			// If rows are added or removed, the index-based selection of the SelectionModel is invalid and needs to be cleared.
-			// The initial change is ignored for compatibility, so it is possible to select something before the initial rows update is done.
+		var iTotalRowCount = this.getTable()._getTotalRowCount();
+
+		// If rows are added or removed, the index-based selection of the SelectionModel is invalid and needs to be cleared.
+		// Changes from 0 are ignored for compatibility, so it is possible to select something before the initial rows update is done.
+		if (this._iTotalRowCount > 0 && this._iTotalRowCount !== iTotalRowCount) {
 			this.clearSelection();
 		}
-		delete this._bIgnoreNextTotalRowCountChange;
+
+		this._iTotalRowCount = iTotalRowCount;
 	}
 
 	return SelectionModelSelection;

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Implements the selection methods for a table.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @public
 	 * @since 1.64
 	 * @experimental As of version 1.64

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class TODO (don't forget to document fixed row count restrictions because fixed rows are set by this plugin)
 	 * @extends sap.ui.table.plugins.PluginBase
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @private
 	 * @since 1.76
 	 * @experimental

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var AutoRowMode = RowMode.extend("sap.ui.table.rowmodes.AutoRowMode", /** @lends sap.ui.table.rowmodes.AutoRowMode.prototype */ {
@@ -397,7 +397,7 @@ sap.ui.define([
 			if (!isRowCountInitial(this)) {
 				this.initTableRowsAfterDataRequested(iConfiguredRowCount);
 			}
-			this.getRowContexts(iConfiguredRowCount, true); // Trigger data request.
+			this.getRowContexts(iConfiguredRowCount); // Trigger data request.
 		}
 	};
 

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 *
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -276,7 +276,7 @@ sap.ui.define([
 			}
 
 			this.initTableRowsAfterDataRequested(iRowCount);
-			this.getRowContexts(iRowCount, true); // Trigger data request.
+			this.getRowContexts(iRowCount); // Trigger data request.
 		}
 	};
 

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 *
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -251,7 +251,7 @@ sap.ui.define([
 
 		if (iRowCount > 0) {
 			this.initTableRowsAfterDataRequested(iRowCount);
-			this.getRowContexts(iRowCount, true);  // Trigger data request.
+			this.getRowContexts(iRowCount);  // Trigger data request.
 		}
 	};
 

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.96.24
+	 * @version 1.96.25
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
@@ -669,19 +669,13 @@ sap.ui.define([
 	 * Gets contexts from the table's rows aggregation binding. Requests at least as many contexts as the table has rows or as is returned
 	 * by {@link RowMode#getMinRequestLength}.
 	 *
-	 * @param {int} [iRequestLength] The number of context to request.
-	 * @param {boolean} [bSuppressAdjustToBindingLength=false] Whether the table should be adjusted to a possibly new binding length.
+	 * @param {int} [iRequestLength] The number of contexts to request.
 	 * @returns {Object[]} The contexts returned from the binding.
 	 * @private
 	 */
-	RowMode.prototype.getRowContexts = function(iRequestLength, bSuppressAdjustToBindingLength) {
+	RowMode.prototype.getRowContexts = function(iRequestLength) {
 		var oTable = this.getTable();
-
-		if (!oTable) {
-			return [];
-		}
-
-		return oTable._getRowContexts(iRequestLength, bSuppressAdjustToBindingLength === true);
+		return oTable ? oTable._getRowContexts(iRequestLength) : [];
 	};
 
 	/**

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

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

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

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

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

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

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

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

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

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

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

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

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

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