@openui5/sap.ui.table 1.96.2 → 1.98.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,7 +8,6 @@
 sap.ui.define([
 	'sap/ui/Device',
 	'sap/ui/core/Control',
-	'sap/ui/core/IconPool',
 	'sap/ui/core/util/PasteHelper',
 	'sap/ui/model/ChangeReason',
 	'sap/ui/model/Filter',
@@ -35,7 +34,6 @@ sap.ui.define([
 	function(
 		Device,
 		Control,
-		IconPool,
 		PasteHelper,
 		ChangeReason,
 		Filter,
@@ -94,7 +92,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -910,8 +908,6 @@ sap.ui.define([
 	// BASIC CONTROL API
 	// =============================================================================
 
-	IconPool.insertFontFaceStyle();
-
 	/**
 	 * Initialization of the Table control
 	 * @private
@@ -1430,6 +1426,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;
@@ -1640,6 +1637,24 @@ sap.ui.define([
 	// FOCUS
 	// =============================================================================
 
+	/**
+	 * Sets the focus to the stored focus DOM reference.
+	 *
+	 * If {@param oFocusInfo.targetInfo} is of type {@type sap.ui.core.message.Message},
+	 * the focus will be set as accurately as possible according to the information provided by {@type sap.ui.core.message.Message}.
+	 *
+	 * @param {object} [oFocusInfo={}] Options for setting the focus
+	 * @param {boolean} [oFocusInfo.preventScroll=false] @since 1.60 If set to <code>true</code>, the focused
+	 *   element won't be moved into the viewport if it's not completely visible before the focus is set
+	 * @param {any} [oFocusInfo.targetInfo] @since 1.98 Further control-specific setting of the focus target within the control
+	 * @public
+	 */
+	Table.prototype.focus = function(oFocusInfo) {
+		this._oFocusInfo = oFocusInfo;
+		Control.prototype.focus.apply(this, arguments);
+		delete this._oFocusInfo;
+	};
+
 	/*
 	 * @see JSDoc generated by SAPUI5 control
 	 */
@@ -1664,7 +1679,6 @@ sap.ui.define([
 		return this;
 	};
 
-
 	// =============================================================================
 	// PUBLIC TABLE API
 	// =============================================================================
@@ -1920,6 +1934,7 @@ sap.ui.define([
 
 		// 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
+		// TODO: Delete binding change listener after hacks are removed from Support Assistant
 		Table._addBindingListener(oBindingInfo, "change", function() {
 			this._onBindingChange.apply(this, arguments);
 		}.bind(this));
@@ -1938,14 +1953,13 @@ sap.ui.define([
 		this._bRowsBeingBound = false;
 	};
 
-	/**
-	 * This function will be called by either by {@link sap.ui.base.ManagedObject#bindAggregation} or {@link sap.ui.base.ManagedObject#setModel}.
-	 *
-	 * @override {@link sap.ui.base.ManagedObject#_bindAggregation}
+	/*
+	 * This function will be called either by {@link sap.ui.base.ManagedObject#bindAggregation} or {@link sap.ui.base.ManagedObject#setModel}.
+	 * If only the model has been changed, ManagedObject only calls _bindAggregation, while bindAggregation / bindRows is not called.
+	 * @see sap.ui.base.ManagedObject#_bindAggregation
 	 */
 	Table.prototype._bindAggregation = function(sName, oBindingInfo) {
 		if (sName === "rows") {
-			// If only the model has been changed, the ManagedObject only calls _bindAggregation while bindAggregation / bindRows is not called.
 			resetBindingFlags(this);
 			this._bRowsBeingBound = true;
 		}
@@ -2086,13 +2100,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
@@ -2288,160 +2296,104 @@ sap.ui.define([
 	};
 
 	/**
-	 * Requests fixed bottom row contexts from the binding.
-	 * @returns {sap.ui.model.Context[]} Array of fixed bottom row context
+	 * Requests all contexts from the binding which are required to display the data in the current viewport.
+	 *
+	 * @param {int} [iRequestLength]
+	 *     The amount of contexts to request.
+	 *     The default is the row count computed by the row mode, see {@link sap.ui.table.rowmodes.RowMode#getComputedRowCounts}.
+	 *     The minimum request length is determined by the row mode, see {@link sap.ui.table.rowmodes.RowMode#getMinRequestLength}.
+	 * @returns {sap.ui.model.Context[]} Array of row contexts.
 	 * @private
 	 */
-	Table.prototype._getFixedBottomRowContexts = function() {
+	Table.prototype._getRowContexts = function(iRequestLength) {
+		var oBinding = this.getBinding();
 		var mRowCounts = this._getRowCounts();
-		var iTotalRowCount = getTotalRowCount(this, true);
+		var iThreshold = this.getThreshold();
 
-		if (mRowCounts.fixedBottom > 0 && mRowCounts.count - mRowCounts.fixedBottom < iTotalRowCount) {
-			return this._getContexts(iTotalRowCount - mRowCounts.fixedBottom, mRowCounts.fixedBottom, 0, true);
-		} else {
+		iRequestLength = iRequestLength == null ? mRowCounts.count : iRequestLength;
+
+		// 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(), 0);
+
+		if (!oBinding || iRequestLength === 0) {
 			return [];
 		}
+
+		// 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 aContexts = [];
+
+		if (mRowCounts.fixedTop > 0 && iFirstRenderedRowIndex > 0) {
+			// 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._getFixedTopRowContexts(), 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);
+		}
+
+		if (mRowCounts.fixedBottom > 0) {
+			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];
+		}
+	}
+
 	/**
-	 * Requests fixed top row contexts from the binding.
-	 * @returns {sap.ui.model.Context[]} Array of fixed top row context
+	 * Gets contexts for the fixed top rows from the binding.
+	 *
+	 * @returns {sap.ui.model.Context[]} Array of contexts.
 	 * @private
 	 */
-	Table.prototype._getFixedRowContexts = function() {
+	Table.prototype._getFixedTopRowContexts = function() {
 		var mRowCounts = this._getRowCounts();
-
-		if (mRowCounts.fixedTop > 0) {
-			return this._getContexts(0, mRowCounts.fixedTop, 0, true);
-		} else {
-			return [];
-		}
+		return mRowCounts.fixedTop > 0 ? this._getContexts(0, mRowCounts.fixedTop, 0, true) : [];
 	};
 
 	/**
-	 * Gets contexts from the binding of the <code>rows</code> aggregation. If no binding exists, an empty array is returned.
+	 * Gets contexts for the fixed bottom rows from the binding.
 	 *
-	 * @param {int} [iStartIndex] The start index of the requested contexts.
-	 * @param {int} [iLength] The requested amount of contexts.
-	 * @param {int} [iThreshold] The threshold value.
-	 * @param {boolean} [bKeepCurrent] Whether this call keeps the result of {@link sap.ui.model.ListBinding#getCurrentContexts} untouched.
-	 * @returns {sap.ui.model.Context[]} The requested contexts.
-	 * @see sap.ui.model.ListBinding#getContexts
+	 * @returns {sap.ui.model.Context[]} Array of contexts.
 	 * @private
 	 */
-	Table.prototype._getContexts = function(iStartIndex, iLength, iThreshold, bKeepCurrent) {
-		var oBinding = this.getBinding();
+	Table.prototype._getFixedBottomRowContexts = function() {
+		var mRowCounts = this._getRowCounts();
+		var iTotalRowCount = getTotalRowCount(this, true);
 
-		if (oBinding) {
-			return oBinding.getContexts(iStartIndex, iLength, iThreshold, bKeepCurrent);
+		if (mRowCounts.fixedBottom > 0 && mRowCounts.count - mRowCounts.fixedBottom < iTotalRowCount) {
+			return this._getContexts(iTotalRowCount - mRowCounts.fixedBottom, mRowCounts.fixedBottom, 0, true);
 		} else {
 			return [];
 		}
 	};
 
 	/**
-	 * Requests all contexts from the binding which are required to display the data in the current viewport.
+	 * Gets contexts from the binding.
 	 *
-	 * @param {int} [iRequestLength=undefined] The amount of contexts to request. The default value is the number of rows in the rows aggregation.
-	 * @param {boolean} [bSuppressAdjustToBindingLength=false] If set to <code>true</code>, no UI updates will be performed.
-	 * @param {boolean} [bSecondCall=false] If this parameter is set to <code>true</code>, it means that the function called itself recursively.
-	 * 										In this case some parts of the function will be skipped.
-	 * @returns {Object[]} Array of row contexts returned from the binding.
+	 * @param {int} iStartIndex Start of the index range.
+	 * @param {int} iLength Length of the index range.
+	 * @param {int} iThreshold The number of contexts to load in addition to the requested range.
+	 * @param {boolean} [bKeepCurrent] Whether this call keeps the result of {@link sap.ui.model.ListBinding#getCurrentContexts} untouched.
+	 * @returns {sap.ui.model.Context[]} Array of contexts.
 	 * @private
+	 * @see sap.ui.model.ListBinding#getContexts
 	 */
-	Table.prototype._getRowContexts = function(iRequestLength, bSuppressAdjustToBindingLength, bSecondCall) {
+	Table.prototype._getContexts = function(iStartIndex, iLength, iThreshold, bKeepCurrent) {
 		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) {
-			// Without binding there are no contexts to be retrieved.
-			return [];
-		}
-
-		bSuppressAdjustToBindingLength = bSuppressAdjustToBindingLength === true;
-		bSecondCall = bSecondCall === true;
-
-		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();
-		}
-
-		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);
-		}
-
-		return aContexts;
+		return oBinding ? oBinding.getContexts(iStartIndex, iLength, iThreshold, bKeepCurrent) : [];
 	};
 
 	/**
@@ -2455,10 +2407,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 +2466,12 @@ sap.ui.define([
 		}
 
 		this._bContextsAvailable = true;
+
+		if (sReason === ChangeReason.Sort || sReason === ChangeReason.Filter) {
+			this.setFirstVisibleRow(0);
+		}
+
+		this._adjustToTotalRowCount();
 		triggerRowsUpdate(this, sReason);
 	};
 
@@ -2773,7 +2741,9 @@ sap.ui.define([
 	/**
 	 * Returns the number of rows the <code>rows</code> aggregation is bound to.
 	 *
-	 * @returns {int} The total number of rows. Returns 0 if the <code>rows</code> aggregation is not bound.
+	 * <b>Note: Returns a cached binding length if the binding is being refreshed.</b>
+	 *
+	 * @returns {int} The total number of rows.
 	 * @private
 	 */
 	Table.prototype._getTotalRowCount = function() {
@@ -2814,10 +2784,9 @@ sap.ui.define([
 	}
 
 	/**
-	 * Returns the maximum row index to which can be scrolled to. It may not be accurate if the index is in the last page, but it never less
-	 * than the actual maximum.
+	 * Returns the maximum row index to which can be scrolled to.
 	 *
-	 * @returns {int} The maximum index of the first visible row.
+	 * @returns {int} The maximum first visible row index.
 	 * @private
 	 */
 	Table.prototype._getMaxFirstVisibleRowIndex = function() {
@@ -3034,6 +3003,15 @@ sap.ui.define([
 			return this.getDomRef("noDataCnt");
 		}
 
+		var bHasMessage = this._oFocusInfo && this._oFocusInfo.targetInfo && TableUtils.isA(this._oFocusInfo.targetInfo, "sap.ui.core.message.Message");
+		if (bHasMessage && this.getColumnHeaderVisible()) {
+			var oFirstVisibleColumn = this._getVisibleColumns()[0];
+
+			if (oFirstVisibleColumn) {
+				return oFirstVisibleColumn.getDomRef();
+			}
+		}
+
 		var oFocusedItemInfo = TableUtils.getFocusedItemInfo(this);
 		if (oFocusedItemInfo && oFocusedItemInfo.domRef) {
 			return oFocusedItemInfo.domRef;
@@ -3938,8 +3916,6 @@ sap.ui.define([
 	};
 
 	/*
-	 * Prevents re-rendering, when enabling/disabling busy indicator.
-	 * Avoids the request delays.
 	 * @see JSDoc generated by SAPUI5 control API generator
 	 */
 	Table.prototype.setEnableBusyIndicator = function(bValue) {

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

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @since 1.21.1
 	 *
 	 * @constructor

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -278,11 +278,6 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/Device', './library', "./Column",
 		this.renderTabElement(rm, "sapUiTableCtrlAfter", bHasRows ? "0" : "-1");
 		this.renderTabElement(rm, null, "-1", oTable.getId() + "-focusDummy");
 
-		if (!oTable._getScrollExtension().isVerticalScrollbarExternal()) {
-			this.renderVSbBackground(rm, oTable);
-			this.renderVSb(rm, oTable);
-		}
-
 		var oCreationRow = oTable.getCreationRow();
 		if (!oCreationRow || !oCreationRow.getVisible()) {
 			this.renderHSbBackground(rm, oTable);
@@ -295,6 +290,10 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/Device', './library', "./Column",
 		this.renderRowHdr(rm, oTable);
 		this.renderRowActions(rm, oTable);
 
+		if (!oTable._getScrollExtension().isVerticalScrollbarExternal()) {
+			this.renderVSb(rm, oTable);
+		}
+
 		rm.openStart("div", oTable.getId() + "-noDataCnt");
 		rm.class("sapUiTableCtrlEmpty");
 		rm.attr("tabindex", "0");
@@ -1204,65 +1203,54 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/Device', './library', "./Column",
 	};
 
 	TableRenderer.renderVSb = function(rm, oTable, mConfig) {
+		var oScrollExtension = oTable._getScrollExtension();
+		var mRowCounts = oTable._getRowCounts();
+
 		mConfig = Object.assign({
-			cssClass: "sapUiTableVSb",
-			tabIndex: true,
-			hidden: true
+			tabIndex: true
 		}, mConfig);
-		mConfig.id = oTable.getId() + "-vsb";
-
-		var oScrollExtension = oTable._getScrollExtension();
 
-		rm.openStart("div", mConfig.id);
-		rm.class(mConfig.cssClass);
-		if (mConfig.hidden) {
+		rm.openStart("div");
+		rm.class("sapUiTableVSbContainer");
+		if (!oScrollExtension.isVerticalScrollbarRequired()) {
 			rm.class("sapUiTableHidden");
 		}
-		if (mConfig.tabIndex) {
-			rm.attr("tabindex", "-1"); // Avoid focusing of the scrollbar in Firefox with tab.
-		}
-		rm.style("max-height", oScrollExtension.getVerticalScrollbarHeight() + "px");
+		rm.class(mConfig.cssClass);
+		rm.openEnd();
 
-		var mRowCounts = oTable._getRowCounts();
+		rm.openStart("div", oTable.getId() + "-vsb");
+		rm.class("sapUiTableVSb");
+		rm.style("max-height", oScrollExtension.getVerticalScrollbarHeight() + "px");
 		if (mRowCounts.fixedTop > 0) {
-			oTable._iVsbTop = mRowCounts.fixedTop * oTable._getBaseRowHeight() - 1;
-			rm.style("top", oTable._iVsbTop  + 'px');
+			rm.style("top", mRowCounts.fixedTop * oTable._getBaseRowHeight() - 1  + "px");
+		}
+		if (mConfig.tabIndex) {
+			// https://bugzilla.mozilla.org/show_bug.cgi?id=1069739
+			// Avoid focusing of the scrollbar in Firefox with tab.
+			rm.attr("tabindex", "-1");
 		}
-
 		rm.openEnd();
-
-		rm.openStart("div", mConfig.id + "-content");
+		rm.openStart("div");
 		rm.class("sapUiTableVSbContent");
 		rm.style("height", oScrollExtension.getVerticalScrollHeight() + "px");
 		rm.openEnd();
 		rm.close("div");
+		rm.close("div");
 
 		rm.close("div");
 	};
 
 	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");
 		}
 	};
 
-	TableRenderer.renderVSbBackground = function(rm, oTable) {
-		rm.openStart("div", oTable.getId() + "-vsb-bg");
-		rm.class("sapUiTableVSbBg");
-		rm.openEnd().close("div");
-	};
-
 	TableRenderer.renderHSb = function(rm, oTable, mConfig) {
 		mConfig = Object.assign({
 			id: oTable.getId() + "-hsb",

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.2
+	 * @version 1.98.0
 	 *
 	 * @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({
@@ -528,7 +544,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/TreeTableRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */