@openui5/sap.ui.table 1.129.0 → 1.130.0

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.m:
 
-Component: purify.js, version: 2.3.8
+Component: purify.js, version: 3.1.7
 Copyright: Mario Heiderich
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.129.0",
+  "version": "1.130.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.129.0",
-    "@openui5/sap.ui.unified": "1.129.0"
+    "@openui5/sap.ui.core": "1.130.0",
+    "@openui5/sap.ui.unified": "1.130.0"
   }
 }

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

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

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @see https://github.com/SAP/odata-vocabularies/blob/main/docs/v2-annotations.md
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -158,7 +158,7 @@ sap.ui.define([
 			dirty: {type: "boolean", group: "Appearance", defaultValue: null, deprecated: true},
 
 			/**
-			 * If set to <code>true</code>, the full set of <code>MenuItem</code> instances shown in to the group header menu. The value
+			 * If set to <code>true</code>, the full set of <code>MenuItem</code> instances is shown in the group header menu. The value
 			 * <code>false</code> means that only a reduced set of group header menu items is shown.
 			 */
 			extendedGroupHeaderMenu: {type: "boolean", group: "Behavior", defaultValue: true, visibility: "hidden"}

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

@@ -63,7 +63,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.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -40,7 +40,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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @since 1.45
 	 *
 	 * @constructor

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

@@ -27,7 +27,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.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -102,7 +102,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -2665,7 +2665,8 @@ sap.ui.define([
 	/**
 	 * Triggers automatic resizing of a column to the widest content.
 	 *
-	 * @experimental Experimental! Presently implemented to only work with a very limited set of controls (e.g. sap.m.Text).
+	 * See {@link sap.ui.table.Column#autoResize} for details about the auto-resize feature.
+	 *
 	 * @param {int} iColIndex The index of the column in the list of visible columns.
 	 * @function
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @since 1.21.1
 	 *
 	 * @constructor

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.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -969,7 +969,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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility

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

@@ -44,7 +44,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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender

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

@@ -274,7 +274,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate
@@ -1019,7 +1019,7 @@ sap.ui.define([
 			const oBusyIndicator = this.getDomRef("busyIndicator");
 			if (oBusyIndicator) {
 				this._getKeyboardExtension().setSilentFocus(oBusyIndicator);
-			} else if (this.getColumnHeaderVisible() && (TableUtils.getVisibleColumnCount(this) || this.getSelectionMode() !== SelectionMode.None)) {
+			} else if (this.getColumnHeaderVisible() && (TableUtils.getVisibleColumnCount(this) || TableUtils.hasRowHeader(this))) {
 				setFocusOnColumnHeaderOfLastFocusedDataCell(this, oEvent);
 			} else if (bNoData) {
 				this._getKeyboardExtension().setSilentFocus(this.$("noDataCnt"));
@@ -1031,7 +1031,7 @@ sap.ui.define([
 				this._getKeyboardExtension().setSilentFocus(oBusyIndicator);
 			} else if (this.getRows().length && !TableUtils.isNoDataVisible(this)) {
 				restoreFocusOnLastFocusedDataCell(this, oEvent);
-			} else if (this.getColumnHeaderVisible() && (TableUtils.getVisibleColumnCount(this) || this.getSelectionMode() !== SelectionMode.None)) {
+			} else if (this.getColumnHeaderVisible() && (TableUtils.getVisibleColumnCount(this) || TableUtils.hasRowHeader(this))) {
 				setFocusOnColumnHeaderOfLastFocusedDataCell(this, oEvent);
 			}
 		}

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

@@ -670,7 +670,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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

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

@@ -2295,7 +2295,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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization

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

@@ -27,14 +27,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.table
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @since 0.8
 	 * @public
 	 */
 	const thisLib = Library.init({
 		name: "sap.ui.table",
 		apiVersion: 2,
-		version: "1.129.0",
+		version: "1.130.0",
 		dependencies: ["sap.ui.core", "sap.ui.unified"],
 		designtime: "sap/ui/table/designtime/library.designtime",
 		types: [
@@ -96,7 +96,7 @@ sap.ui.define([
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @deprecated As of version 1.38, the concept has been discarded.
 	 * @public
@@ -127,7 +127,7 @@ sap.ui.define([
 	/**
 	 * Row Action types.
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -158,7 +158,7 @@ sap.ui.define([
 	/**
 	 * Selection behavior of the table
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -189,7 +189,7 @@ sap.ui.define([
 	/**
 	 * Selection mode of the table
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -227,7 +227,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @public
 	 * @deprecated As of version 1.120, replaced with <code>sap.ui.core.SortOrder</code>
@@ -254,7 +254,7 @@ sap.ui.define([
 	/**
 	 * VisibleRowCountMode of the table
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @deprecated As of version 1.119, see the <code>rowMode</code> aggregation of <code>sap.ui.table.Table</code> for more details.
 	 * @public
@@ -299,7 +299,7 @@ sap.ui.define([
 	 *
 	 * Contains IDs of shared DOM references, which should be accessible to inheriting controls via getDomRef() function.
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -400,7 +400,7 @@ sap.ui.define([
 	 *
 	 * This is an alias for {@link sap.ui.model.TreeAutoExpandMode} and kept for compatibility reasons.
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @typedef {sap.ui.model.TreeAutoExpandMode}
 	 * @public
 	 * @deprecated As of version 1.120, replaced by <code>sap.ui.model.TreeAutoExpandMode</code>
@@ -414,7 +414,7 @@ sap.ui.define([
 	/**
 	 * Mode of a selection plugin
 	 *
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @enum {string}
 	 * @private
 	 */

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

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

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @private
 	 * @alias sap.ui.table.menus.GroupHeaderContextMenuAdapter
 	 */

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.129.0
+	 * @version 1.130.0
 	 * @private
 	 * @alias sap.ui.table.menus.MobileColumnHeaderMenuAdapter
 	 */

package/src/sap/ui/table/messagebundle_et.properties

@@ -6,7 +6,7 @@ TBL_SORT_ASC=Sordi kasvavalt
 TBL_SORT_DESC=Sordi kahanevalt
 TBL_GROUP=Grupp
 TBL_UNGROUP=T\u00FChista grupeering
-TBL_UNGROUP_LEVEL=Ungroup Level
+TBL_UNGROUP_LEVEL=T\u00FChista taseme grupeering
 TBL_UNGROUP_ALL=T\u00FChista k\u00F5ik grupeeringud
 TBL_COLUMNS=Veerud
 TBL_FREEZE=K\u00FClmuta

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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.BindingSelection

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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.SelectionModelSelection

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class Implements the selection methods for a table.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @private
 	 * @since 1.76
 	 * @ui5-restricted sap.ui.mdc
@@ -277,59 +277,56 @@ sap.ui.define([
 			this._aGroupLevels = undefined;
 			this._sSearch = undefined;
 		} else {
-			const aAllUnitProperties = [];
-			let aAllAdditionalProperties = [];
-			let aAdditionalProperties;
+			const oAllUnitPropertyPaths = new Set();
+			const oAllAdditionalPropertyPaths = new Set();
+			const aVisiblePropertyKeys = oAggregateInfo.visible.concat(); // Copy
 
 			// Always use keys in the properties to be grouped
 			this._mGroup = this.getPropertyInfos().reduce(function(mGroup, oPropertyInfo) {
 				if (oPropertyInfo.isKey) {
 					mGroup[oPropertyInfo.path] = {};
-					aAdditionalProperties = getAdditionalPropertyPaths(this, oPropertyInfo);
-					if (aAdditionalProperties) {
-						mGroup[oPropertyInfo.path].additionally = aAdditionalProperties;
-						aAllAdditionalProperties.concat(aAdditionalProperties);
-					}
 				}
 				return mGroup;
-			}.bind(this), {});
-
+			}, {});
 			this._mAggregate = {};
 
-			// Find grouped and aggregated properties
-			const aVisible = oAggregateInfo.visible.concat();	// Copy
+			// We need to consider groupLevels as visible properties, to add them in the query properly if they have additional properties
 			if (oAggregateInfo.groupLevels) {
-				// We need to consider groupLevels as visible properties, to add them in the query properly if they have an 'additionally' property
 				oAggregateInfo.groupLevels.forEach(function(sGroupLevelName) {
-					if (aVisible.indexOf(sGroupLevelName) < 0) {
-						aVisible.push(sGroupLevelName);
+					if (aVisiblePropertyKeys.indexOf(sGroupLevelName) < 0) {
+						aVisiblePropertyKeys.push(sGroupLevelName);
 					}
 				});
 			}
-			aVisible.forEach(function(sVisiblePropertyName) {
-				const oPropertyInfo = this.findPropertyInfo(sVisiblePropertyName);
 
-				if (!oPropertyInfo) {
-					return;
+			for (const sPropertyKey of aVisiblePropertyKeys) {
+				const oPropertyInfo = this.findPropertyInfo(sPropertyKey);
+
+				if (!oPropertyInfo || !oPropertyInfo.groupable && !oPropertyInfo.aggregatable) {
+					continue;
 				}
 
+				// Skip text property if its id is visible.
+				const oAdditionalProperty = this.findPropertyInfo(oPropertyInfo.additionalProperties?.[0]);
+				if (oAdditionalProperty?.text === oPropertyInfo.key && aVisiblePropertyKeys.includes(oAdditionalProperty.key)) {
+					continue;
+				}
+
+				// TODO: We cannot really support properties that are both groupable and aggregatable. Either text or unit will be missing. Let
+				// property validation fail in MDC if both technicallyAggregatable and technicallyGroupable are true?
+
 				if (oPropertyInfo.groupable) {
 					this._mGroup[oPropertyInfo.path] = {};
-					aAdditionalProperties = getAdditionalPropertyPaths(this, oPropertyInfo);
-					if (aAdditionalProperties) {
-						this._mGroup[oPropertyInfo.path].additionally = aAdditionalProperties;
-						aAllAdditionalProperties = aAllAdditionalProperties.concat(aAdditionalProperties);
-					}
 				}
 
 				if (oPropertyInfo.aggregatable) {
 					this._mAggregate[oPropertyInfo.path] = {};
 
-					if (oAggregateInfo.grandTotal && (oAggregateInfo.grandTotal.indexOf(sVisiblePropertyName) >= 0)) {
+					if (oAggregateInfo.grandTotal && (oAggregateInfo.grandTotal.indexOf(oPropertyInfo.key) >= 0)) {
 						this._mAggregate[oPropertyInfo.path].grandTotal = true;
 					}
 
-					if (oAggregateInfo.subtotals && (oAggregateInfo.subtotals.indexOf(sVisiblePropertyName) >= 0)) {
+					if (oAggregateInfo.subtotals && (oAggregateInfo.subtotals.indexOf(oPropertyInfo.key) >= 0)) {
 						this._mAggregate[oPropertyInfo.path].subtotals = true;
 					}
 
@@ -337,30 +334,34 @@ sap.ui.define([
 						const oUnitPropertyInfo = this.findPropertyInfo(oPropertyInfo.unit);
 						if (oUnitPropertyInfo) {
 							this._mAggregate[oPropertyInfo.path].unit = oUnitPropertyInfo.path;
-							aAllUnitProperties.push(oUnitPropertyInfo.path);
+							oAllUnitPropertyPaths.add(oUnitPropertyInfo.path);
 						}
 					}
 
-					if (oPropertyInfo.aggregationDetails &&
-						oPropertyInfo.aggregationDetails.customAggregate &&
-						oPropertyInfo.aggregationDetails.customAggregate.contextDefiningProperties) {
-
+					if (!oPropertyInfo.additionalProperties?.length && oPropertyInfo.aggregationDetails?.customAggregate?.contextDefiningProperties) {
 						oPropertyInfo.aggregationDetails.customAggregate.contextDefiningProperties.forEach(function(sContextDefiningPropertyName) {
 							const oDefiningPropertyInfo = this.findPropertyInfo(sContextDefiningPropertyName);
 							if (oDefiningPropertyInfo) {
 								this._mGroup[oDefiningPropertyInfo.path] = {};
-								aAdditionalProperties = getAdditionalPropertyPaths(this, oPropertyInfo);
-								if (aAdditionalProperties) {
-									this._mGroup[oDefiningPropertyInfo.path].additionally = aAdditionalProperties;
-									aAllAdditionalProperties = aAllAdditionalProperties.concat(aAdditionalProperties);
-								}
 							}
 						}.bind(this));
 					}
 				}
-			}.bind(this));
 
-			// Handle group levels
+				// Additional properties
+				const aAdditionalPropertyPaths = getAdditionalPropertyPaths(this, oPropertyInfo);
+
+				if (oPropertyInfo.aggregatable) {
+					for (const sPropertyPath of aAdditionalPropertyPaths) {
+						this._mGroup[sPropertyPath] = {};
+					}
+				} else if (oPropertyInfo.groupable && oPropertyInfo.path in this._mGroup) {
+					this._mGroup[oPropertyInfo.path].additionally = aAdditionalPropertyPaths;
+					aAdditionalPropertyPaths.forEach((sPath) => oAllAdditionalPropertyPaths.add(sPath));
+				}
+			}
+
+			// Visual grouping (expandable groups)
 			this._aGroupLevels = [];
 			if (oAggregateInfo.groupLevels) {
 				oAggregateInfo.groupLevels.forEach(function(sGroupLevelName) {
@@ -375,29 +376,22 @@ sap.ui.define([
 			}
 
 			// Sanitize the aggregation info
-			Object.keys(this._mGroup).forEach(function(sKey) {
+			for (const sPath in this._mGroup) {
 				// A property may not be in both "group" and "aggregate".
-				if (this._mAggregate.hasOwnProperty(sKey)) {
-					if (this._mAggregate[sKey].grandTotal || this._mAggregate[sKey].subtotals) {
-						delete this._mGroup[sKey];
-						return;
+				if (sPath in this._mAggregate) {
+					if (this._mAggregate[sPath].grandTotal || this._mAggregate[sPath].subtotals) {
+						delete this._mGroup[sPath];
+						continue;
 					} else {
-						delete this._mAggregate[sKey];
+						delete this._mAggregate[sPath];
 					}
 				}
 
-				// A property may not be in "group.additionally" if it is in "aggregation.unit".
-				if (this._mGroup[sKey].additionally) {
-					this._mGroup[sKey].additionally = this._mGroup[sKey].additionally.filter(function(sAdditionalProperty) {
-						return aAllUnitProperties.indexOf(sAdditionalProperty) === -1;
-					});
-				}
-
 				// A property may not be in "group" if it is in "group.additionally".
-				if (aAllAdditionalProperties.indexOf(sKey) > -1) {
-					delete this._mGroup[sKey];
+				if (oAllAdditionalPropertyPaths.has(sPath)) {
+					delete this._mGroup[sPath];
 				}
-			}.bind(this));
+			}
 
 			this._sSearch = oAggregateInfo.search;
 		}
@@ -431,14 +425,19 @@ sap.ui.define([
 	};
 
 	function getAdditionalPropertyPaths(oPlugin, oPropertyInfo) {
+		const oPropertyPaths = new Set();
+
 		if (oPropertyInfo.text) {
 			const oTextPropertyInfo = oPlugin.findPropertyInfo(oPropertyInfo.text);
-			if (oTextPropertyInfo) {
-				return [oTextPropertyInfo.path];
-			}
+			oPropertyPaths.add(oTextPropertyInfo.path);
+		}
+
+		for (const sPropertyKey of oPropertyInfo.additionalProperties ?? []) {
+			const oPropertyInfo = oPlugin.findPropertyInfo(sPropertyKey);
+			oPropertyPaths.add(oPropertyInfo.path);
 		}
 
-		return null;
+		return Array.from(oPropertyPaths);
 	}
 
 	function expandRow(oRow) {

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 */
 	const AutoRowMode = RowMode.extend("sap.ui.table.rowmodes.Auto", /** @lends sap.ui.table.rowmodes.Auto.prototype */ {
 		metadata: {

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 */
 	const FixedRowMode = RowMode.extend("sap.ui.table.rowmodes.Fixed", /** @lends sap.ui.table.rowmodes.Fixed.prototype */ {
 		metadata: {

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

@@ -27,16 +27,9 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
 	 * @class
-	 * The user can change the number of displayed rows by dragging a resizer.
-	 *
-	 * The following restrictions apply:
-	 * <ul>
-	 *   <li>The functionality targets only the mouse interaction (drag and drop). There is no keyboard alternative available.
-	 *       An accessible alternative must be provided by applications, for example, by giving the user the possibility to enter
-	 *       the number of required rows in an input field.</li>
-	 *   <li>The resize interaction is not optimized for touch devices from a design and interaction perspective.
-	 *       We do not recommend to use this mode in such scenarios.</li>
-	 * </ul>
+	 * The user can change the number of displayed rows by dragging a resizer. The resizer is focusable and allows resizing via keyboard shortcuts and
+	 * context menu.
+	 * Double clicking the bar performs a quick resize that toggles between the minimum, the default, and the maximum row count.
 	 *
 	 * @extends sap.ui.table.rowmodes.RowMode
 	 * @constructor
@@ -45,7 +38,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 */
 	const InteractiveRowMode = RowMode.extend("sap.ui.table.rowmodes.Interactive", /** @lends sap.ui.table.rowmodes.Interactive.prototype */ {
 		metadata: {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 */
 	const RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
 		metadata: {

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

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

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

@@ -216,7 +216,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private

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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._ColumnUtils
 	 * @private

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

@@ -24,7 +24,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.129.0
+	 * @version 1.130.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", "sap/ui/model/ChangeReason"], function(Da
 	 * - 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.129.0
+	 * @version 1.130.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

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

@@ -42,7 +42,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.129.0
+	 * @version 1.130.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private