@openui5/sap.ui.table 1.119.1 → 1.120.1

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

@@ -30,7 +30,8 @@ sap.ui.define([
 	"./plugins/SelectionModelSelection",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/Log",
-	"sap/ui/core/Configuration"
+	"sap/ui/core/Configuration",
+	"sap/ui/core/library"
 ], function(
 	Device,
 	Control,
@@ -57,7 +58,8 @@ sap.ui.define([
 	SelectionModelSelectionPlugin,
 	jQuery,
 	Log,
-	Configuration
+	Configuration,
+	CoreLibrary
 ) {
 	"use strict";
 
@@ -65,7 +67,7 @@ sap.ui.define([
 	var NavigationMode = library.NavigationMode;
 	var SelectionMode = library.SelectionMode;
 	var SelectionBehavior = library.SelectionBehavior;
-	var SortOrder = library.SortOrder;
+	var SortOrder = CoreLibrary.SortOrder;
 	var VisibleRowCountMode = library.VisibleRowCountMode;
 	var Hook = TableUtils.Hook.Keys.Table;
 	var _private = TableUtils.createWeakMapFacade();
@@ -94,7 +96,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -168,7 +170,9 @@ sap.ui.define([
 			 * When the selection mode is changed, the current selection is removed.
 			 * <b>Note:</b> Since the group header visualization relies on the row selectors, the row selectors are always shown if the grouping
 			 * functionality (depends on table type) is enabled, even if <code>sap.ui.table.SelectionMode.None</code> is set.
-			 * <b>Note:</b> If a selection plugin is applied to the table, the selection mode is controlled by the plugin.
+			 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+			 * it is recommended to use a selection plugin instead.
+			 * <b>Note:</b> If a selection plugin is used with the table, the selection mode is controlled by the plugin.
 			 */
 			selectionMode: {type: "sap.ui.table.SelectionMode", group: "Behavior", defaultValue: SelectionMode.MultiToggle},
 
@@ -440,7 +444,7 @@ sap.ui.define([
 			rows: {type: "sap.ui.table.Row", multiple: true, singularName: "row", bindable: "bindable", selector: "#{id}-tableCCnt", dnd: true},
 
 			/**
-			 * Defines how the table handles the rows.
+			 * Defines how the table handles the rows. By default, the table operates in {@link sap.ui.table.rowmodes.Type Fixed} mode.
 			 *
 			 * @since 1.119
 			 */
@@ -506,16 +510,12 @@ sap.ui.define([
 			/**
 			 * Plugin section of the table. Multiple plugins are possible, but always only <b>one</b> of a certain type.
 			 *
-			 * The following restrictions apply:
-			 * <ul>
-			 *  <li>If a selection plugin is applied to the table, the table's selection API must not be used. Instead, use the API of the
-			 *      plugin.</li>
-			 *  <li>Only one MultiSelectionPlugin can be applied. No other plugins can be applied.</li>
-			 * </ul>
+			 * If a selection plugin is used, the table's selection API must not be used. Instead, use the API of the plugin.
 			 *
 			 * @since 1.64
+			 * @deprecated As of version 1.120. Please add plugins to the <code>dependents</code> aggregation instead.
 			 */
-			plugins: {type: "sap.ui.table.plugins.SelectionPlugin", multiple: true, singularName: "plugin"},
+			plugins: {type: "sap.ui.table.plugins.SelectionPlugin", multiple: true, singularName: "plugin", deprecated: true},
 
 			/**
 			 * Defines the message strip to display binding-related messages.
@@ -552,10 +552,15 @@ sap.ui.define([
 		events: {
 
 			/**
-			 * fired when the row selection of the table has been changed (the event parameters can be used to determine
-			 * selection changes - to find out the selected rows you should better use the table selection API)
+			 * Fired if the row selection of the table has been changed.
 			 *
-			 * <b>Note:</b> If a selection plugin is applied to the table, this event won't be fired.
+			 * The event parameters can be used to determine selection changes. To find the selected rows, you should
+			 * use {@link sap.ui.table.Table#getSelectedIndices} or the related function of the used selection plugin
+			 * if it exists.
+			 *
+			 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+			 * it is recommended to use a selection plugin instead.
+			 * <b>Note:</b> If a selection plugin is used with the table, this event won't be fired.
 			 */
 			rowSelectionChange: {
 				parameters: {
@@ -590,6 +595,7 @@ sap.ui.define([
 
 			/**
 			 * fired when a column of the table has been selected
+			 * @deprecated As of version 1.117
 			 */
 			columnSelect: {
 				allowPreventDefault: true,
@@ -652,19 +658,18 @@ sap.ui.define([
 			sort: {
 				allowPreventDefault: true,
 				parameters: {
-
 					/**
-					 * sorted column.
+					 * The column for which the sorting is changed
 					 */
 					column: {type: "sap.ui.table.Column"},
 
 					/**
-					 * Sort Order
+					 * The new sort order
 					 */
-					sortOrder: {type: "sap.ui.table.SortOrder"},
+					sortOrder: {type: "sap.ui.core.SortOrder"},
 
 					/**
-					 * If column was added to sorter this is true. If new sort is started this is set to false
+					 * Indicates that the column is added to the list of sorted columns
 					 */
 					columnAdded: {type: "boolean"}
 				}
@@ -1045,12 +1050,16 @@ sap.ui.define([
 	Table.prototype.applySettings = function(mSettings, oScope) {
 		// The threshold and firstVisibleRow must be set before the OData binding for the "rows" aggregation is initialized. If the metadata is
 		// already loaded, a getContexts call may be triggered immediately with the default values instead of the one in the settings.
-		// Some settings might rely on the existence of a row mode or plugin. If row modes and plugins are in the settings and applied before
-		// other settings, initialization of default row modes and legacy selection plugins can be avoided.
+		// Some settings might rely on the existence of a row mode.
 		if (mSettings) {
-			var aEarlySettings = ["threshold", "firstVisibleRow", "rowMode", "plugins"];
+			var aEarlySettings = ["threshold", "firstVisibleRow", "rowMode"];
 			var mEarlySettings = {};
 
+			/**
+			 * @deprecated As of version 1.120
+			 */
+			aEarlySettings.push("plugins");
+
 			for (var i = 0; i < aEarlySettings.length; i++) {
 				var sSetting = aEarlySettings[i];
 
@@ -1065,9 +1074,8 @@ sap.ui.define([
 			}
 		}
 
-		this._initDefaultRowMode();
-		this._initLegacySelectionPlugin();
-
+		this._initLegacySelectionPlugin(); // Doing it at the end can eliminate the need to create a legacy selection plugin.
+		initDefaultRowMode(this);
 		Control.prototype.applySettings.call(this, mSettings, oScope);
 	};
 
@@ -1156,7 +1164,7 @@ sap.ui.define([
 	 * Localization changed
 	 * @private
 	 */
-	Table.prototype.onlocalizationChanged = function(oEvent) {
+	Table.prototype.onLocalizationChanged = function(oEvent) {
 		var oChanges = oEvent.changes || {};
 		var bRtlChanged = oChanges.hasOwnProperty("rtl");
 		var bLangChanged = oChanges.hasOwnProperty("language");
@@ -1165,6 +1173,11 @@ sap.ui.define([
 		}.bind(this)).catch(function() {});
 	};
 
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	Table.prototype.onlocalizationChanged = Table.prototype.onLocalizationChanged;
+
 	/**
 	 * Adapts the table to localization changes. Re-rendering or invalidation of the table needs to be taken care of by the caller.
 	 *
@@ -1770,6 +1783,9 @@ sap.ui.define([
 	 * @param {sap.ui.table.SelectionMode} sSelectionMode the selection mode, see sap.ui.table.SelectionMode
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.setSelectionMode = function(sSelectionMode) {
 		if (sSelectionMode === SelectionMode.Multi) {
@@ -1782,7 +1798,7 @@ sap.ui.define([
 			Log.error("If a selection plugin is applied to the table, the selection mode is controlled by the plugin.", this);
 		} else {
 			this.setProperty("selectionMode", sSelectionMode);
-			this._oLegacySelectionPlugin.setSelectionMode(sSelectionMode);
+			this._getSelectionPlugin().setSelectionMode(sSelectionMode);
 		}
 
 		return this;
@@ -2152,52 +2168,52 @@ sap.ui.define([
 	Table.prototype._onBindingChange = function(oEvent) {};
 
 	Table.prototype.setRowMode = function(vRowMode) {
-		this._destroyDefaultRowMode();
+		destroyDefaultRowMode(this);
 		this.setAggregation("rowMode", vRowMode);
-		this._initDefaultRowMode();
+		initDefaultRowMode(this);
 		return this;
 	};
 
 	Table.prototype.destroyRowMode = function() {
 		this.destroyAggregation("rowMode");
 
-		if (!this._oDefaultRowMode) {
-			this._initDefaultRowMode();
+		if (!_private(this).oDefaultRowMode) {
+			initDefaultRowMode(this);
 		}
 
 		return this;
 	};
 
 	/**
-	 * Gets the row mode of the table. If no row mode instance is set, a default row mode is returned.
+	 * Gets the row mode of the table. This is either the applied row mode instance, or the default row mode instance if it was already created.
 	 *
-	 * @returns {sap.ui.table.rowmodes.RowMode} The row mode of the table.
-	 * @private
+	 * @param {sap.ui.table.Table} oTable The table from which to get the row mode.
+	 * @returns {sap.ui.table.rowmodes.RowMode | undefined} The row mode of the table.
 	 */
-	Table.prototype._getRowMode = function() {
-		var vRowMode = this.getRowMode();
+	function getRowMode(oTable) {
+		var vRowMode = oTable.getRowMode();
 
 		/**
 		 * @deprecated As of version 1.119
 		 */
-		if (!this.isDestroyStarted() && !TableUtils.isA(vRowMode, "sap.ui.table.rowmodes.RowMode") && !this._oDefaultRowMode) {
-			this._initDefaultRowMode();
+		if (!oTable.isDestroyStarted() && !TableUtils.isA(vRowMode, "sap.ui.table.rowmodes.RowMode") && !_private(oTable).oDefaultRowMode) {
+			initDefaultRowMode(oTable);
 		}
 
-		return TableUtils.isA(vRowMode, "sap.ui.table.rowmodes.RowMode") ? vRowMode : this._oDefaultRowMode;
-	};
+		return TableUtils.isA(vRowMode, "sap.ui.table.rowmodes.RowMode") ? vRowMode : _private(oTable).oDefaultRowMode;
+	}
 
 	/**
 	 * Initializes a row mode instance with default settings if no row mode instance exists.
 	 *
-	 * @private
+	 * @param {sap.ui.table.Table} oTable The table for which to create a default row mode instance.
 	 */
-	Table.prototype._initDefaultRowMode = function() {
-		const vRowMode = this.getRowMode();
+	function initDefaultRowMode(oTable) {
+		const vRowMode = oTable.getRowMode();
 		const sRowMode = TableUtils.isA(vRowMode, "sap.ui.table.rowmodes.RowMode") ? undefined : vRowMode || RowModeType.Fixed;
 
 		// If row mode is an instance, a default is not needed.
-		if (sRowMode === undefined || this._oDefaultRowMode) {
+		if (sRowMode === undefined || _private(oTable).oDefaultRowMode) {
 			return;
 		}
 
@@ -2205,47 +2221,52 @@ sap.ui.define([
 		 * @deprecated As of version 1.119
 		 */
 		if (vRowMode === null) {
-			switch (this.getVisibleRowCountMode()) {
+			switch (oTable.getVisibleRowCountMode()) {
 				case RowModeType.Fixed:
-					this._oDefaultRowMode = new FixedRowMode(true);
+					_private(oTable).oDefaultRowMode = new FixedRowMode(true);
 					break;
 				case RowModeType.Interactive:
-					this._oDefaultRowMode = new InteractiveRowMode(true);
+					_private(oTable).oDefaultRowMode = new InteractiveRowMode(true);
 					break;
 				case RowModeType.Auto:
-					this._oDefaultRowMode = new AutoRowMode(true);
+					_private(oTable).oDefaultRowMode = new AutoRowMode(true);
 					break;
 				default:
 					throw new Error("Default row mode could not be created");
 			}
 
-			this.addAggregation("_hiddenDependents", this._oDefaultRowMode);
+			oTable.addAggregation("_hiddenDependents", _private(oTable).oDefaultRowMode);
 			return;
 		}
 
 		switch (sRowMode) {
 			case RowModeType.Fixed:
-				this._oDefaultRowMode = new FixedRowMode();
+				_private(oTable).oDefaultRowMode = new FixedRowMode();
 				break;
 			case RowModeType.Interactive:
-				this._oDefaultRowMode = new InteractiveRowMode();
+				_private(oTable).oDefaultRowMode = new InteractiveRowMode();
 				break;
 			case RowModeType.Auto:
-				this._oDefaultRowMode = new AutoRowMode();
+				_private(oTable).oDefaultRowMode = new AutoRowMode();
 				break;
 			default:
 				throw new Error("Default row mode could not be created");
 		}
 
-		this.addAggregation("_hiddenDependents", this._oDefaultRowMode);
-	};
+		oTable.addAggregation("_hiddenDependents", _private(oTable).oDefaultRowMode);
+	}
 
-	Table.prototype._destroyDefaultRowMode = function() {
-		if (this._oDefaultRowMode) {
-			this._oDefaultRowMode.destroy();
-			delete this._oDefaultRowMode;
+	/**
+	 * Destroys the default row mode instance.
+	 *
+	 * @param {sap.ui.table.Table} oTable The table whose default row mode instance to destroy.
+	 */
+	function destroyDefaultRowMode(oTable) {
+		if (_private(oTable).oDefaultRowMode) {
+			_private(oTable).oDefaultRowMode.destroy();
+			delete _private(oTable).oDefaultRowMode;
 		}
-	};
+	}
 
 	/**
 	 * Gets the numbers of scrollable and fixed rows as they are currently computed by the row mode that is applied to the table.
@@ -2254,7 +2275,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Table.prototype._getRowCounts = function() {
-		var mRowCounts = this._getRowMode().getComputedRowCounts();
+		var mRowCounts = getRowMode(this).getComputedRowCounts();
 
 		// TODO: Enhance the RowMode interface and move these calculations to the row modes that support variable row heights.
 		// TableUtils.isVariableRowHeightEnabled can't be used because it calls this method, which causes infinite recursion.
@@ -2269,6 +2290,15 @@ sap.ui.define([
 		return mRowCounts;
 	};
 
+	/**
+	 * Returns whether showing the NoData element is disabled. It can, for example, be disabled with the <code>showNoData</code> property.
+	 *
+	 * @returns {boolean} Whether showing the NoData element is disabled.
+	 */
+	Table.prototype._isNoDataDisabled = function() {
+		return !this.getShowNoData() || (getRowMode(this)?.isNoDataDisabled() ?? false);
+	};
+
 	Table.prototype.setVisibleRowCountMode = function(sVisibleRowCountMode) {
 		if (this.getRowMode()) {
 			Log.warning("If the \"rowMode\" aggregation is set, setting the \"visibleRowCountMode\" has no effect");
@@ -2280,8 +2310,8 @@ sap.ui.define([
 		var sNewVisibleRowCountMode = this.getVisibleRowCountMode();
 
 		if (sNewVisibleRowCountMode !== sOldVisibleRowCountMode) {
-			this._destroyDefaultRowMode();
-			this._initDefaultRowMode();
+			destroyDefaultRowMode(this);
+			initDefaultRowMode(this);
 		}
 
 		return this;
@@ -2382,7 +2412,7 @@ sap.ui.define([
 			iThreshold = Math.max(iRequestLength - mRowCounts.fixedTop - mRowCounts.fixedBottom, iThreshold);
 		}
 
-		iRequestLength = Math.max(iRequestLength, this._getRowMode().getMinRequestLength(), 0);
+		iRequestLength = Math.max(iRequestLength, getRowMode(this).getMinRequestLength(), 0);
 
 		if (!oBinding || iRequestLength === 0) {
 			return [];
@@ -3091,7 +3121,7 @@ sap.ui.define([
 	 * Pushes the sorted column to array.
 	 *
 	 * @param {sap.ui.table.Column} oColumn Column to be sorted
-	 * @param {boolean} bAdd Set to true to add the new sort criterion to the existing sort criteria
+	 * @param {boolean} [bAdd = false] Set to true to add the new sort criterion to the existing sort criteria
 	 * @private
 	 */
 	Table.prototype.pushSortedColumn = function(oColumn, bAdd) {
@@ -3113,8 +3143,7 @@ sap.ui.define([
 
 	/**
 	 * Gets the sorted columns in the order in which sorting was performed through the {@link sap.ui.table.Table#sort} method and menus.
-	 * Does not reflect sorting at binding level or the columns sort visualization set with {@link sap.ui.table.Column#setSorted} and
-	 * {@link sap.ui.table.Column#setSortOrder}.
+	 * Does not reflect sorting at binding level or the columns sort visualization set with {@link sap.ui.table.Column#setSortOrder}.
 	 *
 	 * @see sap.ui.table.Table#sort
 	 * @returns {sap.ui.table.Column[]} Array of sorted columns
@@ -3126,31 +3155,31 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sorts the given column ascending or descending.
+	 * Changes or removes sorting from the table.
 	 *
-	 * @param {sap.ui.table.Column | undefined} oColumn Column to be sorted or undefined to clear sorting
-	 * @param {sap.ui.table.SortOrder} oSortOrder Sort order of the column (if undefined the default will be ascending)
-	 * @param {boolean} bAdd Set to true to add the new sort criterion to the existing sort criteria
+	 * @param {sap.ui.table.Column} [oColumn] Column to be sorted or undefined to clear sorting
+	 * @param {sap.ui.core.SortOrder} [sSortOrder = sap.ui.core.SortOrder.Ascending] Sort order of the column
+	 * @param {boolean} [bAdd = false]
+	 *     Set to <code>true</code> to add the new sort criterion to the existing sort criteria, otherwise to replace it. If the sort order is
+	 *     <code>sap.ui.core.SortOrder.None</code>, this parameter has no effect, and only the sort criterion for this column is removed from the
+	 *     sort criteria.
 	 * @public
 	 */
-	Table.prototype.sort = function(oColumn, oSortOrder, bAdd) {
+	Table.prototype.sort = function(oColumn, sSortOrder, bAdd) {
 		if (!oColumn) {
-			// mimic the list binding sort API, if no column is provided, just restore the default sorting
-			// make sure to also update the sorted property to correctly indicate sorted columns
-			for (var i = 0; i < this._aSortedColumns.length; i++) {
-				this._aSortedColumns[i].setSorted(false);
-			}
-
-			var oBinding = this.getBinding();
-			if (oBinding) {
-				oBinding.sort();
-			}
-
+			// Mimic the list binding sort API. If no column is provided, restore the default sorting.
+			// Make sure to also update the "sortOrder" property to correctly indicate sorted columns.
+			this._aSortedColumns.forEach((oColumn) => {
+				/** @deprecated As of version 1.120 */
+				oColumn.setSorted(false);
+				oColumn.setSortOrder(SortOrder.None);
+			});
+			this.getBinding()?.sort();
 			this._aSortedColumns = [];
 		}
 
 		if (this.getColumns().indexOf(oColumn) >= 0) {
-			oColumn._sort(oSortOrder === SortOrder.Descending, bAdd);
+			oColumn._sort(sSortOrder ?? SortOrder.Ascending, bAdd);
 		}
 	};
 
@@ -3355,6 +3384,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.setSelectedIndex = function(iIndex) {
 		if (this._hasSelectionPlugin()) {
@@ -3371,6 +3403,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.clearSelection = function() {
 		if (this._hasSelectionPlugin()) {
@@ -3390,6 +3425,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.selectAll = function() {
 		if (this._hasSelectionPlugin()) {
@@ -3409,6 +3447,9 @@ sap.ui.define([
 	 * @returns {int[]} Selected indices
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.getSelectedIndices = function() {
 		if (this._hasSelectionPlugin()) {
@@ -3426,6 +3467,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.addSelectionInterval = function(iIndexFrom, iIndexTo) {
 		if (this._hasSelectionPlugin()) {
@@ -3444,6 +3488,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.setSelectionInterval = function(iIndexFrom, iIndexTo) {
 		if (this._hasSelectionPlugin()) {
@@ -3462,6 +3509,9 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.removeSelectionInterval = function(iIndexFrom, iIndexTo) {
 		if (this._hasSelectionPlugin()) {
@@ -3479,6 +3529,9 @@ sap.ui.define([
 	 * @returns {boolean} Whether the index is selected
 	 * @throws {Error} If a selection plugin is applied
 	 * @public
+	 *
+	 * <b>Note:</b> The built-in selection API has limited functionality, especially when it is combined with paging (e.g. OData). Therefore,
+	 * it is recommended to use a selection plugin instead.
 	 */
 	Table.prototype.isIndexSelected = function(iIndex) {
 		if (this._hasSelectionPlugin()) {
@@ -3795,7 +3848,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Table.prototype._getBaseRowHeight = function() {
-		var iBaseRowContentHeight = this._getRowMode().getBaseRowContentHeight();
+		var iBaseRowContentHeight = getRowMode(this).getBaseRowContentHeight();
 
 		if (iBaseRowContentHeight > 0) {
 			return iBaseRowContentHeight + TableUtils.RowHorizontalFrameSize;
@@ -3947,7 +4000,7 @@ sap.ui.define([
 	};
 
 	/**
-	 *
+	 * @deprecated As of version 1.115
 	 * @private
 	 */
 	Table.prototype._onPersoApplied = function() {
@@ -3957,7 +4010,7 @@ sap.ui.define([
 		var aSorters = [];//, aFilters = [];
 		for (var i = 0, l = aColumns.length; i < l; i++) {
 			var oColumn = aColumns[i];
-			if (oColumn.getSorted()) {
+			if (oColumn.getSorted() && oColumn.getSortOrder() !== SortOrder.None) {
 				aSorters.push(new Sorter(oColumn.getSortProperty(), oColumn.getSortOrder() === SortOrder.Descending));
 			}
 		}
@@ -4086,86 +4139,6 @@ sap.ui.define([
 		return this;
 	};
 
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.addPlugin = function(oPlugin) {
-		this.addAggregation("plugins", oPlugin);
-
-		if (TableUtils.isA(oPlugin, "sap.ui.table.plugins.SelectionPlugin")) {
-			this._initSelectionPlugin();
-		}
-
-		return this;
-	};
-
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.insertPlugin = function(oPlugin, iIndex) {
-		this.insertAggregation("plugins", oPlugin, iIndex);
-
-		if (TableUtils.isA(oPlugin, "sap.ui.table.plugins.SelectionPlugin")) {
-			this._initSelectionPlugin();
-		}
-
-		return this;
-	};
-
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.removePlugin = function(oPlugin) {
-		var oRemovedPlugin = this.removeAggregation("plugins", oPlugin);
-
-		if (TableUtils.isA(oRemovedPlugin, "sap.ui.table.plugins.SelectionPlugin")) {
-			this._initSelectionPlugin();
-		}
-
-		return oRemovedPlugin;
-	};
-
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.removeAllPlugins = function() {
-		var aPlugins = this.removeAllAggregation("plugins");
-		this._initSelectionPlugin();
-		return aPlugins;
-	};
-
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	Table.prototype.destroyPlugins = function() {
-		this.destroyAggregation('plugins');
-		this._initSelectionPlugin();
-		return this;
-	};
-
-	/**
-	 * Gets the first plugin of a certain type.
-	 *
-	 * @param {string} sType The type of the plugin.
-	 * @returns {sap.ui.table.plugins.SelectionPlugin|null} The first plugin of a certain type, or <code>null</code> if no plugin of this type exists.
-	 * @private
-	 */
-	Table.prototype.getPlugin = function(sType) {
-		if (typeof sType !== "string") {
-			return null;
-		}
-
-		var aPlugins = this.getPlugins();
-
-		for (var i = 0; i < aPlugins.length; i++) {
-			if (aPlugins[i].isA(sType)) {
-				return aPlugins[i];
-			}
-		}
-
-		return null;
-	};
-
 	/**
 	 * Gets the selection plugin. If no selection plugin is applied to the table, a legacy selection plugin is returned.
 	 *
@@ -4175,12 +4148,6 @@ sap.ui.define([
 	Table.prototype._getSelectionPlugin = function() {
 		var oSelectionPlugin = this._oSelectionPlugin || this._oLegacySelectionPlugin;
 
-		if (!oSelectionPlugin) {
-			// To avoid null checks everywhere if the selection plugin is accessed after destroying the table.
-			this._initLegacySelectionPlugin();
-			oSelectionPlugin = this._oLegacySelectionPlugin;
-		}
-
 		// Temporary fix for the Support Assistant hacks. Support Assistant should implement a selection plugin.
 		// TODO: Before we recommend to implement a selection plugin -> Complete BLI CPOUIFTEAMB-1464
 		if (typeof this._getSelectedIndicesCount === "function" && oSelectionPlugin.getSelectedCount !== this._getSelectedIndicesCount) {
@@ -4205,15 +4172,26 @@ sap.ui.define([
 		return this._oSelectionPlugin != null;
 	};
 
+	function getMainSelectionPlugin(oTable) {
+		var aSelectionPlugins = oTable.getDependents().filter((oPlugin) => oPlugin.isA("sap.ui.table.plugins.SelectionPlugin"));
+
+		/**
+		 * @deprecated As of version 1.120
+		 */
+		aSelectionPlugins.unshift(...oTable.getPlugins());
+
+		return aSelectionPlugins[0];
+	}
+
 	/**
-	 * Initializes the selection plugin used by the table. Attaches event listeners and forwards binding information to the plugin.
+	 * Initializes the selection plugin used by the table. Attaches event listeners.
 	 * The first plugin of type <code>sap.ui.table.plugins.SelectionPlugin</code> in the <code>plugins</code> aggregation is used by the table. If no
 	 * selection plugin is applied, a legacy selection plugin is created.
 	 *
 	 * @private
 	 */
 	Table.prototype._initSelectionPlugin = function() {
-		var oSelectionPlugin = this.getPlugin("sap.ui.table.plugins.SelectionPlugin");
+		var oSelectionPlugin = getMainSelectionPlugin(this);
 
 		if (this.isDestroyed() || this.isDestroyStarted()) {
 			return;
@@ -4221,12 +4199,9 @@ sap.ui.define([
 
 		if (oSelectionPlugin) {
 			this._destroyLegacySelectionPlugin();
-
-			if (oSelectionPlugin !== this._oSelectionPlugin) {
-				detachSelectionPlugin(this, this._oSelectionPlugin);
-				attachSelectionPlugin(this, oSelectionPlugin);
-				this._oSelectionPlugin = oSelectionPlugin;
-			}
+			detachSelectionPlugin(this, this._oSelectionPlugin);
+			attachSelectionPlugin(this, oSelectionPlugin);
+			this._oSelectionPlugin = oSelectionPlugin;
 		} else {
 			this._initLegacySelectionPlugin();
 			detachSelectionPlugin(this, this._oSelectionPlugin);
@@ -4235,12 +4210,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Initializes a legacy selection plugin, if no selection plugin is set in the <code>plugins</code> aggregation.
+	 * Initializes a legacy selection plugin, if no selection plugin is set.
 	 *
 	 * @private
 	 */
 	Table.prototype._initLegacySelectionPlugin = function() {
-		if (this._oLegacySelectionPlugin || this.getPlugin("sap.ui.table.plugins.SelectionPlugin")) {
+		if (this._oLegacySelectionPlugin || getMainSelectionPlugin(this)) {
 			// No legacy selection plugin needs to be created if it already exists, or if a selection plugin is set.
 			return;
 		}
@@ -4251,7 +4226,7 @@ sap.ui.define([
 	};
 
 	Table.prototype._destroyLegacySelectionPlugin = function() {
-		if (this._oLegacySelectionPlugin) {
+		if (this._oLegacySelectionPlugin && !this._oLegacySelectionPlugin.isDestroyStarted()) {
 			this._oLegacySelectionPlugin.destroy();
 			delete this._oLegacySelectionPlugin;
 		}
@@ -4505,6 +4480,51 @@ sap.ui.define([
 		this.setProperty("rowCountConstraints", mConstraints);
 	};
 
-	return Table;
+	function excludeHiddenDepdendents(oTable, aAggregatedObjects) {
+		const aHiddenDependents = oTable.getAggregation("_hiddenDependents") || [];
+		return aAggregatedObjects.filter((oObject) => !aHiddenDependents.includes(oObject));
+	}
 
+	/**
+	 * @inheritDoc
+	 */
+	Table.prototype.findAggregatedObjects = function() {
+		return excludeHiddenDepdendents(this, Control.prototype.findAggregatedObjects.apply(this, arguments));
+	};
+
+	/**
+	 * @inheritDoc
+	 */
+	Table.prototype.findElements = function() {
+		return excludeHiddenDepdendents(this, Control.prototype.findElements.apply(this, arguments));
+	};
+
+	/**
+	 * Returns the first applied plugin for the given plugin type.
+	 *
+	 * @param {string} sType The full class name of the plugin
+	 * @returns {sap.ui.table.plugins.SelectionPlugin|undefined} The found plugin instance, or <code>undefined</code> if not found
+	 * @throws {Error} If the type to search for is not in <code>sap.ui.table.plugins</code>
+	 * @private
+	 * @deprecated As of version 1.120
+	 */
+	Table.prototype.getPlugin = function(sType) {
+		if (!sType || !sType.startsWith("sap.ui.table.plugins.")) {
+			throw new Error("This method can only be used to get plugins of the sap.ui.table library");
+		}
+
+		var oFoundPlugin = this.getDependents().find((oDependent) => {
+			return oDependent.isA(sType);
+		});
+
+		if (!oFoundPlugin) {
+			oFoundPlugin = this.getPlugins().find((oPlugin) => {
+				return oPlugin.isA(sType);
+			});
+		}
+
+		return oFoundPlugin;
+	};
+
+	return Table;
 });