@openui5/sap.ui.table 1.136.2 → 1.138.0

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

@@ -95,7 +95,7 @@ sap.ui.define([
 				} else {
 					// To be able to identify whether a row is dropped on itself we need to compare the contexts. The row index is not reliable. The
 					// indexing of the table can change, for example by expanding a node.
-					oSessionData.draggedRowContext = oDraggedControl.getRowBindingContext();
+					oSessionData.draggedRowContext = TableUtils.getBindingContextOfRow(oDraggedControl);
 				}
 			}
 
@@ -126,7 +126,7 @@ sap.ui.define([
 				 * - Sum rows
 				 */
 				const oDraggedRowContext = oSessionData.draggedRowContext;
-				const oDropRowContext = oDropControl.getRowBindingContext();
+				const oDropRowContext = TableUtils.getBindingContextOfRow(oDropControl);
 				const sDropPosition = oDragSession.getDropInfo().getDropPosition();
 
 				if ((oDropControl.isEmpty() && sDropPosition === DropPosition.On && TableUtils.hasData(this)) // On empty row, table has data
@@ -274,7 +274,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.DragAndDrop

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase

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

@@ -265,7 +265,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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard
@@ -462,7 +462,7 @@ sap.ui.define([
 
 	function setFocusFallback(oTable, oKeyboardExtension) {
 		if (oTable.getColumnHeaderVisible()) {
-			TableUtils.focusItem(oTable, ExtensionHelper.getInitialItemNavigationIndex(oKeyboardExtension));
+			oKeyboardExtension.focusItem(ExtensionHelper.getInitialItemNavigationIndex(oKeyboardExtension));
 			oKeyboardExtension._oLastFocus = null;
 		} else if (TableUtils.isNoDataVisible(oTable)) {
 			oTable.getDomRef("noDataCnt").focus();
@@ -567,6 +567,16 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Focus the item with the given index in the item navigation.
+	 *
+	 * @param {int} iIndex Index of item in ItemNavigation which shall get the focus.
+	 * @param {Object} oEvent The event object.
+	 */
+	KeyboardExtension.prototype.focusItem = function(iIndex, oEvent) {
+		this.getTable()._getItemNavigation()?.focusItem(iIndex, oEvent);
+	};
+
 	return KeyboardExtension;
 });
 

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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate
@@ -124,7 +124,7 @@ sap.ui.define([
 			// For the SelectAll cell, multiple elements are added to the item navigation.
 			preventItemNavigation(oEvent);
 			// Focus the first row header.
-			TableUtils.focusItem(oTable, iHeaderRowCount * (TableUtils.getVisibleColumnCount(oTable) + 1/*Row Headers*/), oEvent);
+			oTable._getKeyboardExtension().focusItem(iHeaderRowCount * (TableUtils.getVisibleColumnCount(oTable) + 1/*Row Headers*/), oEvent);
 		}
 	}
 
@@ -144,7 +144,7 @@ sap.ui.define([
 
 		preventItemNavigation(oEvent);
 
-		if (TableUtils.isLastScrollableRow(oTable, oCellInfo.cell)) {
+		if (isLastScrollableRow(oTable, oCellInfo.cell)) {
 			const bScrolled = scrollDown(oTable, oEvent);
 
 			if (bScrolled) {
@@ -156,7 +156,7 @@ sap.ui.define([
 		if (oCellInfo.rowIndex === oTable.getRows().length - 1
 			|| (TableUtils.isVariableRowHeightEnabled(oTable) // ignore empty buffer row
 				&& oCellInfo.rowIndex === oTable.getRows().length - 2
-				&& oTable.getRows()[oCellInfo.rowIndex + 1].getRowBindingContext() === null)) {
+				&& TableUtils.getBindingContextOfRow(oTable.getRows()[oCellInfo.rowIndex + 1]) === null)) {
 			// Leave the action mode when trying to navigate down on the last row.
 			if (!bActionMode && $ParentCell) {
 				$ParentCell.trigger("focus"); // A non-interactive element inside a cell is focused, focus the cell this element is inside.
@@ -205,7 +205,7 @@ sap.ui.define([
 
 		preventItemNavigation(oEvent);
 
-		if (TableUtils.isFirstScrollableRow(oTable, oCellInfo.cell)) {
+		if (isFirstScrollableRow(oTable, oCellInfo.cell)) {
 			const bScrolled = scrollUp(oTable, oEvent);
 
 			if (bScrolled) {
@@ -309,8 +309,10 @@ sap.ui.define([
 	 */
 	function restoreFocusOnLastFocusedDataCell(oTable, oEvent) {
 		const oCellInfo = TableUtils.getFocusedItemInfo(oTable);
-		const oLastInfo = oTable._getKeyboardExtension().getLastFocusedCellInfo();
-		TableUtils.focusItem(oTable, oCellInfo.cellInRow + (oCellInfo.columnCount * oLastInfo.row), oEvent);
+		const oKeyboardExtension = oTable._getKeyboardExtension();
+		const oLastInfo = oKeyboardExtension.getLastFocusedCellInfo();
+
+		oKeyboardExtension.focusItem(oCellInfo.cellInRow + (oCellInfo.columnCount * oLastInfo.row), oEvent);
 	}
 
 	/**
@@ -321,7 +323,7 @@ sap.ui.define([
 	 */
 	function setFocusOnColumnHeaderOfLastFocusedDataCell(oTable, oEvent) {
 		const oCellInfo = TableUtils.getFocusedItemInfo(oTable);
-		TableUtils.focusItem(oTable, oCellInfo.cellInRow, oEvent);
+		oTable._getKeyboardExtension().focusItem(oCellInfo.cellInRow, oEvent);
 	}
 
 	/**
@@ -720,6 +722,37 @@ sap.ui.define([
 		};
 	}
 
+	/**
+	 * Checks whether the cell of the given DOM reference is in the first row (from DOM point of view) of the scrollable area.
+	 *
+	 * @param {sap.ui.table.Table} oTable Instance of the table.
+	 * @param {jQuery | HTMLElement | int} row Cell DOM reference or row index.
+	 * @returns {boolean} Whether the row is the first scrollable row of the table based on the data.
+	 */
+	function isFirstScrollableRow(oTable, row) {
+		if (isNaN(row)) {
+			const $Ref = jQuery(row);
+			row = parseInt($Ref.add($Ref.parent()).filter("[data-sap-ui-rowindex]").attr("data-sap-ui-rowindex"));
+		}
+		return row === oTable._getRowCounts().fixedTop;
+	}
+
+	/**
+	 * Checks whether the cell of the given DOM reference is in the last row (from DOM point of view) of the scrollable area.
+	 *
+	 * @param {sap.ui.table.Table} oTable Instance of the table.
+	 * @param {jQuery | HTMLElement | int} row The row element or row index.
+	 * @returns {boolean} Whether the row is the last scrollable row of the table based on the data.
+	 */
+	function isLastScrollableRow(oTable, row) {
+		if (isNaN(row)) {
+			const $Ref = jQuery(row);
+			row = parseInt($Ref.add($Ref.parent()).filter("[data-sap-ui-rowindex]").attr("data-sap-ui-rowindex"));
+		}
+		const mRowCounts = oTable._getRowCounts();
+		return row === mRowCounts.count - mRowCounts.fixedBottom - 1;
+	}
+
 	/**
 	 * Hook which is called by the keyboard extension when the table should enter the action mode.
 	 *
@@ -782,19 +815,7 @@ sap.ui.define([
 		}
 	};
 
-	KeyboardDelegate.prototype.onfocusout = function(oEvent) {
-		if (this.getRows().length || this.getColumnHeaderVisible()) {
-			this.$().find(".sapUiTableCtrlBefore").attr("tabindex", "0");
-			this.$().find(".sapUiTableCtrlAfter").attr("tabindex", "0");
-		}
-	};
-
 	KeyboardDelegate.prototype.onfocusin = function(oEvent) {
-		if (this.getDomRef("sapUiTableCnt").contains(oEvent.target)) {
-			this.$().find(".sapUiTableCtrlBefore").attr("tabindex", "-1");
-			this.$().find(".sapUiTableCtrlAfter").attr("tabindex", "-1");
-		}
-
 		if (oEvent.isMarked("sapUiTableIgnoreFocusIn")) {
 			return;
 		}
@@ -1027,7 +1048,7 @@ sap.ui.define([
 		if (oKeyboardExtension.isInActionMode()) {
 			onTabNextInActionMode.call(this, oEvent);
 		} else if (oCellInfo.isOfType(CellType.ANYCOLUMNHEADER)) {
-			if (this.getCreationRow() && this.getCreationRow().getVisible() && !TableUtils.hasData(this)) {
+			if (this.getRows().length === 0) {
 				forwardFocusToTabDummy(this, "sapUiTableCtrlAfter");
 			} else if (TableUtils.isNoDataVisible(this)) {
 				this.$("noDataCnt").trigger("focus");
@@ -1104,6 +1125,9 @@ sap.ui.define([
 		} else if (oEvent.target === this.getDomRef("overlay")) {
 			this._getKeyboardExtension().setSilentFocus(this.$().find(".sapUiTableOuterBefore"));
 
+		} else if (oCellInfo.isOfType(CellType.ANYCOLUMNHEADER)) {
+			forwardFocusToTabDummy(this, "sapUiTableCtrlBefore");
+
 		} else if (!oCellInfo.isOfType(CellType.ANY)) {
 			$Cell = TableUtils.getParentCell(this, oEvent.target);
 
@@ -1204,7 +1228,7 @@ sap.ui.define([
 					return;
 				}
 
-				if (TableUtils.isLastScrollableRow(this, oEvent.target)) {
+				if (isLastScrollableRow(this, oEvent.target)) {
 					if (this._oRangeSelection.pScroll) { // A previous selection is still ongoing.
 						preventItemNavigation(oEvent);
 						return;
@@ -1294,7 +1318,7 @@ sap.ui.define([
 					return;
 				}
 
-				if (TableUtils.isFirstScrollableRow(this, oEvent.target)) {
+				if (isFirstScrollableRow(this, oEvent.target)) {
 					if (this._oRangeSelection.pScroll) { // A previous selection is still ongoing.
 						preventItemNavigation(oEvent);
 						return;
@@ -1493,9 +1517,11 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsaphome = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1519,21 +1545,23 @@ sap.ui.define([
 				// If there is a fixed column area and the focus is to the right of the first cell in the non-fixed area,
 				// then set the focus to the first cell in the non-fixed area.
 				preventItemNavigation(oEvent);
-				TableUtils.focusItem(this, iFocusedIndex - iFocusedCellInRow + iFixedColumnCount + iRowHeaderOffset, null);
+				oKeyboardExtension.focusItem(iFocusedIndex - iFocusedCellInRow + iFixedColumnCount + iRowHeaderOffset, null);
 
 			} else if (bHasRowHeader && iFocusedCellInRow > 1) {
 				// If there is a row header column and the focus is after the first content column,
 				// then set the focus to the cell in the first content column.
 				preventItemNavigation(oEvent);
-				TableUtils.focusItem(this, iFocusedIndex - iFocusedCellInRow + iRowHeaderOffset, null);
+				oKeyboardExtension.focusItem(iFocusedIndex - iFocusedCellInRow + iRowHeaderOffset, null);
 			}
 		}
 	};
 
 	KeyboardDelegate.prototype.onsapend = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1569,7 +1597,7 @@ sap.ui.define([
 				// If there is a row header and it has the focus,
 				// then set the focus to the cell in the next column.
 				preventItemNavigation(oEvent);
-				TableUtils.focusItem(this, iFocusedIndex + 1, null);
+				oKeyboardExtension.focusItem(iFocusedIndex + 1, null);
 
 			} else if (TableUtils.hasFixedColumns(this)
 					   && iFocusedCellInRow < iFixedColumnCount - 1 + iRowHeaderOffset
@@ -1577,23 +1605,25 @@ sap.ui.define([
 				// If there is a fixed column area and the focus is not on its last cell or column span,
 				// then set the focus to the last cell of the fixed column area.
 				preventItemNavigation(oEvent);
-				TableUtils.focusItem(this, iFocusedIndex + iFixedColumnCount - iFocusedCellInRow, null);
+				oKeyboardExtension.focusItem(iFocusedIndex + iFixedColumnCount - iFocusedCellInRow, null);
 
 			} else if (TableUtils.hasRowActions(this) && iFocusedCellInRow < iColumnCount - 2) {
 				// If the focus is on a data cell in the scrollable column area (except last cell),
 				// then set the focus to the row actions cell.
 				// Note: The END navigation from the last cell to the row action cell is handled by the item navigation.
 				preventItemNavigation(oEvent);
-				TableUtils.focusItem(this, iFocusedIndex - iFocusedCellInRow + iColumnCount - 2, null);
+				oKeyboardExtension.focusItem(iFocusedIndex - iFocusedCellInRow + iColumnCount - 2, null);
 			}
 
 		}
 	};
 
 	KeyboardDelegate.prototype.onsaphomemodifiers = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1616,7 +1646,7 @@ sap.ui.define([
 					/* Column header area */
 					/* Top fixed area */
 					if (iFocusedRow < iHeaderRowCount + mRowCounts.fixedTop) {
-						TableUtils.focusItem(this, iFocusedIndex - iColumnCount * iFocusedRow, oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * iFocusedRow, oEvent);
 					/* Scrollable area */
 					} else if (iFocusedRow >= iHeaderRowCount + mRowCounts.fixedTop &&
 							   iFocusedRow < iHeaderRowCount + TableUtils.getNonEmptyRowCount(this) - mRowCounts.fixedBottom) {
@@ -1624,16 +1654,16 @@ sap.ui.define([
 						// If a fixed top area exists, then set the focus to the first row (of
 						// the top fixed area), otherwise set the focus to the first row of the column header area.
 						if (mRowCounts.fixedTop > 0) {
-							TableUtils.focusItem(this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
+							oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
 						} else {
-							TableUtils.focusItem(this, iFocusedIndex - iColumnCount * iFocusedRow, oEvent);
+							oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * iFocusedRow, oEvent);
 						}
 
 					/* Bottom fixed area */
 					} else {
 						// Set the focus to the first row of the scrollable area and scroll to top.
 						this._getScrollExtension().scrollVerticallyMax(false);
-						TableUtils.focusItem(this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - mRowCounts.fixedTop), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - mRowCounts.fixedTop), oEvent);
 					}
 				}
 			}
@@ -1641,9 +1671,11 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapendmodifiers = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1671,17 +1703,16 @@ sap.ui.define([
 					/* Column header area */
 					if (TableUtils.isNoDataVisible(this)) {
 						// Set the focus to the last row of the column header area.
-						TableUtils.focusItem(this, iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow - 1), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow - 1), oEvent);
 					} else if (iFocusedRow < iHeaderRowCount) {
 						// If a top fixed area exists, then set the focus to the last row of the top fixed area,
 						// otherwise set the focus to the last row of the scrollable area and scroll to bottom.
 						if (mRowCounts.fixedTop > 0) {
-							TableUtils.focusItem(
-								this, iFocusedIndex + iColumnCount * (iHeaderRowCount + mRowCounts.fixedTop - iFocusedRow - 1), oEvent);
+							oKeyboardExtension.focusItem(
+								iFocusedIndex + iColumnCount * (iHeaderRowCount + mRowCounts.fixedTop - iFocusedRow - 1), oEvent);
 						} else {
 							this._getScrollExtension().scrollVerticallyMax(true);
-							TableUtils.focusItem(
-								this,
+							oKeyboardExtension.focusItem(
 								iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - iFocusedRow - 1),
 								oEvent
 							);
@@ -1691,25 +1722,20 @@ sap.ui.define([
 					} else if (iFocusedRow >= iHeaderRowCount && iFocusedRow < iHeaderRowCount + mRowCounts.fixedTop) {
 						// Set the focus to the last row of the scrollable area and scroll to bottom.
 						this._getScrollExtension().scrollVerticallyMax(true);
-						TableUtils.focusItem(
-							this,
-							iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - iFocusedRow - 1),
-							oEvent
-						);
+						oKeyboardExtension.focusItem(
+							iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - iFocusedRow - 1), oEvent);
 
 					/* Scrollable area */
 					} else if (iFocusedRow >= iHeaderRowCount + mRowCounts.fixedTop &&
 							   iFocusedRow < iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom) {
 						// Set the focus to the last row of the scrollable area and scroll to bottom.
 						this._getScrollExtension().scrollVerticallyMax(true);
-						TableUtils.focusItem(
-							this, iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
 
 					/* Bottom fixed area */
 					} else {
 						// Set the focus to the last row of the bottom fixed area.
-						TableUtils.focusItem(
-							this, iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
 					}
 				}
 			}
@@ -1717,9 +1743,11 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappageup = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1741,7 +1769,7 @@ sap.ui.define([
 				/* Top fixed area - From second row downwards */
 				if (iFocusedRow < iHeaderRowCount + mRowCounts.fixedTop) {
 					// Set the focus to the first row of the top fixed area.
-					TableUtils.focusItem(this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
+					oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
 
 				/* Scrollable area - First row */
 				} else if (iFocusedRow === iHeaderRowCount + mRowCounts.fixedTop) {
@@ -1755,9 +1783,9 @@ sap.ui.define([
 						// If a fixed top area exists or we are in the row action column (has no header), then set the focus to the first row (of
 						// the top fixed area), otherwise set the focus to the first row of the column header area.
 						if (mRowCounts.fixedTop > 0 || oCellInfo.isOfType(CellType.ROWACTION)) {
-							TableUtils.focusItem(this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
+							oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount), oEvent);
 						} else {
-							TableUtils.focusItem(this, iFocusedIndex - iColumnCount * iHeaderRowCount, oEvent);
+							oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * iHeaderRowCount, oEvent);
 						}
 					}
 
@@ -1766,15 +1794,13 @@ sap.ui.define([
 				} else if (iFocusedRow > iHeaderRowCount + mRowCounts.fixedTop &&
 						   iFocusedRow < iHeaderRowCount + TableUtils.getNonEmptyRowCount(this)) {
 					// Set the focus to the first row of the scrollable area.
-					TableUtils.focusItem(this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - mRowCounts.fixedTop), oEvent);
+					oKeyboardExtension.focusItem(iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - mRowCounts.fixedTop), oEvent);
 
 				/* Empty area */
 				} else {
 					// Set the focus to the last row of the scrollable area.
-					TableUtils.focusItem(
-						this, iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - TableUtils.getNonEmptyRowCount(this) + 1),
-						oEvent
-					);
+					oKeyboardExtension.focusItem(
+						iFocusedIndex - iColumnCount * (iFocusedRow - iHeaderRowCount - TableUtils.getNonEmptyRowCount(this) + 1), oEvent);
 				}
 			}
 
@@ -1786,9 +1812,11 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappagedown = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1815,14 +1843,14 @@ sap.ui.define([
 				/* Column header area - From second-last row upwards */
 				if (iFocusedRow < iHeaderRowCount - 1 && !oCellInfo.isOfType(CellType.COLUMNROWHEADER)) {
 					// Set the focus to the last row of the column header area.
-					TableUtils.focusItem(this, iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow - 1), oEvent);
+					oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow - 1), oEvent);
 
 				/* Column header area - Last row */
 				} else if (iFocusedRow < iHeaderRowCount) {
 					// If the NoData area is visible, then do nothing,
 					// otherwise set the focus to the first row of the top fixed (if existing) or scrollable area.
 					if (!TableUtils.isNoDataVisible(this)) {
-						TableUtils.focusItem(this, iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount - iFocusedRow), oEvent);
 					}
 
 				/* Top fixed area */
@@ -1830,10 +1858,8 @@ sap.ui.define([
 				} else if (iFocusedRow >= iHeaderRowCount &&
 						   iFocusedRow < iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - 1) {
 					// Set the focus to the last row of the scrollable area.
-					TableUtils.focusItem(
-						this, iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - iFocusedRow - 1),
-						oEvent
-					);
+					oKeyboardExtension.focusItem(
+						iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - iFocusedRow - 1), oEvent);
 
 				/* Scrollable area - Last row */
 				} else if (iFocusedRow === iHeaderRowCount + iNonEmptyRowCount - mRowCounts.fixedBottom - 1) {
@@ -1845,23 +1871,24 @@ sap.ui.define([
 					// If scrolling was not performed over a full page and there is a bottom fixed area,
 					// then set the focus to the last row of the bottom fixed area.
 					if (iRowsToBeScrolled < iPageSize && mRowCounts.fixedBottom > 0) {
-						TableUtils.focusItem(
-							this, iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
 					}
 
 				/* Bottom fixed area */
 				} else {
 					// Set the focus to the last row of the bottom fixed area.
-					TableUtils.focusItem(this, iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
+					oKeyboardExtension.focusItem(iFocusedIndex + iColumnCount * (iHeaderRowCount + iNonEmptyRowCount - iFocusedRow - 1), oEvent);
 				}
 			}
 		}
 	};
 
 	KeyboardDelegate.prototype.onsappageupmodifiers = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1882,29 +1909,31 @@ sap.ui.define([
 				if (bHasRowHeader && (TableUtils.Grouping.isInGroupHeaderRow(oEvent.target) || iFocusedCellInRow === 1)) {
 					// If a row header exists and the focus is on a group header or the first cell,
 					// then set the focus to the row header cell.
-					TableUtils.focusItem(this, iFocusedIndex - iFocusedCellInRow, null);
+					oKeyboardExtension.focusItem(iFocusedIndex - iFocusedCellInRow, null);
 
 				} else if (iFocusedCellInRow - iRowHeaderOffset < iPageSize) {
 					// If scrolling can not be performed over a full page,
 					// then scroll only the remaining cells (set the focus to the first cell).
-					TableUtils.focusItem(this, iFocusedIndex - iFocusedCellInRow + iRowHeaderOffset, null);
+					oKeyboardExtension.focusItem(iFocusedIndex - iFocusedCellInRow + iRowHeaderOffset, null);
 
 				} else {
 					// Scroll one page.
-					TableUtils.focusItem(this, iFocusedIndex - iPageSize, null);
+					oKeyboardExtension.focusItem(iFocusedIndex - iPageSize, null);
 				}
 
 			} else if (oCellInfo.isOfType(CellType.ROWACTION)) {
 				// If the focus is on a row action cell, then set the focus to the last data cell in the same row.
-				TableUtils.focusItem(this, oFocusedItemInfo.cell - 1, null);
+				oKeyboardExtension.focusItem(oFocusedItemInfo.cell - 1, null);
 			}
 		}
 	};
 
 	KeyboardDelegate.prototype.onsappagedownmodifiers = function(oEvent) {
+		const oKeyboardExtension = this._getKeyboardExtension();
+
 		handleNavigationEvent(oEvent);
 
-		if (this._getKeyboardExtension().isInActionMode()) {
+		if (oKeyboardExtension.isInActionMode()) {
 			return;
 		}
 
@@ -1930,21 +1959,21 @@ sap.ui.define([
 					if (bHasRowHeader && iFocusedCellInRow === 0) {
 						// If there is a row header and it has the focus,
 						// then set the focus to the first cell.
-						TableUtils.focusItem(this, iFocusedIndex + 1, null);
+						oKeyboardExtension.focusItem(iFocusedIndex + 1, null);
 
 					} else if (iColSpan > iPageSize) {
 						// If the focused cell is a column span bigger than a page size,
 						// then set the focus the next column in the row.
-						TableUtils.focusItem(this, iFocusedIndex + iColSpan, null);
+						oKeyboardExtension.focusItem(iFocusedIndex + iColSpan, null);
 
 					} else if (iFocusedCellInRow + iColSpan - iRowHeaderOffset + iPageSize > iVisibleColumnCount) {
 						// If scrolling can not be performed over a full page,
 						// then scroll only the remaining cells (set the focus to the last cell).
-						TableUtils.focusItem(this, iFocusedIndex + iVisibleColumnCount - iFocusedCellInRow - 1 + iRowHeaderOffset, null);
+						oKeyboardExtension.focusItem(iFocusedIndex + iVisibleColumnCount - iFocusedCellInRow - 1 + iRowHeaderOffset, null);
 
 					} else if (!TableUtils.Grouping.isInGroupHeaderRow(oEvent.target)) {
 						// Scroll one page.
-						TableUtils.focusItem(this, iFocusedIndex + iPageSize, null);
+						oKeyboardExtension.focusItem(iFocusedIndex + iPageSize, null);
 
 					}
 
@@ -1952,7 +1981,7 @@ sap.ui.define([
 						   && TableUtils.hasRowActions(this)
 						   && iFocusedCellInRow === oFocusedItemInfo.columnCount - 2) {
 					// If focus is on the last cell, set the focus to the row action cell.
-					TableUtils.focusItem(this, oFocusedItemInfo.cell + 1, null);
+					oKeyboardExtension.focusItem(oFocusedItemInfo.cell + 1, null);
 				}
 			}
 		}

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

@@ -668,7 +668,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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

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

@@ -1764,6 +1764,13 @@ sap.ui.define([
 			if (mRowCounts.fixedBottom > 0) {
 				iOffsetBottom += mRowCounts.fixedBottom * oTable._getBaseRowHeight();
 			}
+			const oCreationRow = oTable.getCreationRow();
+			if (oCreationRow) {
+				const oCreationRowDomRef = oCreationRow.getDomRef();
+				if (oCreationRowDomRef && oCreationRow.getVisible()) {
+					iOffsetBottom += oCreationRowDomRef.offsetHeight;
+				}
+			}
 			oVSb.style.bottom = iOffsetBottom + "px";
 		},
 
@@ -2320,7 +2327,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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling
@@ -2396,7 +2403,7 @@ sap.ui.define([
 			this._clearCache();
 
 			if (oTable) {
-				TableUtils.removeDelegate(oTable, ExtensionDelegate);
+				oTable.removeEventDelegate(ExtensionDelegate);
 
 				if (_private(oTable).pVerticalScrollUpdateProcess) {
 					_private(oTable).pVerticalScrollUpdateProcess.cancel();

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

@@ -27,7 +27,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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS
@@ -51,7 +51,7 @@ sap.ui.define([
 		destroy: function() {
 			const oTable = this.getTable();
 
-			TableUtils.removeDelegate(oTable, ExtensionDelegate);
+			oTable.removeEventDelegate(ExtensionDelegate);
 			clearTimeout(this._iUpdateDefaultScrollbarPositionTimeoutId);
 			ExtensionBase.prototype.destroy.apply(this, arguments);
 		},

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

@@ -185,7 +185,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.136.2
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization