@openui5/sap.ui.table 1.123.0 → 1.124.0

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

@@ -11,12 +11,12 @@ sap.ui.define([
 	"use strict";
 
 	// Shortcuts
-	var SelectionMode = library.SelectionMode;
+	const SelectionMode = library.SelectionMode;
 
 	/*
 	 * Renders a hidden element with the given id, text and css classes.
 	 */
-	var _writeAccText = function(oRm, sParentId, sId, sText, aCSSClasses) {
+	const _writeAccText = function(oRm, sParentId, sId, sText, aCSSClasses) {
 		aCSSClasses = aCSSClasses || [];
 		aCSSClasses.push("sapUiInvisibleText");
 
@@ -44,12 +44,12 @@ 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.123.0
+	 * @version 1.124.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender
 	 */
-	var AccRenderExtension = ExtensionBase.extend("sap.ui.table.extensions.AccessibilityRender",
+	const AccRenderExtension = ExtensionBase.extend("sap.ui.table.extensions.AccessibilityRender",
 		/** @lends sap.ui.table.extensions.AccessibilityRender.prototype */ {
 		/**
 		 * @override
@@ -72,7 +72,7 @@ sap.ui.define([
 				return;
 			}
 
-			var sTableId = oTable.getId();
+			const sTableId = oTable.getId();
 
 			oRm.openStart("div");
 			oRm.class("sapUiTableHiddenTexts");
@@ -119,11 +119,11 @@ sap.ui.define([
 			// aria description for column with required content
 			_writeAccText(oRm, sTableId, "ariarequired", TableUtils.getResourceText("TBL_COL_REQUIRED"));
 
-			var oSelectionMode = oTable.getSelectionMode();
+			const oSelectionMode = oTable.getSelectionMode();
 			if (oSelectionMode !== SelectionMode.None) {
 				// aria description for selection mode in table
 				_writeAccText(oRm, sTableId, "ariaselection",
-					TableUtils.getResourceText(oSelectionMode == SelectionMode.MultiToggle ? "TBL_TABLE_SELECTION_MULTI" : "TBL_TABLE_SELECTION_SINGLE"));
+					TableUtils.getResourceText(oSelectionMode === SelectionMode.MultiToggle ? "TBL_TABLE_SELECTION_MULTI" : "TBL_TABLE_SELECTION_SINGLE"));
 			}
 
 			if (oTable.getComputedFixedColumnCount() > 0) {
@@ -149,15 +149,15 @@ sap.ui.define([
 		 * @public
 		 */
 		writeAriaAttributesFor: function(oRm, oTable, sType, mParams) {
-			var oExtension = oTable._getAccExtension();
+			const oExtension = oTable._getAccExtension();
 
 			if (!oExtension.getAccMode()) {
 				return;
 			}
 
-			var mAttributes = oExtension.getAriaAttributesFor(sType, mParams);
+			const mAttributes = oExtension.getAriaAttributesFor(sType, mParams);
 
-			var oValue, sKey;
+			let oValue; let sKey;
 			for (sKey in mAttributes) {
 				oValue = mAttributes[sKey];
 				if (Array.isArray(oValue)) {
@@ -183,9 +183,9 @@ sap.ui.define([
 				return;
 			}
 
-			var bIsSelected = oTable._getSelectionPlugin().isSelected(oRow);
-			var mKeyboardTexts = oTable._getAccExtension().getKeyboardTexts();
-			var sText = bIsSelected ? mKeyboardTexts.rowDeselect : mKeyboardTexts.rowSelect;
+			const bIsSelected = oTable._getSelectionPlugin().isSelected(oRow);
+			const mKeyboardTexts = oTable._getAccExtension().getKeyboardTexts();
+			const sText = bIsSelected ? mKeyboardTexts.rowDeselect : mKeyboardTexts.rowSelect;
 
 			_writeAccText(oRm, oRow.getId(), "rowselecttext", oRow.isEmpty() ? "" : sText, ["sapUiTableAriaRowSel"]);
 		},
@@ -205,8 +205,8 @@ sap.ui.define([
 				return;
 			}
 
-			var oRowSettings = oRow.getAggregation("_settings");
-			var sHighlightText = oRowSettings._getHighlightText();
+			const oRowSettings = oRow.getAggregation("_settings");
+			const sHighlightText = oRowSettings._getHighlightText();
 
 			_writeAccText(oRm, oRow.getId(), "highlighttext", sHighlightText);
 		},

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

@@ -10,10 +10,10 @@ sap.ui.define([
 ], function(ExtensionBase, TableUtils, CoreLibrary) {
 	"use strict";
 
-	var SESSION_DATA_KEY_NAMESPACE = "sap.ui.table";
-	var DropPosition = CoreLibrary.dnd.DropPosition;
+	const SESSION_DATA_KEY_NAMESPACE = "sap.ui.table";
+	const DropPosition = CoreLibrary.dnd.DropPosition;
 
-	var ExtensionHelper = {
+	const ExtensionHelper = {
 		/**
 		 * Gets the session data from the drag session. To get the session data that is shared by all table instances, do not specify a key.
 		 *
@@ -59,34 +59,34 @@ sap.ui.define([
 		},
 
 		scrollVertically: TableUtils.throttle(function(oTable, bDown, iBase, iPercentage) {
-			var oVerticalScrollbar = oTable._getScrollExtension().getVerticalScrollbar();
+			const oVerticalScrollbar = oTable._getScrollExtension().getVerticalScrollbar();
 			oVerticalScrollbar.scrollTop += this.calculateScrollDistance(iBase, iPercentage) * (bDown ? 1 : -1);
 		}, 50),
 
 		scrollHorizontally: TableUtils.throttle(function(oTable, bRight, iBase, iPercentage) {
-			var oHorizontalScrollbar = oTable._getScrollExtension().getHorizontalScrollbar();
+			const oHorizontalScrollbar = oTable._getScrollExtension().getHorizontalScrollbar();
 			oHorizontalScrollbar.scrollLeft += this.calculateScrollDistance(iBase, iPercentage) * (bRight ? 1 : -1);
 		}, 50),
 
 		calculateScrollDistance: function(iBase, iPercentage) {
-			var iMinDistance = 2;
-			var iMaxDistance = 50;
-			var nRate = iPercentage / iBase;
+			const iMinDistance = 2;
+			const iMaxDistance = 50;
+			const nRate = iPercentage / iBase;
 
 			return Math.max(iMinDistance, Math.round(iMaxDistance * nRate));
 		}
 	};
 
-	var ExtensionDelegate = {
+	const ExtensionDelegate = {
 		ondragstart: function(oEvent) {
-			var oDragSession = oEvent.dragSession;
+			const oDragSession = oEvent.dragSession;
 
 			if (!oDragSession || !oDragSession.getDragControl()) {
 				return;
 			}
 
-			var oDraggedControl = oDragSession.getDragControl();
-			var oSessionData = {};
+			const oDraggedControl = oDragSession.getDragControl();
+			const oSessionData = {};
 
 			if (oDraggedControl.isA("sap.ui.table.Row")) {
 				if (oDraggedControl.isEmpty() || oDraggedControl.isGroupHeader() || oDraggedControl.isSummary()) {
@@ -103,15 +103,15 @@ sap.ui.define([
 		},
 
 		ondragenter: function(oEvent) {
-			var oDragSession = oEvent.dragSession;
+			const oDragSession = oEvent.dragSession;
 
 			if (!oDragSession || !oDragSession.getDropControl()) {
 				return;
 			}
 
-			var oSessionData = ExtensionHelper.getInstanceSessionData(oDragSession, this);
-			var oDraggedControl = oDragSession.getDragControl();
-			var oDropControl = oDragSession.getDropControl();
+			let oSessionData = ExtensionHelper.getInstanceSessionData(oDragSession, this);
+			const oDraggedControl = oDragSession.getDragControl();
+			const oDropControl = oDragSession.getDropControl();
 
 			if (!oSessionData) {
 				oSessionData = {};
@@ -125,9 +125,9 @@ sap.ui.define([
 				 * - Group header rows
 				 * - Sum rows
 				 */
-				var oDraggedRowContext = oSessionData.draggedRowContext;
-				var oDropRowContext = oDropControl.getRowBindingContext();
-				var sDropPosition = oDragSession.getDropInfo().getDropPosition();
+				const oDraggedRowContext = oSessionData.draggedRowContext;
+				const oDropRowContext = oDropControl.getRowBindingContext();
+				const sDropPosition = oDragSession.getDropInfo().getDropPosition();
 
 				if ((oDropControl.isEmpty() && sDropPosition === DropPosition.On && TableUtils.hasData(this)) // On empty row, table has data
 					|| (oDraggedRowContext && oDraggedRowContext === oDropRowContext) // The dragged row itself
@@ -138,7 +138,7 @@ sap.ui.define([
 					// If dragging over an empty row with a drop position other than "On", the drop control should be the first non-empty row. If
 					// all rows are empty, the drop target should be the table to perform a drop in aggregation.
 					if (!oDropRowContext) {
-						var oLastNonEmptyRow = this.getRows()[TableUtils.getNonEmptyRowCount(this) - 1];
+						const oLastNonEmptyRow = this.getRows()[TableUtils.getNonEmptyRowCount(this) - 1];
 						oDragSession.setDropControl(oLastNonEmptyRow || this);
 					}
 
@@ -146,8 +146,8 @@ sap.ui.define([
 					// always need to be updated. The only exception is when all rows are empty. In this case a "drop in aggregation" will be
 					// performed, for which no indicator adjustment is necessary.
 					if (oDragSession.getDropControl() !== this) {
-						var bVerticalScrollbarVisible = this.getDomRef().classList.contains("sapUiTableVScr");
-						var mTableCntRect = this.getDomRef("sapUiTableCnt").getBoundingClientRect();
+						const bVerticalScrollbarVisible = this.getDomRef().classList.contains("sapUiTableVScr");
+						const mTableCntRect = this.getDomRef("sapUiTableCnt").getBoundingClientRect();
 						oDragSession.setIndicatorConfig({
 							width: mTableCntRect.width - (bVerticalScrollbarVisible ? 16 : 0),
 							left: mTableCntRect.left + (this._bRtlMode && bVerticalScrollbarVisible ? 16 : 0)
@@ -155,7 +155,7 @@ sap.ui.define([
 					}
 				}
 			} else if (oDropControl.isA("sap.ui.table.Column")) {
-				var iTargetColumnIndex = TableUtils.getCellInfo(TableUtils.getCell(this, oEvent.target)).columnIndex;
+				const iTargetColumnIndex = TableUtils.getCellInfo(TableUtils.getCell(this, oEvent.target)).columnIndex;
 
 				if (oDraggedControl.isA("sap.ui.table.Column")
 					&& !TableUtils.Column.isColumnMovableTo(oDraggedControl, iTargetColumnIndex, true)) {
@@ -163,7 +163,7 @@ sap.ui.define([
 					return;
 				}
 
-				var mTableCntRect = this.getDomRef("sapUiTableCnt").getBoundingClientRect();
+				const mTableCntRect = this.getDomRef("sapUiTableCnt").getBoundingClientRect();
 				oDragSession.setIndicatorConfig({
 					height: mTableCntRect.height - (this._getScrollExtension().isHorizontalScrollbarVisible() ? 16 : 0)
 				});
@@ -182,8 +182,8 @@ sap.ui.define([
 			// It is unlikely, that during a drag&drop action the horizontal scrollbar appears or disappears,
 			// therefore the vertical scroll edge only needs to be set once.
 			if (!oSessionData.verticalScrollEdge) {
-				var iPageYOffset = window.pageYOffset;
-				var mVerticalScrollRect = this.getDomRef("table").getBoundingClientRect();
+				const iPageYOffset = window.pageYOffset;
+				const mVerticalScrollRect = this.getDomRef("table").getBoundingClientRect();
 				oSessionData.verticalScrollEdge = {
 					bottom: mVerticalScrollRect.bottom + iPageYOffset,
 					top: mVerticalScrollRect.top + iPageYOffset
@@ -192,8 +192,8 @@ sap.ui.define([
 
 			// Because the vertical scrollbar can appear after expanding rows on "longdragover",
 			// the horizontal scroll edge always needs to be updated.
-			var iPageXOffset = window.pageXOffset;
-			var mHorizontalScrollRect = this.getDomRef("sapUiTableCtrlScr").getBoundingClientRect();
+			const iPageXOffset = window.pageXOffset;
+			const mHorizontalScrollRect = this.getDomRef("sapUiTableCtrlScr").getBoundingClientRect();
 			oSessionData.horizontalScrollEdge = {
 				left: mHorizontalScrollRect.left + iPageXOffset,
 				right: mHorizontalScrollRect.right + iPageXOffset
@@ -203,28 +203,28 @@ sap.ui.define([
 		},
 
 		ondragover: function(oEvent) {
-			var oDragSession = oEvent.dragSession;
+			const oDragSession = oEvent.dragSession;
 
 			if (!oDragSession) {
 				return;
 			}
 
-			var oSessionData = ExtensionHelper.getInstanceSessionData(oDragSession, this);
+			const oSessionData = ExtensionHelper.getInstanceSessionData(oDragSession, this);
 
 			if (!oSessionData) {
 				return;
 			}
 
-			var iThreshold = 50;
-			var oDropControl = oDragSession.getDropControl();
-			var oScrollExtension = this._getScrollExtension();
-			var oVerticalScrollbar = oScrollExtension.getVerticalScrollbar();
-			var oHorizontalScrollbar = oScrollExtension.getHorizontalScrollbar();
-			var oVerticalScrollEdge = oSessionData.verticalScrollEdge;
-			var oHorizontalScrollEdge = oSessionData.horizontalScrollEdge;
+			const iThreshold = 50;
+			const oDropControl = oDragSession.getDropControl();
+			const oScrollExtension = this._getScrollExtension();
+			const oVerticalScrollbar = oScrollExtension.getVerticalScrollbar();
+			const oHorizontalScrollbar = oScrollExtension.getHorizontalScrollbar();
+			const oVerticalScrollEdge = oSessionData.verticalScrollEdge;
+			const oHorizontalScrollEdge = oSessionData.horizontalScrollEdge;
 
 			if (oVerticalScrollEdge && oVerticalScrollbar && oDropControl !== this) {
-				var iPageY = oEvent.pageY;
+				const iPageY = oEvent.pageY;
 
 				if (iPageY >= oVerticalScrollEdge.top - iThreshold && iPageY <= oVerticalScrollEdge.top + iThreshold) {
 					ExtensionHelper.scrollVertically(this, false, iThreshold * 2, oVerticalScrollEdge.top + iThreshold - iPageY);
@@ -234,7 +234,7 @@ sap.ui.define([
 			}
 
 			if (oHorizontalScrollEdge && oHorizontalScrollbar && oDropControl !== this) {
-				var iPageX = oEvent.pageX;
+				const iPageX = oEvent.pageX;
 
 				if (iPageX >= oHorizontalScrollEdge.left - iThreshold && iPageX <= oHorizontalScrollEdge.left + iThreshold) {
 					ExtensionHelper.scrollHorizontally(this, false, iThreshold * 2, oHorizontalScrollEdge.left + iThreshold - iPageX);
@@ -245,16 +245,16 @@ sap.ui.define([
 		},
 
 		onlongdragover: function(oEvent) {
-			var oDragSession = oEvent.dragSession;
+			const oDragSession = oEvent.dragSession;
 
 			if (!oDragSession) {
 				return;
 			}
 
-			var $Cell = TableUtils.getCell(this, oEvent.target);
-			var iRowIndex = TableUtils.getCellInfo($Cell).rowIndex;
-			var oRow = iRowIndex == null ? null : this.getRows()[iRowIndex];
-			var oDropControl = oDragSession.getDropControl();
+			const $Cell = TableUtils.getCell(this, oEvent.target);
+			const iRowIndex = TableUtils.getCellInfo($Cell).rowIndex;
+			const oRow = iRowIndex == null ? null : this.getRows()[iRowIndex];
+			const oDropControl = oDragSession.getDropControl();
 
 			if (oRow && (oDropControl === oRow || !oDropControl)) {
 				oRow.expand();
@@ -274,12 +274,12 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.DragAndDrop
 	 */
-	var DragAndDropExtension = ExtensionBase.extend("sap.ui.table.extensions.DragAndDrop",
+	const DragAndDropExtension = ExtensionBase.extend("sap.ui.table.extensions.DragAndDrop",
 		/** @lends sap.ui.table.extensions.DragAndDrop.prototype */ {
 		/**
 		 * @override
@@ -308,7 +308,7 @@ sap.ui.define([
 		 * @inheritDoc
 		 */
 		destroy: function() {
-			var oTable = this.getTable();
+			const oTable = this.getTable();
 
 			if (oTable) {
 				oTable.removeEventDelegate(this._oDelegate);

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

@@ -19,12 +19,12 @@ sap.ui.define([
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase
 	 */
-	var ExtensionBase = BaseObject.extend("sap.ui.table.extensions.ExtensionBase", /** @lends sap.ui.table.extensions.ExtensionBase.prototype */ {
+	const ExtensionBase = BaseObject.extend("sap.ui.table.extensions.ExtensionBase", /** @lends sap.ui.table.extensions.ExtensionBase.prototype */ {
 		/**
 		 * Instance of the table this extension is applied to.
 		 *
@@ -62,11 +62,11 @@ sap.ui.define([
 				this._type = ExtensionBase.TABLETYPES.ANALYTICAL;
 			}
 
-			var sExtensionName = this._init(this._table, this._type, this._settings);
+			const sExtensionName = this._init(this._table, this._type, this._settings);
 
 			// Attach a getter to the table to get the instance of this extension.
 			if (sExtensionName) {
-				var that = this;
+				const that = this;
 				oTable["_get" + sExtensionName] = function() { return that; };
 			}
 		},
@@ -156,7 +156,7 @@ sap.ui.define([
 			return;
 		}
 
-		for (var i = 0; i < oTable._aExtensions.length; i++) {
+		for (let i = 0; i < oTable._aExtensions.length; i++) {
 			oTable._aExtensions[i]._attachEvents();
 		}
 	};
@@ -173,7 +173,7 @@ sap.ui.define([
 		if (!oTable._aExtensions) {
 			return;
 		}
-		for (var i = 0; i < oTable._aExtensions.length; i++) {
+		for (let i = 0; i < oTable._aExtensions.length; i++) {
 			oTable._aExtensions[i]._detachEvents();
 		}
 	};
@@ -193,7 +193,7 @@ sap.ui.define([
 			return null;
 		}
 
-		var oExtension = new ExtensionClass(oTable, mSettings);
+		const oExtension = new ExtensionClass(oTable, mSettings);
 		if (!oTable._aExtensions) {
 			oTable._aExtensions = [];
 		}
@@ -212,7 +212,7 @@ sap.ui.define([
 		if (!oTable._bExtensionsInitialized || !oTable._aExtensions) {
 			return;
 		}
-		for (var i = 0; i < oTable._aExtensions.length; i++) {
+		for (let i = 0; i < oTable._aExtensions.length; i++) {
 			oTable._aExtensions[i].destroy();
 		}
 		delete oTable._aExtensions;
@@ -232,7 +232,7 @@ sap.ui.define([
 			return false;
 		}
 
-		for (var i = 0; i < oTable._aExtensions.length; i++) {
+		for (let i = 0; i < oTable._aExtensions.length; i++) {
 			if (oTable._aExtensions[i].getMetadata().getName() === sExtensionFullName) {
 				return true;
 			}

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

@@ -29,9 +29,9 @@ sap.ui.define([
 	 * Allows to selectively forward the events to the item navigation.
 	 * "this" in the function context is the table instance
 	 */
-	var ItemNavigationDelegate = {
+	const ItemNavigationDelegate = {
 		_forward: function(oTable, oEvent) {
-			var oIN = oTable._getItemNavigation();
+			const oIN = oTable._getItemNavigation();
 
 			if (oIN != null
 				&& !oTable._getKeyboardExtension().isItemNavigationSuspended()
@@ -60,7 +60,7 @@ sap.ui.define([
 	 * Event handling which is independent of the used keyboard delegate.
 	 * "this" in the function context is the table instance.
 	 */
-	var ExtensionDelegate = {
+	const ExtensionDelegate = {
 		onBeforeRendering: function(oEvent) {
 			/*
 			 * In a normal rendering, the process is as follows:
@@ -82,7 +82,7 @@ sap.ui.define([
 			this._oStoredFocusInfo = this.getFocusInfo();
 		},
 		onAfterRendering: function(oEvent) {
-			var bRenderedRows = oEvent && oEvent.isMarked("renderRows");
+			const bRenderedRows = oEvent && oEvent.isMarked("renderRows");
 
 			this._getKeyboardExtension().invalidateItemNavigation();
 
@@ -99,7 +99,7 @@ sap.ui.define([
 			delete this._oStoredFocusInfo;
 		},
 		onfocusin: function(oEvent) {
-			var oExtension = this._getKeyboardExtension();
+			const oExtension = this._getKeyboardExtension();
 
 			if (!oExtension._bIgnoreFocusIn) {
 				ExtensionHelper.initItemNavigation(this._getKeyboardExtension());
@@ -119,7 +119,7 @@ sap.ui.define([
 	/*
 	 * Provides utility functions used this extension
 	 */
-	var ExtensionHelper = {
+	const ExtensionHelper = {
 		initItemNavigation: function(oExtension, bSkipInitFocusedIndex) {
 			if (ExtensionHelper.isItemNavigationInvalid(oExtension)) {
 				ExtensionHelper._initItemNavigation(oExtension, bSkipInitFocusedIndex);
@@ -131,23 +131,23 @@ sap.ui.define([
 		 * TabIndexes are set by the ItemNavigation.
 		 */
 		_initItemNavigation: function(oExtension, bSkipInitFocusedIndex) {
-			var oTable = oExtension.getTable();
+			const oTable = oExtension.getTable();
 
 			if (!oTable) {
 				return;
 			}
 
-			var $Table = oTable.$();
-			var iRowCount = oTable.getRows().length;
-			var iColumnCount = TableUtils.getVisibleColumnCount(oTable);
-			var bHasRowHeader = TableUtils.hasRowHeader(oTable);
-			var bHasRowActions = TableUtils.hasRowActions(oTable);
-			var bHasFixedColumns = TableUtils.hasFixedColumns(oTable);
-			var i;
+			const $Table = oTable.$();
+			const iRowCount = oTable.getRows().length;
+			let iColumnCount = TableUtils.getVisibleColumnCount(oTable);
+			const bHasRowHeader = TableUtils.hasRowHeader(oTable);
+			const bHasRowActions = TableUtils.hasRowActions(oTable);
+			const bHasFixedColumns = TableUtils.hasFixedColumns(oTable);
+			let i;
 
 			// create the list of item dom refs
-			var aItemDomRefs = [],
-				aRowHdrDomRefs, aRowActionDomRefs, $topLeft, $middleLeft, $bottomLeft;
+			let aItemDomRefs = [];
+			let aRowHdrDomRefs; let aRowActionDomRefs; let $topLeft; let $middleLeft; let $bottomLeft;
 
 			if (bHasFixedColumns) {
 				$topLeft = $Table.find(".sapUiTableCtrlFixed.sapUiTableCtrlRowFixed:not(.sapUiTableCHT)");
@@ -155,9 +155,9 @@ sap.ui.define([
 				$bottomLeft = $Table.find(".sapUiTableCtrlFixed.sapUiTableCtrlRowFixedBottom:not(.sapUiTableCHT)");
 			}
 
-			var $topRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowFixed:not(.sapUiTableCHT)");
-			var $middleRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowScroll:not(.sapUiTableCHT)");
-			var $bottomRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowFixedBottom:not(.sapUiTableCHT)");
+			const $topRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowFixed:not(.sapUiTableCHT)");
+			const $middleRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowScroll:not(.sapUiTableCHT)");
+			const $bottomRight = $Table.find(".sapUiTableCtrlScroll.sapUiTableCtrlRowFixedBottom:not(.sapUiTableCHT)");
 
 			if (bHasRowHeader) {
 				aRowHdrDomRefs = $Table.find(".sapUiTableRowSelectionCell").get();
@@ -192,13 +192,13 @@ sap.ui.define([
 
 			// add the column headers and select all
 			if (oTable.getColumnHeaderVisible()) {
-				var aHeaderDomRefs = [];
+				let aHeaderDomRefs = [];
 
 				// Returns the .sapUiTableColHdr elements (.sapUiTableColHdrCnt .sapUiTableCtrlFixed .sapUiTableColHdrTr)
-				var $FixedHeaders = $Table.find(".sapUiTableCHT.sapUiTableCtrlFixed>tbody>tr");
+				const $FixedHeaders = $Table.find(".sapUiTableCHT.sapUiTableCtrlFixed>tbody>tr");
 				// Returns the .sapUiTableColHdr elements (.sapUiTableColHdrCnt .sapUiTableCtrlScr .sapUiTableColHdrTr)
-				var $ScrollHeaders = $Table.find(".sapUiTableCHT.sapUiTableCtrlScroll>tbody>tr");
-				var iHeaderRowCount = TableUtils.getHeaderRowCount(oTable);
+				const $ScrollHeaders = $Table.find(".sapUiTableCHT.sapUiTableCtrlScroll>tbody>tr");
+				const iHeaderRowCount = TableUtils.getHeaderRowCount(oTable);
 
 				for (i = 0; i < iHeaderRowCount; i++) {
 					if (bHasRowHeader) {
@@ -227,7 +227,7 @@ sap.ui.define([
 				oExtension._itemNavigation = new ItemNavigation();
 				oExtension._itemNavigation.setTableMode(true);
 				oExtension._itemNavigation.attachEvent(ItemNavigation.Events.AfterFocus, function(oEvent) {
-					var oInfo = TableUtils.getFocusedItemInfo(oTable);
+					const oInfo = TableUtils.getFocusedItemInfo(oTable);
 					oInfo.header = TableUtils.getHeaderRowCount(oTable);
 					oInfo.domRef = null; //Do not keep dom references
 
@@ -267,12 +267,12 @@ 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.123.0
+	 * @version 1.124.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard
 	 */
-	var KeyboardExtension = ExtensionBase.extend("sap.ui.table.extensions.Keyboard",
+	const KeyboardExtension = ExtensionBase.extend("sap.ui.table.extensions.Keyboard",
 		/** @lends sap.ui.table.extensions.Keyboard.prototype */ {
 		/**
 		 * @override
@@ -322,7 +322,7 @@ sap.ui.define([
 		 */
 		destroy: function() {
 			// Deregister the delegates
-			var oTable = this.getTable();
+			const oTable = this.getTable();
 			if (oTable) {
 				oTable.removeEventDelegate(ExtensionDelegate);
 				oTable.removeEventDelegate(this._delegate);
@@ -400,8 +400,8 @@ sap.ui.define([
 	 * @param {HTMLElement} oPreviousFocusRef The previously focused element.
 	 */
 	KeyboardExtension.prototype.updateNoDataAndOverlayFocus = function() {
-		var oTable = this.getTable();
-		var oActiveElement = document.activeElement;
+		const oTable = this.getTable();
+		const oActiveElement = document.activeElement;
 
 		if (!oTable || !oTable.getDomRef()) {
 			return;
@@ -449,7 +449,7 @@ sap.ui.define([
 
 	function restoreFocusToDataCell(oTable, oKeyboardExtension) {
 		if (!jQuery(oKeyboardExtension._oLastFocus.Ref).hasClass("sapUiTableCell")) {
-			var oParentCell = TableUtils.getParentCell(oTable, oKeyboardExtension._oLastFocus.Ref);
+			const oParentCell = TableUtils.getParentCell(oTable, oKeyboardExtension._oLastFocus.Ref);
 
 			if (oParentCell && oParentCell[0] && jQuery(oParentCell[0]).hasClass("sapUiTableCell")) {
 				oParentCell[0].focus();
@@ -504,10 +504,10 @@ sap.ui.define([
 	 * @returns {sap.ui.table.utils.TableUtils.FocusedItemInfo} The cell info of the last focused cell.
 	 */
 	KeyboardExtension.prototype.getLastFocusedCellInfo = function() {
-		var iHeader = TableUtils.getHeaderRowCount(this.getTable());
-		if (!this._oLastFocusedCellInfo || this._oLastFocusedCellInfo.header != iHeader) {
-			var oInfo = TableUtils.getFocusedItemInfo(this.getTable());
-			var iDfltIdx = ExtensionHelper.getInitialItemNavigationIndex(this);
+		const iHeader = TableUtils.getHeaderRowCount(this.getTable());
+		if (!this._oLastFocusedCellInfo || this._oLastFocusedCellInfo.header !== iHeader) {
+			const oInfo = TableUtils.getFocusedItemInfo(this.getTable());
+			const iDfltIdx = ExtensionHelper.getInitialItemNavigationIndex(this);
 
 			return {
 				cellInRow: iDfltIdx,
@@ -542,17 +542,17 @@ sap.ui.define([
 			return;
 		}
 
-		var oTable = this.getTable();
-		var oCellInfo = TableUtils.getCellInfo(oElement);
+		const oTable = this.getTable();
+		const oCellInfo = TableUtils.getCellInfo(oElement);
 
 		if (oCellInfo.isOfType(TableUtils.CELLTYPE.ANY) && oTable) {
-			var $Elem = jQuery(oElement);
+			const $Elem = jQuery(oElement);
 
-			if ($Elem.attr("tabindex") != "0") {
-				var oItemNav = oTable._getItemNavigation();
+			if ($Elem.attr("tabindex") !== "0") {
+				const oItemNav = oTable._getItemNavigation();
 
 				if (oItemNav && oItemNav.aItemDomRefs) {
-					for (var i = 0; i < oItemNav.aItemDomRefs.length; i++) {
+					for (let i = 0; i < oItemNav.aItemDomRefs.length; i++) {
 						if (oItemNav.aItemDomRefs[i]) {
 							oItemNav.aItemDomRefs[i].setAttribute("tabindex", "-1");
 						}