@openui5/sap.ui.table 1.93.3 → 1.96.2

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

@@ -34,15 +34,13 @@ sap.ui.define([
 			var oIN = oTable._getItemNavigation();
 
 			if (oIN != null
-				&& !oTable._getKeyboardExtension()._isItemNavigationSuspended()
+				&& !oTable._getKeyboardExtension().isItemNavigationSuspended()
 				&& !oEvent.isMarked("sapUiTableSkipItemNavigation")) {
 
 				oIN["on" + oEvent.type](oEvent);
 			}
 		},
-		onfocusin: function(oEvent) {
-			ItemNavigationDelegate._forward(this, oEvent);
-		},
+		onfocusin: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
 		onsapfocusleave: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
 		onmousedown: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
 		onsapnext: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
@@ -56,7 +54,6 @@ sap.ui.define([
 		onsapend: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
 		onsapendmodifiers: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); },
 		onsapkeyup: function(oEvent) { ItemNavigationDelegate._forward(this, oEvent); }
-
 	};
 
 	/*
@@ -95,16 +92,17 @@ sap.ui.define([
 				if (bRenderedRows) {
 					this.applyFocusInfo(this._oStoredFocusInfo);
 				} else {
-					this._getKeyboardExtension().initItemNavigation();
+					ExtensionHelper.initItemNavigation(this._getKeyboardExtension(), true);
 				}
 			}
+
 			delete this._oStoredFocusInfo;
 		},
 		onfocusin: function(oEvent) {
 			var oExtension = this._getKeyboardExtension();
 
 			if (!oExtension._bIgnoreFocusIn) {
-				oExtension.initItemNavigation();
+				ExtensionHelper.initItemNavigation(this._getKeyboardExtension());
 			} else {
 				oEvent.setMarked("sapUiTableIgnoreFocusIn");
 			}
@@ -122,11 +120,17 @@ sap.ui.define([
 	 * Provides utility functions used this extension
 	 */
 	var ExtensionHelper = {
+		initItemNavigation: function(oExtension, bSkipInitFocusedIndex) {
+			if (ExtensionHelper.isItemNavigationInvalid(oExtension)) {
+				ExtensionHelper._initItemNavigation(oExtension, bSkipInitFocusedIndex);
+			}
+		},
+
 		/*
 		 * Initialize ItemNavigations (content and header) and transfer relevant dom elements.
 		 * TabIndexes are set by the ItemNavigation.
 		 */
-		_initItemNavigation: function(oExtension) {
+		_initItemNavigation: function(oExtension, bSkipInitFocusedIndex) {
 			var oTable = oExtension.getTable();
 
 			if (!oTable) {
@@ -237,7 +241,10 @@ sap.ui.define([
 			oExtension._itemNavigation.setColumns(iColumnCount);
 			oExtension._itemNavigation.setRootDomRef($Table.find(".sapUiTableCnt").get(0));
 			oExtension._itemNavigation.setItemDomRefs(aItemDomRefs);
-			oExtension._itemNavigation.setFocusedIndex(ExtensionHelper.getInitialItemNavigationIndex(oExtension));
+
+			if (!bSkipInitFocusedIndex) {
+				oExtension._itemNavigation.setFocusedIndex(ExtensionHelper.getInitialItemNavigationIndex(oExtension));
+			}
 
 			// revert invalidation flag
 			oExtension._itemNavigationInvalidated = false;
@@ -260,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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard
@@ -338,19 +345,13 @@ sap.ui.define([
 
 	/**
 	 * Check whether item navigation should be reapplied from scratch and initializes it if needed.
-	 *
-	 * @public
 	 */
 	KeyboardExtension.prototype.initItemNavigation = function() {
-		if (ExtensionHelper.isItemNavigationInvalid(this)) {
-			ExtensionHelper._initItemNavigation(this);
-		}
+		ExtensionHelper.initItemNavigation(this);
 	};
 
 	/**
 	 * Invalidates the item navigation (forces a re-initialization with the next initItemNavigation call).
-	 *
-	 * @public
 	 */
 	KeyboardExtension.prototype.invalidateItemNavigation = function() {
 		this._itemNavigationInvalidated = true;
@@ -369,7 +370,6 @@ sap.ui.define([
 	 *
 	 * @param {boolean} bEnter If set to <code>true</code>, the table will try to enter the action mode, otherwise the table will leave the action
 	 *     mode.
-	 * @public (Part of the API for Table control only!)
 	 */
 	KeyboardExtension.prototype.setActionMode = function(bEnter) {
 		if (!this._delegate) {
@@ -387,7 +387,6 @@ sap.ui.define([
 	 * Returns whether the table is in action mode.
 	 *
 	 * @returns {boolean} Returns <code>true</code>, if the table is in action mode.
-	 * @public
 	 */
 	KeyboardExtension.prototype.isInActionMode = function() {
 		return this._actionMode;
@@ -399,7 +398,6 @@ sap.ui.define([
 	 * e.g. see Table.setShowOverlay -> tue to CSS changes the focused element might be hidden which forces a focus change).
 	 *
 	 * @param {HTMLElement} oPreviousFocusRef The previously focused element.
-	 * @public
 	 */
 	KeyboardExtension.prototype.updateNoDataAndOverlayFocus = function() {
 		var oTable = this.getTable();
@@ -472,19 +470,15 @@ sap.ui.define([
 
 	/**
 	 * Suspends the event handling of the item navigation.
-	 *
-	 * @protected
 	 */
-	KeyboardExtension.prototype._suspendItemNavigation = function() {
+	KeyboardExtension.prototype.suspendItemNavigation = function() {
 		this._itemNavigationSuspended = true;
 	};
 
 	/**
 	 * Resumes the event handling of the item navigation.
-	 *
-	 * @protected
 	 */
-	KeyboardExtension.prototype._resumeItemNavigation = function() {
+	KeyboardExtension.prototype.resumeItemNavigation = function() {
 		this._itemNavigationSuspended = false;
 	};
 
@@ -492,9 +486,8 @@ sap.ui.define([
 	 * Returns whether the item navigation is suspended.
 	 *
 	 * @returns {boolean} Returns <code>true</code>, if the item navigation is suspended.
-	 * @protected
 	 */
-	KeyboardExtension.prototype._isItemNavigationSuspended = function() {
+	KeyboardExtension.prototype.isItemNavigationSuspended = function() {
 		return this._itemNavigationSuspended;
 	};
 
@@ -502,9 +495,8 @@ sap.ui.define([
 	 * Returns the combined info about the last focused data cell (based on the item navigation).
 	 *
 	 * @returns {sap.ui.table.utils.TableUtils.FocusedItemInfo} The cell info of the last focused cell.
-	 * @protected
 	 */
-	KeyboardExtension.prototype._getLastFocusedCellInfo = function() {
+	KeyboardExtension.prototype.getLastFocusedCellInfo = function() {
 		var iHeader = TableUtils.getHeaderRowCount(this.getTable());
 		if (!this._oLastFocusedCellInfo || this._oLastFocusedCellInfo.header != iHeader) {
 			var oInfo = TableUtils.getFocusedItemInfo(this.getTable());
@@ -526,11 +518,10 @@ sap.ui.define([
 	 * Sets the focus to the specified element and marks the resulting focus event to be ignored.
 	 *
 	 * @param {jQuery|HTMLElement} oElement The element to be focused.
-	 * @protected
 	 */
-	KeyboardExtension.prototype._setSilentFocus = function(oElement) {
+	KeyboardExtension.prototype.setSilentFocus = function(oElement) {
 		this._bIgnoreFocusIn = true;
-		this._setFocus(oElement);
+		this.setFocus(oElement);
 		this._bIgnoreFocusIn = false;
 	};
 
@@ -538,9 +529,8 @@ sap.ui.define([
 	 * Sets the focus to the specified element.
 	 *
 	 * @param {jQuery|HTMLElement} oElement The element to be focused.
-	 * @protected
 	 */
-	KeyboardExtension.prototype._setFocus = function(oElement) {
+	KeyboardExtension.prototype.setFocus = function(oElement) {
 		if (!oElement) {
 			return;
 		}
@@ -568,16 +558,6 @@ sap.ui.define([
 		oElement.focus();
 	};
 
-	/*
-	 * Returns the type of the related table.
-	 *
-	 * @returns {sap.ui.table.extensions.ExtensionBase.TABLETYPES} The type of the table.
-	 * @protected
-	 */
-	KeyboardExtension.prototype._getTableType = function() {
-		return this._type;
-	};
-
 	return KeyboardExtension;
 });
 

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

@@ -45,6 +45,18 @@ sap.ui.define([
 		oEvent.setMarked("sapUiTableSkipItemNavigation", bPrevent !== false);
 	}
 
+	/**
+	 * Prevents the event default and stops propagation if the event target is a table cell.
+	 *
+	 * @param {jQuery.Event} oEvent The event object.
+	 */
+	function handleNavigationEvent(oEvent) {
+		if (TableUtils.getCellInfo(oEvent.target).isOfType(CellType.ANY)) {
+			oEvent.preventDefault();
+			oEvent.stopPropagation();
+		}
+	}
+
 	/**
 	 * New Delegate for keyboard events of sap.ui.table.Table controls.
 	 *
@@ -52,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate
@@ -136,7 +148,7 @@ sap.ui.define([
 			var bScrolled = scrollDown(oTable, oEvent);
 
 			if (bScrolled) {
-				oEvent.preventDefault(); // Prevent scrolling the page.
+				oEvent.preventDefault(); // Prevent scrolling the page in action mode navigation.
 				return;
 			}
 		}
@@ -158,7 +170,7 @@ sap.ui.define([
 		}
 
 		focusCell(oTable, oCellInfo.type, oCellInfo.rowIndex + 1, oCellInfo.columnIndex, bActionModeNavigation);
-		oEvent.preventDefault(); // Prevent positioning the cursor. The text should be selected instead.
+		oEvent.preventDefault(); // Prevent positioning the cursor in action mode navigation. The text should be selected instead.
 	}
 
 	/**
@@ -194,7 +206,7 @@ sap.ui.define([
 			var bScrolled = scrollUp(oTable, oEvent);
 
 			if (bScrolled) {
-				oEvent.preventDefault(); // Prevent scrolling the page.
+				oEvent.preventDefault(); // Prevent scrolling the page in action mode navigation.
 				return;
 			}
 		}
@@ -214,7 +226,7 @@ sap.ui.define([
 		}
 
 		focusCell(oTable, oCellInfo.type, oCellInfo.rowIndex - 1, oCellInfo.columnIndex, bActionModeNavigation);
-		oEvent.preventDefault(); // Prevent positioning the cursor. The text should be selected instead.
+		oEvent.preventDefault(); // Prevent positioning the cursor in action mode navigation. The text should be selected instead.
 	}
 
 	function _canNavigateUpOrDown(oTable, oEvent) {
@@ -285,7 +297,7 @@ sap.ui.define([
 		var bAllowSapFocusLeave = bActionMode && oCellInfo.isOfType(CellType.DATACELL);
 
 		if (bAllowSapFocusLeave) {
-			oTable._getKeyboardExtension()._setSilentFocus(oTable.getDomRef("focusDummy"));
+			oTable._getKeyboardExtension().setSilentFocus(oTable.getDomRef("focusDummy"));
 			setTimeout(function() {
 				oTable._getScrollExtension().scrollVertically(bDown === true, bPage);
 			}, 0);
@@ -385,7 +397,7 @@ sap.ui.define([
 	 */
 	function restoreFocusOnLastFocusedDataCell(oTable, oEvent) {
 		var oCellInfo = TableUtils.getFocusedItemInfo(oTable);
-		var oLastInfo = oTable._getKeyboardExtension()._getLastFocusedCellInfo();
+		var oLastInfo = oTable._getKeyboardExtension().getLastFocusedCellInfo();
 		TableUtils.focusItem(oTable, oCellInfo.cellInRow + (oCellInfo.columnCount * oLastInfo.row), oEvent);
 	}
 
@@ -409,7 +421,7 @@ sap.ui.define([
 	 * @static
 	 */
 	function forwardFocusToTabDummy(oTable, sTabDummyCSSClass) {
-		oTable._getKeyboardExtension()._setSilentFocus(oTable.$().find("." + sTabDummyCSSClass));
+		oTable._getKeyboardExtension().setSilentFocus(oTable.$().find("." + sTabDummyCSSClass));
 	}
 
 	/**
@@ -582,7 +594,7 @@ sap.ui.define([
 		TableUtils.deselectElementText(document.activeElement);
 
 		if (bSilentFocus) {
-			oTable._getKeyboardExtension()._setSilentFocus(oElement);
+			oTable._getKeyboardExtension().setSilentFocus(oElement);
 		} else {
 			oElement.focus();
 		}
@@ -612,7 +624,7 @@ sap.ui.define([
 		var oCell;
 
 		if (iCellType === CellType.ROWHEADER) {
-			oTable._getKeyboardExtension()._setFocus(oTable.getDomRef("rowsel" + iRowIndex));
+			oTable._getKeyboardExtension().setFocus(oTable.getDomRef("rowsel" + iRowIndex));
 			return;
 		} else if (iCellType === CellType.ROWACTION) {
 			oCell = oTable.getDomRef("rowact" + iRowIndex);
@@ -641,6 +653,7 @@ sap.ui.define([
 		if (bAllowActionMode) {
 			oTable._getKeyboardExtension()._bStayInActionMode = true;
 		}
+
 		oCell.focus();
 	}
 
@@ -910,13 +923,13 @@ sap.ui.define([
 
 		if ($InteractiveElements) {
 			// Target is a data cell with interactive elements inside. Focus the first interactive element in the data cell.
-			oKeyboardExtension._suspendItemNavigation();
+			oKeyboardExtension.suspendItemNavigation();
 			oActiveElement.tabIndex = -1;
 			KeyboardDelegate._focusElement(this, $InteractiveElements[0], true);
 			return true;
 		} else if ($Cell) {
 			// Target is an interactive element inside a data cell.
-			this._getKeyboardExtension()._suspendItemNavigation();
+			this._getKeyboardExtension().suspendItemNavigation();
 			return true;
 		}
 
@@ -936,7 +949,7 @@ sap.ui.define([
 		var oActiveElement = document.activeElement;
 		var $Cell = TableUtils.getParentCell(this, oActiveElement);
 
-		oKeyboardExtension._resumeItemNavigation();
+		oKeyboardExtension.resumeItemNavigation();
 
 		if (bAdjustFocus) {
 			if ($Cell) {
@@ -953,7 +966,7 @@ sap.ui.define([
 					}
 				}
 
-				oKeyboardExtension._setSilentFocus(oActiveElement);
+				oKeyboardExtension.setSilentFocus(oActiveElement);
 			}
 		}
 	};
@@ -974,7 +987,7 @@ sap.ui.define([
 			if (!bNoData || bNoData && this.getColumnHeaderVisible()) {
 				setFocusOnColumnHeaderOfLastFocusedDataCell(this, oEvent);
 			} else {
-				this._getKeyboardExtension()._setSilentFocus(this.$("noDataCnt"));
+				this._getKeyboardExtension().setSilentFocus(this.$("noDataCnt"));
 			}
 
 		} else if ($Target.hasClass("sapUiTableCtrlAfter")) {
@@ -1257,7 +1270,7 @@ sap.ui.define([
 			forwardFocusToTabDummy(this, "sapUiTableCtrlAfter");
 
 		} else if (oEvent.target === this.getDomRef("overlay")) {
-			oKeyboardExtension._setSilentFocus(this.$().find(".sapUiTableOuterAfter"));
+			oKeyboardExtension.setSilentFocus(this.$().find(".sapUiTableOuterAfter"));
 
 		} else if (!oCellInfo.isOfType(CellType.ANY)) {
 			$Cell = TableUtils.getParentCell(this, oEvent.target);
@@ -1346,7 +1359,7 @@ sap.ui.define([
 			}
 
 		} else if (oEvent.target === this.getDomRef("overlay")) {
-			this._getKeyboardExtension()._setSilentFocus(this.$().find(".sapUiTableOuterBefore"));
+			this._getKeyboardExtension().setSilentFocus(this.$().find(".sapUiTableOuterBefore"));
 
 		} else if (!oCellInfo.isOfType(CellType.ANY)) {
 			$Cell = TableUtils.getParentCell(this, oEvent.target);
@@ -1360,10 +1373,13 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapdown = function(oEvent) {
+		handleNavigationEvent(oEvent);
 		navigateDown(this, oEvent);
 	};
 
 	KeyboardDelegate.prototype.onsapdownmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.CTRL)) {
 			navigateDown(this, oEvent);
 			return;
@@ -1386,7 +1402,6 @@ sap.ui.define([
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.SHIFT)) {
-			oEvent.preventDefault(); // Avoid text selection flickering.
 
 			/* Range Selection */
 
@@ -1438,10 +1453,13 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapup = function(oEvent) {
+		handleNavigationEvent(oEvent);
 		navigateUp(this, oEvent);
 	};
 
 	KeyboardDelegate.prototype.onsapupmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.CTRL)) {
 			navigateUp(this, oEvent);
 			return;
@@ -1464,7 +1482,6 @@ sap.ui.define([
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.SHIFT)) {
-			oEvent.preventDefault(); // Avoid text selection flickering.
 
 			/* Range Selection */
 
@@ -1517,10 +1534,13 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapleft = function(oEvent) {
+		handleNavigationEvent(oEvent);
 		navigateLeft(this, oEvent);
 	};
 
 	KeyboardDelegate.prototype.onsapleftmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
@@ -1529,7 +1549,6 @@ sap.ui.define([
 		var bIsRTL = sap.ui.getCore().getConfiguration().getRTL();
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.SHIFT)) {
-			oEvent.preventDefault(); // Avoid text selection flickering.
 
 			/* Range Selection */
 
@@ -1589,16 +1608,18 @@ sap.ui.define([
 			/* Column Reordering */
 
 			if (oCellInfo.isOfType(CellType.COLUMNHEADER)) {
-				oEvent.preventDefault();
-				oEvent.stopImmediatePropagation();
-
-				var oColumn = this.getColumns()[oCellInfo.columnIndex];
-				moveColumn(oColumn, bIsRTL);
+				preventItemNavigation(oEvent);
+				moveColumn(this.getColumns()[oCellInfo.columnIndex], bIsRTL);
 			}
+
+		} else if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.ALT)) {
+			preventItemNavigation(oEvent);
 		}
 	};
 
 	KeyboardDelegate.prototype.onsaprightmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
@@ -1607,8 +1628,6 @@ sap.ui.define([
 		var bIsRTL = sap.ui.getCore().getConfiguration().getRTL();
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.SHIFT)) {
-			oEvent.preventDefault(); // Avoid text selection flickering.
-
 			/* Range Selection */
 
 			if (oCellInfo.isOfType(CellType.DATACELL)) {
@@ -1658,16 +1677,18 @@ sap.ui.define([
 			/* Column Reordering */
 
 			if (oCellInfo.isOfType(CellType.COLUMNHEADER)) {
-				oEvent.preventDefault();
-				oEvent.stopImmediatePropagation();
-
-				var oColumn = this.getColumns()[oCellInfo.columnIndex];
-				moveColumn(oColumn, !bIsRTL);
+				preventItemNavigation(oEvent);
+				moveColumn(this.getColumns()[oCellInfo.columnIndex], !bIsRTL);
 			}
+
+		} else if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.ALT)) {
+			preventItemNavigation(oEvent);
 		}
 	};
 
 	KeyboardDelegate.prototype.onsaphome = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
@@ -1675,16 +1696,11 @@ sap.ui.define([
 		// If focus is on a group header, do nothing.
 		if (TableUtils.Grouping.isInGroupHeaderRow(oEvent.target)) {
 			preventItemNavigation(oEvent);
-			oEvent.preventDefault(); // Prevent scrolling the page.
 			return;
 		}
 
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
-		if (oCellInfo.isOfType(CellType.ANY)) {
-			oEvent.preventDefault(); // Prevent scrolling the page.
-		}
-
 		if (oCellInfo.isOfType(CellType.DATACELL | CellType.ROWACTION | CellType.COLUMNHEADER)) {
 			var oFocusedItemInfo = TableUtils.getFocusedItemInfo(this);
 			var iFocusedIndex = oFocusedItemInfo.cell;
@@ -1709,13 +1725,14 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapend = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
 
 		// If focus is on a group header, do nothing.
 		if (TableUtils.Grouping.isInGroupHeaderRow(oEvent.target)) {
-			oEvent.preventDefault(); // Prevent scrolling the page.
 			preventItemNavigation(oEvent);
 			return;
 		}
@@ -1723,8 +1740,6 @@ sap.ui.define([
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 		if (oCellInfo.isOfType(CellType.ANY)) {
-			oEvent.preventDefault(); // Prevent scrolling the page.
-
 			var oFocusedItemInfo = TableUtils.getFocusedItemInfo(this);
 			var iFocusedIndex = oFocusedItemInfo.cell;
 			var iColumnCount = oFocusedItemInfo.columnCount;
@@ -1770,12 +1785,13 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsaphomemodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.CTRL)) {
-			oEvent.preventDefault(); // Prevent scrolling the page.
 			var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 			if (oCellInfo.isOfType(CellType.ANYCONTENTCELL | CellType.COLUMNHEADER)) {
@@ -1827,12 +1843,13 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsapendmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
 
 		if (KeyboardDelegate._isKeyCombination(oEvent, null, ModKey.CTRL)) {
-			oEvent.preventDefault(); // Prevent scrolling the page.
 			var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 			if (oCellInfo.isOfType(CellType.ANY)) {
@@ -1902,12 +1919,12 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappageup = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
 
-		oEvent.preventDefault(); // Prevent scrolling the page.
-
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 		if (oCellInfo.isOfType(CellType.ANYCONTENTCELL | CellType.COLUMNHEADER)) {
@@ -1971,12 +1988,12 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappagedown = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
 
-		oEvent.preventDefault(); // Prevent scrolling the page.
-
 		var oCellInfo = TableUtils.getCellInfo(oEvent.target);
 
 		if (oCellInfo.isOfType(CellType.ANY)) {
@@ -2044,6 +2061,8 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappageupmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}
@@ -2085,6 +2104,8 @@ sap.ui.define([
 	};
 
 	KeyboardDelegate.prototype.onsappagedownmodifiers = function(oEvent) {
+		handleNavigationEvent(oEvent);
+
 		if (this._getKeyboardExtension().isInActionMode()) {
 			return;
 		}

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

@@ -484,20 +484,7 @@ sap.ui.define([
 			this.$().find(".sapUiTableColReorderFade").removeClass("sapUiTableColReorderFade");
 
 			this._enableTextSelection();
-
-			// Perform Reordering
 			TableUtils.Column.moveColumnTo(this.getColumns()[iOldIndex], iNewIndex);
-
-			// Re-apply focus
-			if (this._mTimeouts.reApplyFocusTimerId) {
-				window.clearTimeout(this._mTimeouts.reApplyFocusTimerId);
-			}
-			var that = this;
-			this._mTimeouts.reApplyFocusTimerId = window.setTimeout(function() {
-				var iOldFocusedIndex = TableUtils.getFocusedItemInfo(that).cell;
-				TableUtils.focusItem(that, 0, oEvent);
-				TableUtils.focusItem(that, iOldFocusedIndex, oEvent);
-			}, 0);
 		},
 
 		/*
@@ -805,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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer