@openui5/sap.ui.table 1.114.0 → 1.115.0

package/.reuse/dep5

@@ -192,11 +192,6 @@ Copyright: 2012 Matteo Spinelli
 License: MIT
 Comment: these files belong to: cubiq.org - swipeview
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-Copyright: Mobify R&D Inc.
-License: MIT
-Comment: these files belong to: Mobify.js
-
 Files: src/sap.ui.core/src/sap/ui/thirdparty/zyngascroll.js
 Copyright: 2011 Zynga Inc.
 License: MIT

package/THIRDPARTY.txt

@@ -143,12 +143,6 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js
 
-Component: Mobify.js, version: 1.1
-Copyright: Mobify R&D Inc.
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-
 Component: Zynga Scroller, version: 1.2.1-0-g5d43806
 Copyright: 2011 Zynga Inc.
 License: MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.114.0",
+  "version": "1.115.0",
   "description": "OpenUI5 UI Library sap.ui.table",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.114.0",
-    "@openui5/sap.ui.unified": "1.114.0"
+    "@openui5/sap.ui.core": "1.115.0",
+    "@openui5/sap.ui.unified": "1.115.0"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.114.0</version>
+  <version>1.115.0</version>
 
   <documentation>Table-like controls, mainly for desktop scenarios.</documentation>
 

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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './utils/TableUtil
 	 * @extends sap.ui.table.ColumnMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -42,7 +42,6 @@ sap.ui.define([
 	"use strict";
 
 	var GroupEventType = library.GroupEventType;
-	var SortOrder = library.SortOrder;
 	var TreeAutoExpandMode = library.TreeAutoExpandMode;
 	var _private = TableUtils.createWeakMapFacade();
 
@@ -58,7 +57,7 @@ sap.ui.define([
 	 * @see https://github.com/SAP/odata-vocabularies/blob/main/docs/v2-annotations.md
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public
@@ -346,15 +345,6 @@ sap.ui.define([
 	};
 
 	AnalyticalTable.prototype._applyAnalyticalBindingInfo = function(oBindingInfo) {
-		// extract the sorters from the columns (TODO: reconsider this!)
-		var aColumns = this.getColumns();
-		for (var i = 0, l = aColumns.length; i < l; i++) {
-			if (aColumns[i].getSorted()) {
-				oBindingInfo.sorter = oBindingInfo.sorter || [];
-				oBindingInfo.sorter.push(new Sorter(aColumns[i].getSortProperty() || aColumns[i].getLeadingProperty(), aColumns[i].getSortOrder() === SortOrder.Descending));
-			}
-		}
-
 		// Make sure all necessary parameters are given.
 		// The ODataModelAdapter (via bindList) needs these properties to determine if an AnalyticalBinding should be instantiated.
 		// This is the default for the AnalyticalTable.
@@ -642,7 +632,7 @@ sap.ui.define([
 
 					if (oGroupColumnInfo) {
 						var oColumn = oGroupColumnInfo.column;
-						oColumn.sort(false); //update Analytical Info triggered by aftersort in column
+						oColumn._sort(false); //update Analytical Info triggered by aftersort in column
 					}
 				},
 				icon: "sap-icon://up"
@@ -658,7 +648,7 @@ sap.ui.define([
 
 					if (oGroupColumnInfo) {
 						var oColumn = oGroupColumnInfo.column;
-						oColumn.sort(true); //update Analytical Info triggered by aftersort in column
+						oColumn._sort(true); //update Analytical Info triggered by aftersort in column
 					}
 				},
 				icon: "sap-icon://down"

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @class
 	 * The column allows you to define column specific properties that will be applied when rendering the table.
 	 * @extends sap.ui.core.Element
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public
@@ -867,6 +867,10 @@ sap.ui.define([
 	 * @deprecated Since version 1.5.1. Please use the function "sap.ui.Table.prototype.sort".
 	 */
 	Column.prototype.sort = function(bDescending, bAdd) {
+		return this._sort(bDescending, bAdd);
+	};
+
+	Column.prototype._sort = function(bDescending, bAdd) {
 		var oTable = this.getParent();
 		if (oTable) {
 			// add current column to list of sorted columns

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @class
 	 * The column menu provides all common actions that can be performed on a column.
 	 * @extends sap.ui.unified.Menu
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * <code>sap.ui.commons</code> library.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @class
 	 * The row.
 	 * @extends sap.ui.core.Element
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * If more action items are available as the available space allows to display an overflow mechanism is provided.
 	 * This control must only be used in the context of the <code>sap.ui.table.Table</code> control to define row actions.
 	 * @extends sap.ui.core.Control
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @since 1.45
 	 *
 	 * @constructor

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * The <code>RowSettings</code> control allows you to configure a row.
 	 * You can only use this control in the context of the <code>sap.ui.table.Table</code> control to define row settings.
 	 * @extends sap.ui.core.Element
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -92,7 +92,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public
@@ -189,8 +189,10 @@ sap.ui.define([
 
 			/**
 			 * Flag whether the controls of the Table are editable or not (currently this only controls the background color in certain themes!)
+			 *
+			 * @deprecated As of version 1.115
 			 */
-			editable: {type: "boolean", group: "Behavior", defaultValue: true},
+			editable: {type: "boolean", group: "Behavior", defaultValue: true, deprecated: true},
 
 			/**
 			 * This property has been deprecated and must not be used anymore, since <code>Scrollbar</code> is the only supported option.
@@ -3110,7 +3112,7 @@ sap.ui.define([
 		}
 
 		if (this.getColumns().indexOf(oColumn) >= 0) {
-			oColumn.sort(oSortOrder === SortOrder.Descending, bAdd);
+			oColumn._sort(oSortOrder === SortOrder.Descending, bAdd);
 		}
 	};
 
@@ -4433,6 +4435,7 @@ sap.ui.define([
 	 * @throws {Error} If a selection plugin is applied
 	 * @private
 	 * @ui5-restricted sap.watt.hanaplugins.editor.plugin.hdbcalculationview
+	 * @deprecated As of version 1.115
 	 */
 	Table.prototype._enableLegacyMultiSelection = function() {
 		if (this._hasSelectionPlugin()) {
@@ -4453,7 +4456,7 @@ sap.ui.define([
 				} else {
 					this.setSelectedIndex(iIndex);
 				}
-			} else if (bAdd || this._getSelectionPlugin().getSelectedCount() === 1) {
+			} else if (bAdd || this.getSelectedIndices().length === 1) {
 				this.removeSelectionInterval(iIndex, iIndex);
 			} else {
 				this.setSelectedIndex(iIndex);

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

@@ -23,6 +23,8 @@ sap.ui.define([
 	/**
 	 * Constructor for a new TablePersoController.
 	 *
+	 * @deprecated since 1.115. Please use the {@link sap.m.p13n.Engine Engine} for personalization instead.
+	 *
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
@@ -31,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @since 1.21.1
 	 *
 	 * @constructor
@@ -45,6 +47,7 @@ sap.ui.define([
 		},
 
 		metadata: {
+			deprecated: true,
 			properties: {
 
 				/**

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

@@ -83,7 +83,12 @@ sap.ui.define(['sap/ui/Device', './library', "./Column", './utils/TableUtils', "
 		if (oScrollExtension.isVerticalScrollbarRequired() && !oScrollExtension.isVerticalScrollbarExternal()) {
 			rm.class("sapUiTableVScr"); // show vertical scrollbar
 		}
-		if (oTable.getEditable()) {
+		/*
+		* @UI5_V2_DEPRECATION_CHECK
+		* editable is a deprecated property of sap.ui.table.Table.
+		* Once the deprecated code is removed the following 3 lines of code will become obsolete.
+		*/
+		if (oTable.getEditable && oTable.getEditable()) {
 			rm.class("sapUiTableEdt"); // editable (background color)
 		}
 

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

@@ -42,7 +42,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.114.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -932,7 +932,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.TableRenderer which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender

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

@@ -252,7 +252,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.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.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase

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

@@ -267,7 +267,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles keyboard related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard

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

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

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

@@ -770,7 +770,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.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

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

@@ -2256,7 +2256,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.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling

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.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

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

@@ -181,7 +181,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.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization

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

@@ -24,13 +24,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.table
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @since 0.8
 	 * @public
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name: "sap.ui.table",
-		version: "1.114.0",
+		version: "1.115.0",
 		dependencies: ["sap.ui.core", "sap.ui.unified"],
 		designtime: "sap/ui/table/designtime/library.designtime",
 		types: [
@@ -69,12 +69,14 @@ sap.ui.define([
 		],
 		extensions: {
 			flChangeHandlers: {
-				"sap.ui.table.Table": {
-					"moveElements": "default"
-				},
-				"sap.ui.table.AnalyticalTable": {
-					"moveElements": "default"
-				}
+				// Note: MoveElements change handling is deprecated
+				//
+				// "sap.ui.table.Table": {
+				// 	"moveElements": "default"
+				// },
+				// "sap.ui.table.AnalyticalTable": {
+				// 	"moveElements": "default"
+				// }
 			},
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {
@@ -86,7 +88,7 @@ sap.ui.define([
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -113,7 +115,7 @@ sap.ui.define([
 	/**
 	 * Row Action types.
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -142,7 +144,7 @@ sap.ui.define([
 	/**
 	 * Selection behavior of the table
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -171,7 +173,7 @@ sap.ui.define([
 	/**
 	 * Selection mode of the table
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -207,7 +209,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -230,7 +232,7 @@ sap.ui.define([
 	/**
 	 * VisibleRowCountMode of the table
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -261,7 +263,7 @@ sap.ui.define([
 	 *
 	 * Contains IDs of shared DOM references, which should be accessible to inheriting controls via getDomRef() function.
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -359,7 +361,7 @@ sap.ui.define([
 	 *
 	 * This is an alias for {@link sap.ui.model.TreeAutoExpandMode} and kept for compatibility reasons.
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @typedef {sap.ui.model.TreeAutoExpandMode}
 	 * @public
 	 */
@@ -372,7 +374,7 @@ sap.ui.define([
 	/**
 	 * Mode of a selection plugin
 	 *
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @enum {string}
 	 * @private
 	 */

package/src/sap/ui/table/menus/ColumnHeaderMenuAdapter.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @private
 	 * @alias sap.ui.table.menus.ColumnHeaderMenuAdapter
 	 */

package/src/sap/ui/table/menus/MobileColumnHeaderMenuAdapter.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.menus.ColumnHeaderMenuAdapter
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @private
 	 * @alias sap.ui.table.menus.MobileColumnHeaderMenuAdapter
 	 */
@@ -209,7 +209,7 @@ sap.ui.define([
 				if (sSortOrder === CoreLibrary.SortOrder.None) {
 					this._oColumn._unsort();
 				} else {
-					this._oColumn.sort(sSortOrder === CoreLibrary.SortOrder.Descending, false);
+					this._oColumn._sort(sSortOrder === CoreLibrary.SortOrder.Descending, false);
 				}
 			}, this]
 		});

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

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

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

@@ -356,6 +356,7 @@ sap.ui.define([
 			if (oPlugin.isLimitReached()) {
 				if (bReverse) {
 					iIndexTo = iIndexFrom - iLimit + 1;
+					iGetContextsStartIndex = iIndexTo - 1;
 				} else {
 					iIndexTo = iIndexFrom + iLimit - 1;
 				}

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

@@ -125,7 +125,7 @@ sap.ui.define([
 	ODataV4Selection.prototype.setSelected = function(oRow, bSelected, mConfig) {
 		var oContext = oRow.getRowBindingContext();
 
-		if (!oContext) {
+		if (!oContext || !isContextSelectable(oContext)) {
 			return;
 		}
 
@@ -153,11 +153,14 @@ sap.ui.define([
 
 		var iIndexFrom = oPlugin._oRangeSelectionStartContext.getIndex();
 		var oContext = oRow.getRowBindingContext();
-		var iIndexTo = oContext ? oContext.getIndex() : undefined;
+		var iIndexTo = oContext ? oContext.getIndex() : -1;
 
-		if (iIndexFrom >= 0 && iIndexTo >= 0) {
-			selectRange(oPlugin, iIndexFrom, iIndexTo);
+		// The start index is already selected in case of range selection, so the range needs to start from the next index.
+		if (iIndexFrom !== iIndexTo) {
+			iIndexFrom += iIndexTo > iIndexFrom ? 1 : -1;
 		}
+
+		select(oPlugin, iIndexFrom, iIndexTo);
 	}
 
 	ODataV4Selection.prototype.isSelected = function(oRow) {
@@ -180,22 +183,48 @@ sap.ui.define([
 				icon: this.oDeselectAllIcon,
 				visible: this.getSelectionMode() === SelectionMode.MultiToggle && !this.getHideHeaderSelector(),
 				enabled: this._isLimitDisabled() || this.getSelectedCount() > 0,
-				selected: this._getSelectableCount() > 0 && this._getSelectableCount() === this.getSelectedCount()
+				selected: areAllRowsSelected(this)
 			}
 		};
 	};
 
 	/**
-	 * If not all indices are selected, all indices are selected, otherwise the selection is removed.
+	 * Selects all rows if not all are already selected, otherwise the selection is cleared.
 	 *
-	 * @param {sap.ui.table.plugins.ODataV4Selection} oPlugin The plugin to toggle the selection on.
+	 * @param {sap.ui.table.plugins.ODataV4Selection} oPlugin The selection plugin.
 	 */
 	function toggleSelectAll(oPlugin) {
-		if (oPlugin._getSelectableCount() > oPlugin.getSelectedCount()) {
-			selectAll(oPlugin);
-		} else {
+		if (areAllRowsSelected(oPlugin)) {
 			oPlugin.clearSelection();
+		} else if (oPlugin._isLimitDisabled()) {
+			var oBinding = oPlugin.getTableBinding();
+			select(oPlugin, 0, oBinding ? oBinding.getLength() - 1 : -1);
+		}
+	}
+
+	/**
+	 * Checks if all rows are selected.
+	 *
+	 * @param {sap.ui.table.plugins.ODataV4Selection} oPlugin The selection plugin.
+	 * @returns {boolean} Whether all rows are selected.
+	 */
+	function areAllRowsSelected(oPlugin) {
+		var oBinding = oPlugin.getTableBinding();
+
+		// isLengthFinal is checked in case the count is not requested. Even though it is documented that the count is required if the limit is
+		// disabled (SelectAll enabled), it could still happen.
+		if (!oBinding || !oBinding.isLengthFinal()) {
+			return false;
 		}
+
+		var iNumberOfSelectableContexts = oBinding.getAllCurrentContexts().filter(function(oContext) {
+			return isContextSelectable(oContext);
+		}).length;
+		var iNumberOfSelectedContexts = oPlugin.getSelectedContexts().filter(function(oContext) {
+			return isContextSelectable(oContext);
+		}).length;
+
+		return iNumberOfSelectableContexts > 0 && iNumberOfSelectableContexts === iNumberOfSelectedContexts;
 	}
 
 	ODataV4Selection.prototype.onHeaderSelectorPress = function() {
@@ -206,7 +235,7 @@ sap.ui.define([
 		}
 
 		if (mRenderConfig.headerSelector.type === "toggle") {
-			toggleSelectAll(this, this.getTable());
+			toggleSelectAll(this);
 		} else if (mRenderConfig.headerSelector.type === "clear") {
 			this.clearSelection();
 		}
@@ -306,25 +335,16 @@ sap.ui.define([
 		});
 	}
 
-	function selectAll(oPlugin) {
-		if (oPlugin._isLimitDisabled() && oPlugin._getSelectableCount() > 0) {
-			select(oPlugin, 0, oPlugin._getHighestSelectableIndex());
-		}
-	}
-
-	function selectRange(oPlugin, iIndexFrom, iIndexTo) {
-		// The start index is already selected in case of range selection, so the range needs to start from the next index.
-		if (iIndexFrom !== iIndexTo) {
-			iIndexFrom += iIndexTo > iIndexFrom ? 1 : -1;
+	function select(oPlugin, iIndexFrom, iIndexTo) {
+		if (iIndexFrom < 0 || iIndexTo < 0) {
+			return;
 		}
 
-		select(oPlugin, iIndexFrom, iIndexTo);
-	}
-
-	function select(oPlugin, iIndexFrom, iIndexTo) {
 		loadLimitedContexts(oPlugin, iIndexFrom, iIndexTo).then(function(mSelectionInfo) {
 			mSelectionInfo.contexts.forEach(function(oContext) {
-				oContext.setSelected(true);
+				if (isContextSelectable(oContext)) {
+					oContext.setSelected(true);
+				}
 			});
 			return oPlugin._scrollTableToIndex(mSelectionInfo.indexTo, mSelectionInfo.indexFrom > mSelectionInfo.indexTo);
 		}).then(function() {
@@ -332,6 +352,11 @@ sap.ui.define([
 		});
 	}
 
+	function isContextSelectable(oContext) {
+		var bIsTree = "hierarchyQualifier" in (oContext.getBinding().getAggregation() || {});
+		return (bIsTree || oContext.getProperty("@$ui5.node.isExpanded") === undefined) && !oContext.getProperty("@$ui5.node.isTotal");
+	}
+
 	ODataV4Selection.prototype.clearSelection = function() {
 		var bContextDeselected = false;
 
@@ -355,15 +380,6 @@ sap.ui.define([
 		}) : [];
 	};
 
-	ODataV4Selection.prototype._getSelectableCount = function() {
-		var oBinding = this.getTableBinding();
-		return oBinding ? oBinding.getLength() : 0;
-	};
-
-	ODataV4Selection.prototype._getHighestSelectableIndex = function() {
-		return this._getSelectableCount() - 1;
-	};
-
 	/**
 	 * If the limit is reached, the table is scrolled to the <code>iIndex</code>.
 	 * If <code>bReverse</code> is true the <code>firstVisibleRow</code> property of the Table is set to <code>iIndex</code> - 1,

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

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

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class Implements the selection methods for a Table
 	 * @extends sap.ui.table.plugins.SelectionPlugin
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.SelectionModelSelection

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

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

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class TODO (don't forget to document fixed row count restrictions because fixed rows are set by this plugin)
 	 * @extends sap.ui.table.plugins.PluginBase
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @private
 	 * @since 1.76
 	 * @experimental
@@ -194,16 +194,16 @@ sap.ui.define([
 	};
 
 	V4Aggregation.prototype.updateRowState = function(oState) {
-		var iLevel = oState.context.getValue("@$ui5.node.level");
-		var bContainsTotals = oState.context.getValue("@$ui5.node.isTotal");
-		var bIsLeaf = oState.context.getValue("@$ui5.node.isExpanded") === undefined;
+		var iLevel = oState.context.getProperty("@$ui5.node.level");
+		var bContainsTotals = oState.context.getProperty("@$ui5.node.isTotal");
+		var bIsLeaf = oState.context.getProperty("@$ui5.node.isExpanded") === undefined;
 		var bIsGrandTotal = iLevel === 0 && bContainsTotals;
 		var bIsGroupHeader = iLevel > 0 && !bIsLeaf;
 		var bIsGroupTotal = !bIsGroupHeader && bContainsTotals;
 
 		oState.level = iLevel;
 		oState.expandable = bIsGroupHeader;
-		oState.expanded = oState.context.getValue("@$ui5.node.isExpanded") === true;
+		oState.expanded = oState.context.getProperty("@$ui5.node.isExpanded") === true;
 
 		if (bIsGrandTotal || bIsGroupTotal) {
 			oState.type = oState.Type.Summary;

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 */
 	var AutoRowMode = RowMode.extend("sap.ui.table.rowmodes.AutoRowMode", /** @lends sap.ui.table.rowmodes.AutoRowMode.prototype */ {
 		metadata: {

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 */
 	var FixedRowMode = RowMode.extend("sap.ui.table.rowmodes.FixedRowMode", /** @lends sap.ui.table.rowmodes.FixedRowMode.prototype */ {

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 *
 	 */
 	var InteractiveRowMode = RowMode.extend("sap.ui.table.rowmodes.InteractiveRowMode", /** @lends sap.ui.table.rowmodes.InteractiveRowMode.prototype */ {

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 */
 	var RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
 		metadata: {

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

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

package/src/sap/ui/table/rules/Plugins.support.js

@@ -20,9 +20,9 @@ sap.ui.define([
 		minversion: "1.64",
 		categories: [Categories.Usage],
 		title: "Plugins validation",
-		description: "Checks the number and type of plugins which are applied to the table. Only one MultiSelectionPlugin can be applied. "
+		description: "Checks the number and type of plugins which are applied to the table. Only one selection plugin can be applied. "
 					 + "No other plugins are allowed.",
-		resolution: "Check if multiple MultiSelectionPlugins are applied, or a plugin of another type is applied to the table.",
+		resolution: "Check if multiple selection plugins are applied, or a plugin of another type is applied to the table.",
 		check: function(oIssueManager, oCoreFacade, oScope) {
 			var aTables = SupportHelper.find(oScope, true, "sap.ui.table.Table");
 
@@ -35,9 +35,9 @@ sap.ui.define([
 						Severity.High, oTable.getId());
 				} else if (aPlugins.length == 1) {
 					var oPlugin = aPlugins[0];
-					if (!oPlugin.isA("sap.ui.table.plugins.MultiSelectionPlugin")) {
+					if (!oPlugin.isA("sap.ui.table.plugins.SelectionPlugin")) {
 						SupportHelper.reportIssue(oIssueManager,
-							"Only one MultiSelectionPlugin can be applied to the table",
+							"Only a selection plugin can be applied to the table",
 							Severity.High, oTable.getId());
 					}
 				}

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

@@ -203,7 +203,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.0
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private
@@ -386,24 +386,11 @@ sap.ui.define([
 		 * @param {jQuery | HTMLElement | int | sap.ui.table.Row} vRowIndicator
 		 *     The data cell in the row, the index of the row in the aggregation, or the row instance on which to toggle the selection state.
 		 * @param {boolean} [bSelect] If defined, then instead of toggling the desired state is set.
-		 * @param {Function} [fnDoSelect] If defined, then instead of the default selection code, this custom callback is used.
+		 * @param {function(sap.ui.table.Row)} [fnDoSelect] If defined, then instead of the default selection code, this custom callback is used.
 		 */
 		toggleRowSelection: function(oTable, vRowIndicator, bSelect, fnDoSelect) {
 			var oRow;
 
-			function setSelectionState(oRow) {
-				oTable._iSourceRowIndex = oRow.getIndex(); // To indicate that the selection was changed by user interaction. TODO: Move to plugin and legacy multi selection
-
-				if (fnDoSelect) {
-					fnDoSelect(oRow, bSelect);
-				} else {
-					var oSelectionPlugin = oTable._getSelectionPlugin();
-					oSelectionPlugin.setSelected(oRow, typeof bSelect === "boolean" ? bSelect : !oSelectionPlugin.isSelected(oRow));
-				}
-
-				delete oTable._iSourceRowIndex;
-			}
-
 			if (TableUtils.isA(vRowIndicator, "sap.ui.table.Row")) {
 				oRow = vRowIndicator;
 			} else if (typeof vRowIndicator === "number") {
@@ -421,9 +408,20 @@ sap.ui.define([
 				}
 			}
 
-			if (oRow) {
-				setSelectionState(oRow);
+			if (!oRow || oRow.isEmpty()) {
+				return;
+			}
+
+			oTable._iSourceRowIndex = oRow.getIndex(); // To indicate that the selection was changed by user interaction. TODO: Move to plugin and legacy multi selection
+
+			if (fnDoSelect) {
+				fnDoSelect(oRow);
+			} else {
+				var oSelectionPlugin = oTable._getSelectionPlugin();
+				oSelectionPlugin.setSelected(oRow, typeof bSelect === "boolean" ? bSelect : !oSelectionPlugin.isSelected(oRow));
 			}
+
+			delete oTable._iSourceRowIndex;
 		},
 
 		/**

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

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

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

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

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

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

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

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

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

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