@openui5/sap.ui.mdc 1.136.7 → 1.136.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.mdc",
-  "version": "1.136.7",
+  "version": "1.136.8",
   "description": "OpenUI5 UI Library sap.ui.mdc",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.136.7",
-    "@openui5/sap.ui.core": "1.136.7",
-    "@openui5/sap.ui.layout": "1.136.7"
+    "@openui5/sap.m": "1.136.8",
+    "@openui5/sap.ui.core": "1.136.8",
+    "@openui5/sap.ui.layout": "1.136.8"
   }
 }

package/src/sap/ui/mdc/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.136.7</version>
+	<version>1.136.8</version>
 
 	<documentation>UI5 library: sap.ui.mdc</documentation>
 

package/src/sap/ui/mdc/ActionToolbar.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * The content aggregation of the control must not be used.
 	 * @extends sap.m.OverflowToolbar
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @since 1.58
 	 * @private

package/src/sap/ui/mdc/Chart.js

@@ -79,7 +79,7 @@ sap.ui.define([
 		 * @extends sap.ui.mdc.Control
 		 * @borrows sap.ui.mdc.mixin.FilterIntegrationMixin.rebind as #rebind
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @constructor
 		 *
 		 * @public

package/src/sap/ui/mdc/Control.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as #awaitControlDelegate

package/src/sap/ui/mdc/DefaultTypeMap.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @public
 	 * @since 1.114.0
 	 * @namespace

package/src/sap/ui/mdc/Element.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as #awaitControlDelegate

package/src/sap/ui/mdc/Field.js

@@ -54,13 +54,13 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @see {@link topic:1dd2aa91115d43409452a271d11be95b sap.ui.mdc}
 	 * @see {@link topic:5260b9ca249f465ab33769b9edb442aa Field Building Block (OData V4)}
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @since 1.54.0
 	 * @public
 	 */

package/src/sap/ui/mdc/FilterBar.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * The metadata information is provided via the {@link module:sap/ui/mdc/FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @public
 	 * @since 1.61.0

package/src/sap/ui/mdc/FilterField.js

@@ -53,13 +53,13 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @see {@link topic:1dd2aa91115d43409452a271d11be95b sap.ui.mdc}
 	 * @see {@link topic:2df783760a8e4540ad19ce5ec3ed91c8 FilterField Building Block (OData V4)}
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @since 1.48.0
 	 * @public
 	 */

package/src/sap/ui/mdc/Link.js

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link

package/src/sap/ui/mdc/MultiValueField.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @since 1.93.0
 	 *
 	 * @public

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

@@ -1398,6 +1398,8 @@ sap.ui.define([
 
 		if (!deepEqual(aOldP13nMode.sort(), this.getP13nMode().sort())) {
 			updateP13nSettings(this);
+			updateColumnMenu(this);
+			this.invalidate(); // Inner columns must update aria-haspopup
 		}
 
 		return this;
@@ -1443,6 +1445,16 @@ sap.ui.define([
 		this.getEngine().register(this, oRegisterConfig);
 	};
 
+	function updateColumnMenu(oTable) {
+		const bIsColumnMenuEnabled = oTable.getActiveP13nModes().length > 0;
+
+		if (bIsColumnMenuEnabled) {
+			oTable._createColumnHeaderMenu();
+		} else {
+			oTable._destroyColumnHeaderMenu();
+		}
+	}
+
 	function updateP13nSettings(oTable) {
 		oTable._updateP13nButton();
 
@@ -2702,21 +2714,33 @@ sap.ui.define([
 			insertFilterInfoBar(this);
 		}
 
-		if (!this._oColumnHeaderMenu) {
-			this._oQuickActionContainer = new QuickActionContainer({ table: this });
-			this._oColumnHeaderMenu = new ColumnMenu({
-				id: this.getId() + "-columnHeaderMenu",
-				showTableSettingsButton: true
-			});
-			this._oColumnHeaderMenu.addAggregation("_quickActions", this._oQuickActionContainer);
-			this.addDependent(this._oColumnHeaderMenu);
+		updateColumnMenu(this);
 
-			FESRHelper.setSemanticStepname(this._oColumnHeaderMenu, "beforeOpen", "mdc:tbl:p13n:col");
+		this._updateInvisibleTitle();
+	};
 
-			this._oColumnHeaderMenu.attachBeforeOpen(this._createColumnMenuContent, this);
+	Table.prototype._createColumnHeaderMenu = function() {
+		if (this._oColumnHeaderMenu) {
+			return;
 		}
 
-		this._updateInvisibleTitle();
+		this._oQuickActionContainer = new QuickActionContainer({table: this});
+		this._oColumnHeaderMenu = new ColumnMenu({
+			id: this.getId() + "-columnHeaderMenu",
+			showTableSettingsButton: true
+		});
+		this._oColumnHeaderMenu.addAggregation("_quickActions", this._oQuickActionContainer);
+		this.addDependent(this._oColumnHeaderMenu);
+
+		FESRHelper.setSemanticStepname(this._oColumnHeaderMenu, "beforeOpen", "mdc:tbl:p13n:col");
+
+		this._oColumnHeaderMenu.attachBeforeOpen(this._createColumnMenuContent, this);
+	};
+
+	Table.prototype._destroyColumnHeaderMenu = function() {
+		this._oColumnHeaderMenu?.destroy();
+		delete this._oColumnHeaderMenu;
+		delete this._oQuickActionContainer;
 	};
 
 	Table.prototype._createColumnMenuContent = function(oEvent) {

package/src/sap/ui/mdc/ValueHelp.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * and {@link sap.ui.mdc.FilterField FilterField} controls using the <code>valueHelp</code> association. One <code>ValueHelp</code> element instance can be
 	 * assigned to multiple fields (like in different table rows). It should be placed in the control tree on the container holding the fields.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar} control with given layout information that determines where the wrapped control is displayed on the <code>ActionToolbar</code>.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @since 1.58
 	 * @public

package/src/sap/ui/mdc/chart/ChartImplementationContainer.js

@@ -21,7 +21,7 @@ sap.ui.define([
 		 * @class The <code>ChartImplementationContainer</code> creates a container for the <code>content</code> (chart) and <code>noDataContent</code>. Based on the <code>showNoDataStruct</code> the <code>content</code> or <code>noDataContent</code> will be shown.
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @constructor
 		 *
 		 * @public

package/src/sap/ui/mdc/chart/ChartSelectionDetails.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class The <code>ChartSelectionDetails</code> control creates a <code>sap.m.SelectionDetails</code> popover based on metadata and the configuration specified.
 	 * @extends sap.m.SelectionDetails
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @public
 	 * @experimental As of version 1.88

package/src/sap/ui/mdc/chart/PropertyHelper.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @private
 	 * @since 1.83

package/src/sap/ui/mdc/chart/ToolbarControlFactory.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.mdc.chart.ToolbarControlFactory
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @since 1.123
 	 * @experimental
 	 * @private

package/src/sap/ui/mdc/condition/Condition.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *

package/src/sap/ui/mdc/condition/ConditionConverter.js

@@ -24,7 +24,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 * @since 1.74.0

package/src/sap/ui/mdc/condition/ConditionModel.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.json.JSONModel
 		 *
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *

package/src/sap/ui/mdc/condition/FilterConverter.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.78.0
 		 * @alias sap.ui.mdc.condition.FilterConverter
 		 *

package/src/sap/ui/mdc/condition/FilterOperatorUtil.js

@@ -68,7 +68,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *

package/src/sap/ui/mdc/condition/Operator.js

@@ -136,7 +136,7 @@ sap.ui.define([
 	 * @param {function} [oConfiguration.getTextForCopy] Function to determine the text copied into clipboard
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @public
 	 * @alias sap.ui.mdc.condition.Operator
 	 * @since 1.73.0

package/src/sap/ui/mdc/condition/OperatorDynamicDateOption.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.m.DynamicDateOption
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -39,7 +39,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @public
 		 * @alias sap.ui.mdc.condition.RangeOperator
 		 * @since 1.74.0

package/src/sap/ui/mdc/field/ConditionType.js

@@ -61,7 +61,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 *
 		 * @since 1.62.0
 		 * @public

package/src/sap/ui/mdc/field/ConditionTypeMixin.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.121.0
 		 * @alias sap.ui.mdc.field.ConditionTypeUtils
 		 *

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -54,7 +54,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 *
 		 * @since 1.62.0
 		 * @public

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/DynamicDateRangeConditionsType.js

@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.mdc.field.ConditionsType
 		 *
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 *
 		 * @since 1.96.0
 		 * @public

package/src/sap/ui/mdc/field/FieldBase.js

@@ -101,7 +101,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent, sap.ui.core.ILabelable
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * This is the basis for link-features. If the link is pressed a popover might be opened.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @since 1.54.0
 	 * @public

package/src/sap/ui/mdc/field/FieldInput.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.Input Input} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.Input
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -16,7 +16,7 @@ sap.ui.define([
 		 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 		 *
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @since 1.86.0
 		 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 		 *

package/src/sap/ui/mdc/field/FieldMultiInput.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.MultiInput MultiInput} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.MultiInput
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.valuehelp.content.FixedListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Base type for <code>MultiValueFieldItem</code> control.
 	 * The {@link sap.ui.mdc.MultiValueField MultiValueField} holds its values as items. The <code>MultiValueFieldItem</code> element defines these items.
 	 * @extends sap.ui.core.Element
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @since 1.93.0
 	 * @public

package/src/sap/ui/mdc/field/TokenDisplay.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.Token Token} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.Token
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenizerDisplay.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * It enhances the {@link sap.m.Tokenizer Tokenizer} control to support display only tokens.
 	 * @extends sap.m.Tokenizer
 	 * @implements sap.ui.core.ILabelable
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @abstract
 	 *

package/src/sap/ui/mdc/filterbar/FilterBarBase.js

@@ -72,7 +72,7 @@ sap.ui.define([
 		 * @class The <code>FilterBarBase</code> control is the base for filter displaying controls in MDC.
 		 * @extends sap.ui.mdc.Control
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @constructor
 		 * @public
 		 * @since 1.80.0

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 *
 	 * @private
 	 * @since 1.95

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * <b>Note:</b> The <code>FilterBar</code> can only be used for a {@link sap.ui.mdc.valuehelp.Dialog Dialog} and not on its own.
 		 * @extends sap.ui.mdc.valuehelp.FilterBar
 		 * @author SAP SE
-		 * @version 1.136.7
+		 * @version 1.136.8
 		 * @constructor
 		 * @public
 		 * @since 1.84.0

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex', './PropertyInfoFlex'], (Fi
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 */
 
 	const oFilterItemFlex = Object.assign({}, ItemBaseFlex);

package/src/sap/ui/mdc/flexibility/SortFlex.js

@@ -9,8 +9,9 @@ sap.ui.define([
 	"sap/ui/fl/changeHandler/Base",
 	"sap/ui/fl/changeHandler/condenser/Classification",
 	"sap/ui/fl/changeHandler/common/ChangeCategories",
-	"./helpers/addKeyOrName"
-], (merge, Util, FLChangeHandlerBase, CondenserClassification, ChangeCategories, addKeyOrName) => {
+	"./helpers/addKeyOrName",
+	"./helpers/getAffectedSorter"
+], (merge, Util, FLChangeHandlerBase, CondenserClassification, ChangeCategories, addKeyOrName, getAffectedSorter) => {
 	"use strict";
 
 	const fFinalizeSortChange = function(oChange, oControl, oSortContent, bIsRevert) {
@@ -174,7 +175,13 @@ sap.ui.define([
 		revert: fRemoveSort,
 		getCondenserInfo: function(oChange, mPropertyBag) {
 			return {
-				affectedControl: { id: addKeyOrName(oChange.getContent()).key },
+				// DINC0635408: If the application uses flex without backend condensing, the following action will result in a faulty condensing behaviour:
+				// addSort(asc) -> save variant -> removeSort(asc) -> addSort(desc) == addSort(asc) !! expected outcome is addSort(desc)
+				// This is due to the fact, that in those cases only the additional changes applied are considered for condensing, leading to removeSort, addSort canceling each other out,
+				// as they do not have any differing information (both have the same "affectedControl").
+				// To circumvent this issue (also will happen in RTA), we add the sort order to the affectedControl id, to provide a proper distinction during condensing.
+				// This does not have any effect on the actual change, as condensing (and the affectedControl) is not stored in the change, but solely used during runtime.
+				affectedControl: { id: getAffectedSorter(oChange.getContent()) },
 				affectedControlIdProperty: "name",
 				targetContainer: oChange.getSelector(),
 				targetAggregation: "sorters",
@@ -196,7 +203,7 @@ sap.ui.define([
 		revert: fAddSort,
 		getCondenserInfo: function(oChange, mPropertyBag) {
 			return {
-				affectedControl: { id: addKeyOrName(oChange.getContent()).key },
+				affectedControl: { id: getAffectedSorter(oChange.getContent()) },
 				affectedControlIdProperty: "name",
 				targetContainer: oChange.getSelector(),
 				targetAggregation: "sorters",
@@ -218,7 +225,7 @@ sap.ui.define([
 		revert: fMoveSort,
 		getCondenserInfo: function(oChange, mPropertyBag) {
 			return {
-				affectedControl: { id: addKeyOrName(oChange.getContent()).key },
+				affectedControl: { id: getAffectedSorter(oChange.getContent()) },
 				affectedControlIdProperty: "name",
 				targetContainer: oChange.getSelector(),
 				targetAggregation: "sorters",

package/src/sap/ui/mdc/flexibility/actiontoolbar/CombineAction.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.actiontoolbar.CombineAction
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 */
 	const CombineAction = {
 		...CombineButtonsHandler

package/src/sap/ui/mdc/flexibility/actiontoolbar/SplitAction.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.actiontoolbar.SplitAction
 	 * @author SAP SE
-	 * @version 1.136.7
+	 * @version 1.136.8
 	 */
 	const SplitAction = {
 		...SplitMenuButtonHandler,