@openui5/sap.ui.rta 1.131.1 → 1.132.0

package/src/sap/ui/rta/command/CommandFactory.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -384,7 +384,7 @@ sap.ui.define([
 			noSelector: true
 		},
 		annotation: {
-			clazz: "sap/ui/rta/command/Annotation",
+			clazz: "sap/ui/rta/command/AnnotationCommand",
 			noSelector: true
 		},
 		addIFrame: {
@@ -493,7 +493,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/CompositeCommand.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/ControlVariantConfigure.js

@@ -1,12 +1,13 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
+	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/command/BaseCommand",
@@ -15,6 +16,7 @@ sap.ui.define([
 	JsControlTreeModifier,
 	ControlVariantApplyAPI,
 	FlexRuntimeInfoAPI,
+	VariantManager,
 	ChangesWriteAPI,
 	FlUtils,
 	BaseCommand,
@@ -28,7 +30,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.52
@@ -99,7 +101,7 @@ sap.ui.define([
 		this.getChanges().forEach(function(mChangeProperties) {
 			mChangeProperties.appComponent = this.oAppComponent;
 			mChangeProperties.generator = rtaLibrary.GENERATOR_NAME;
-			this._aPreparedChanges.push(this.oModel.addVariantChange(this.sVariantManagementReference, mChangeProperties));
+			this._aPreparedChanges.push(VariantManager.addVariantChange(this.sVariantManagementReference, mChangeProperties));
 		}.bind(this));
 
 		this._aDeletedFlexObjects = ChangesWriteAPI.deleteVariantsAndRelatedObjects({
@@ -125,7 +127,9 @@ sap.ui.define([
 		delete this._aDeletedFlexObjects;
 
 		this.getChanges().forEach(function(mChangeProperties, index) {
-			const mPropertyBag = {};
+			const mPropertyBag = {
+				appComponent: this.oAppComponent
+			};
 			Object.keys(mChangeProperties).forEach(function(sProperty) {
 				var sOriginalProperty = `original${sProperty.charAt(0).toUpperCase()}${sProperty.substr(1)}`;
 				if (sProperty === "visible") {
@@ -138,7 +142,7 @@ sap.ui.define([
 				}
 			});
 			var oChange = this._aPreparedChanges[index];
-			this.oModel.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange);
+			VariantManager.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange);
 		}.bind(this));
 
 		this._aPreparedChanges = null;

package/src/sap/ui/rta/command/ControlVariantSave.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

package/src/sap/ui/rta/command/ControlVariantSaveAs.js

@@ -1,10 +1,11 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/Utils",
@@ -13,6 +14,7 @@ sap.ui.define([
 	"sap/ui/rta/Utils"
 ], function(
 	JsControlTreeModifier,
+	VariantManager,
 	ContextSharingAPI,
 	PersistenceWriteAPI,
 	flUtils,
@@ -28,7 +30,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -115,7 +117,7 @@ sap.ui.define([
 		mParams.layer = this.sLayer;
 		mParams.newVariantReference = this.sNewVariantReference;
 		mParams.generator = rtaLibrary.GENERATOR_NAME;
-		return this.oModel._handleSave(this.oVariantManagementControl, mParams)
+		return VariantManager.handleSaveEvent(this.oVariantManagementControl, mParams, this.oModel)
 		.then(function(aDirtyChanges) {
 			this._aPreparedChanges = aDirtyChanges;
 			[this._oVariantChange] = aDirtyChanges;
@@ -151,11 +153,11 @@ sap.ui.define([
 				variant: this._oVariantChange,
 				sourceVariantReference: this.getSourceVariantReference(),
 				variantManagementReference: this.sVariantManagementReference,
-				component: this.oAppComponent
+				appComponent: this.oAppComponent
 			};
 
-			await this.oModel.removeVariant(mPropertyBag, true);
-			await this.oModel.addAndApplyChangesOnVariant(this._aControlChangesWithoutVariant);
+			await VariantManager.removeVariant(mPropertyBag, true);
+			await VariantManager.addAndApplyChangesOnVariant(this._aControlChangesWithoutVariant, this.oAppComponent);
 			this._aPreparedChanges = null;
 			this._oVariantChange = null;
 		}

package/src/sap/ui/rta/command/ControlVariantSetTitle.js

@@ -1,20 +1,22 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/rta/command/BaseCommand",
-	"sap/ui/rta/library",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/variants/VariantManager",
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/command/BaseCommand",
+	"sap/ui/rta/library"
 ], function(
-	BaseCommand,
-	rtaLibrary,
 	JsControlTreeModifier,
 	ControlVariantApplyAPI,
-	flUtils
+	VariantManager,
+	flUtils,
+	BaseCommand,
+	rtaLibrary
 ) {
 	"use strict";
 
@@ -24,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -87,7 +89,7 @@ sap.ui.define([
 			generator: rtaLibrary.GENERATOR_NAME
 		};
 
-		return Promise.resolve(this.oModel.addVariantChange(this.sVariantManagementReference, mPropertyBag))
+		return Promise.resolve(VariantManager.addVariantChange(this.sVariantManagementReference, mPropertyBag))
 		.then(function(oChange) {
 			this._oVariantChange = oChange;
 		}.bind(this));
@@ -102,11 +104,12 @@ sap.ui.define([
 		var mPropertyBag = {
 			variantReference: this.sCurrentVariant,
 			changeType: "setTitle",
-			title: this.getOldText()
+			title: this.getOldText(),
+			appComponent: this.oAppComponent
 		};
 		var oChange = this._oVariantChange;
 
-		return Promise.resolve(this.oModel.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange))
+		return Promise.resolve(VariantManager.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange))
 		.then(function() {
 			this._oVariantChange = null;
 		}.bind(this));

package/src/sap/ui/rta/command/ControlVariantSwitch.js

@@ -1,16 +1,18 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
+	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/command/BaseCommand"
 ], function(
 	JsControlTreeModifier,
 	ControlVariantApplyAPI,
+	VariantManager,
 	flUtils,
 	BaseCommand
 ) {
@@ -22,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -59,7 +61,7 @@ sap.ui.define([
 	});
 
 	function discardVariantContent(sVReference) {
-		return this.oModel.eraseDirtyChangesOnVariant(this.sVariantManagementReference, sVReference)
+		return VariantManager.eraseDirtyChangesOnVariant(this.sVariantManagementReference, sVReference, this._getAppComponent())
 		.then(function(aDirtyChanges) {
 			this.setDiscardedChanges(aDirtyChanges);
 		}.bind(this));
@@ -107,7 +109,7 @@ sap.ui.define([
 		.then(function() {
 			// When discarding, dirty changes on source variant need to be applied AFTER the switch
 			if (this.getDiscardVariantContent()) {
-				return this.oModel.addAndApplyChangesOnVariant(this.getDiscardedChanges())
+				return VariantManager.addAndApplyChangesOnVariant(this.getDiscardedChanges(), this._getAppComponent())
 				.then(function() {
 					this.setDiscardedChanges([]);
 					this.oModel.checkUpdate(true);

package/src/sap/ui/rta/command/CreateContainer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/CustomAdd.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

package/src/sap/ui/rta/command/FlexCommand.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/LREPSerializer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.42

package/src/sap/ui/rta/command/LocalReset.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

package/src/sap/ui/rta/command/Move.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -17,7 +17,7 @@ function(
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Property.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Remove.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.42

package/src/sap/ui/rta/command/Rename.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Resize.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

package/src/sap/ui/rta/command/Reveal.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Settings.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Split.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/command/Stack.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/appDescriptor/AddLibrary.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.AppDescriptorCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/compVariant/CompVariantContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.102

package/src/sap/ui/rta/command/compVariant/CompVariantSaveAs.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantSwitch.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantUpdate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.0
 	 * @constructor
 	 * @private
 	 * @since 1.87
@@ -41,6 +41,9 @@ sap.ui.define([
 				oldDefaultVariantId: {
 					type: "string"
 				},
+				oldSelectedVariantId: {
+					type: "string"
+				},
 				onlySave: {
 					type: "boolean"
 				},
@@ -91,6 +94,11 @@ sap.ui.define([
 				if (oValue.deleted) {
 					callFlAPIFunction.call(this, "removeVariant", sVariantId, {});
 					this.getElement().removeVariant({variantId: sVariantId});
+					// Redo of delete command without direct UI interaction in VM dialog can keep deleted variant in the control.
+					// In this case we need to reactivate the *standard* variant
+					if (this.getElement().getCurrentVariantId() === sVariantId) {
+						this.getElement().activateVariant("*standard*");
+					}
 				} else {
 					var oVariant = callFlAPIFunction.call(this, "updateVariantMetadata", sVariantId, oValue);
 					this.getElement().updateVariant(oVariant);
@@ -119,6 +127,10 @@ sap.ui.define([
 				var oVariant = callFlAPIFunction.call(this, "revert", sVariantId, {});
 				if (oValue.deleted) {
 					this.getElement().addVariant(oVariant);
+					// If the current selected variant is deleted, the undo action should reactivate it
+					if (this.getOldSelectedVariantId() === sVariantId) {
+						this.getElement().activateVariant(sVariantId);
+					}
 				} else {
 					this.getElement().updateVariant(oVariant);
 				}

package/src/sap/ui/rta/enablement/TestDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([