@openui5/sap.ui.rta 1.109.0 → 1.111.0

package/src/sap/ui/rta/Utils.js

@@ -1,11 +1,10 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/ui/thirdparty/jquery",
 	"sap/ui/fl/write/api/FieldExtensibility",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
@@ -19,10 +18,10 @@ sap.ui.define([
 	"sap/ui/rta/util/BindingsExtractor",
 	"sap/base/util/restricted/_omit",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/Fragment"
+	"sap/ui/core/Fragment",
+	"sap/ui/core/Core"
 ],
 function(
-	jQuery,
 	FieldExtensibility,
 	FlexUtils,
 	Layer,
@@ -36,7 +35,8 @@ function(
 	BindingsExtractor,
 	_omit,
 	JSONModel,
-	Fragment
+	Fragment,
+	Core
 ) {
 	"use strict";
 
@@ -45,7 +45,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @since 1.30
@@ -99,11 +99,12 @@ function(
 						if (bServiceOutdated) {
 							FieldExtensibility.setServiceValid(oModel.sServiceUrl);
 							//needs FLP to trigger UI restart popup
-							sap.ui.getCore().getEventBus().publish("sap.ui.core.UnrecoverableClientStateCorruption", "RequestReload", {});
+							Core.getEventBus().publish("sap.ui.core.UnrecoverableClientStateCorruption", "RequestReload", {});
 						}
 					});
 				}
 			}
+			return undefined;
 		});
 	};
 
@@ -115,7 +116,7 @@ function(
 	 * @returns{Promise} The Promise which resolves when popup is closed (via Remove OR Cancel actions)
 	 */
 	Utils.openRemoveConfirmationDialog = function(oElement, sText) {
-		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+		var oTextResources = Core.getLibraryResourceBundle("sap.ui.rta");
 		var sTitle;
 		return new Promise(
 			function(resolve) {
@@ -206,10 +207,11 @@ function(
 	 * @private
 	 */
 	Utils.getOverlayInstanceForDom = function(oDomRef) {
-		var sId = jQuery(oDomRef).attr("id");
+		var sId = oDomRef.getAttribute("id");
 		if (sId) {
-			return sap.ui.getCore().byId(sId);
+			return Core.byId(sId);
 		}
+		return undefined;
 	};
 
 	/**
@@ -220,11 +222,12 @@ function(
 	 */
 	Utils.getFocusedOverlay = function() {
 		if (document.activeElement) {
-			var oElement = sap.ui.getCore().byId(document.activeElement.id);
+			var oElement = Core.byId(document.activeElement.id);
 			if (oElement && oElement.isA("sap.ui.dt.ElementOverlay")) {
 				return oElement;
 			}
 		}
+		return undefined;
 	};
 
 	/**
@@ -453,9 +456,8 @@ function(
 	 * @returns{boolean} - Returns if <code>oDomElement</code> is currently visible on the screen.
 	 */
 	Utils.isElementInViewport = function(oDomElement) {
-		if (oDomElement instanceof jQuery) {
-			oDomElement = oDomElement.get(0);
-		}
+		//TODO: remove when all calls are replaced
+		oDomElement = oDomElement.jquery ? oDomElement.get(0) : oDomElement;
 
 		var mRect = oDomElement.getBoundingClientRect();
 
@@ -476,18 +478,36 @@ function(
 	 * @param  {object} [mPropertyBag] - Object with additional information; error and titleKey are evaluated, the rest is passed as option to the MessageBox
 	 * @param  {any} [mPropertyBag.error] - If an error is passed on, the message box text is derived from it
 	 * @param  {string} [mPropertyBag.titleKey] - The text key for the title of the message box; if none is provided the default of the selectde MessageBox type  will be displayed
-	 * @returns{Promise} Promise displaying the message box; resolves when it is closed
+	 * @param  {array} [mPropertyBag.actions] - Available actions for the messabe box
+	 * @param  {array} [mPropertyBag.actionKeys] - The text key for the action buttons of the message box. It is provided as actions property to the MessageBox.
+	 * 											   If mPropertyBag.actions property is set, it will not be overriden
+	 * @param {string} [mPropertyBag.emphasizedAction] - Action option to be emphasized
+	 * @param {string} [mPropertyBag.emphasizedActionKey] - Text key of the action option to be emphasized
+	 * @param {boolean} [mPropertyBag.showCancel] - Whether "cancel" should be part of the actions
+	 * @returns{Promise} Promise displaying the message box; resolves when it is closed with the pressed button
 	 */
 	Utils.showMessageBox = function(sMessageType, sMessageKey, mPropertyBag) {
-		return sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta", true)
+		return Core.getLibraryResourceBundle("sap.ui.rta", true)
 		.then(function(oResourceBundle) {
 			mPropertyBag = mPropertyBag || {};
 			var sMessage = oResourceBundle.getText(sMessageKey, mPropertyBag.error ? [mPropertyBag.error.userMessage || mPropertyBag.error.message || mPropertyBag.error] : undefined);
 			var sTitle = mPropertyBag.titleKey && oResourceBundle.getText(mPropertyBag.titleKey);
-
-			var mOptions = _omit(mPropertyBag, ["titleKey", "error"]);
+			var vActionTexts =
+				mPropertyBag.actionKeys &&
+				mPropertyBag.actionKeys.map(function(sActionKey) {
+					return oResourceBundle.getText(sActionKey);
+				});
+			var sEmphasizedAction = mPropertyBag.emphasizedActionKey ? oResourceBundle.getText(mPropertyBag.emphasizedActionKey) : undefined;
+
+			var bShowCancel = mPropertyBag.showCancel;
+			var mOptions = _omit(mPropertyBag, ["titleKey", "error", "actionKeys", "emphasizedAction", "emphasizedActionKey", "showCancel"]);
 			mOptions.title = sTitle;
 			mOptions.styleClass = Utils.getRtaStyleClassName();
+			mOptions.actions = mOptions.actions || vActionTexts;
+			mOptions.emphasizedAction = sEmphasizedAction || mPropertyBag.emphasizedAction;
+			if (bShowCancel) {
+				mOptions.actions.push(MessageBox.Action.CANCEL);
+			}
 
 			return messageBoxPromise(sMessageType, sMessage, mOptions);
 		});
@@ -540,6 +560,7 @@ function(
 		})) {
 			return fnCallback();
 		}
+		return undefined;
 	};
 
 	/**
@@ -624,4 +645,4 @@ function(
 	};
 
 	return Utils;
-}, /* bExport= */true);
+}, /* bExport= */true);

package/src/sap/ui/rta/api/startAdaptation.js

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

package/src/sap/ui/rta/api/startKeyUserAdaptation.js

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

package/src/sap/ui/rta/appVariant/AppVariantDialog.js

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

package/src/sap/ui/rta/appVariant/AppVariantManager.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.53

package/src/sap/ui/rta/appVariant/AppVariantOverviewDialog.js

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

package/src/sap/ui/rta/appVariant/AppVariantUtils.js

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

package/src/sap/ui/rta/appVariant/Feature.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -107,19 +107,13 @@ sap.ui.define([
 					AppVariantUtils.closeOverviewDialog();
 				};
 
-				var oUriParameters = UriParameters.fromQuery(window.location.search);
-				var sAppContextsEnabled = oUriParameters.get("sap-ui-xx-rta-adaptations");
-
 				var sOverviewPath = "sap/ui/rta/appVariant/AppVariantOverviewDialog";
 				var oProperties = {
 					idRunningApp: oDescriptor["sap.app"].id,
 					isOverviewForKeyUser: bAsKeyUser,
 					layer: sLayer
 				};
-				if (sAppContextsEnabled === "true") {
-					sOverviewPath = "sap/ui/rta/appContexts/AppContextsOverviewDialog";
-					oProperties = {layer: sLayer};
-				}
+
 				sap.ui.require([sOverviewPath], function(AppVariantOverviewDialog) {
 					if (!oAppVariantOverviewDialog) {
 						oAppVariantOverviewDialog = new AppVariantOverviewDialog(oProperties);

package/src/sap/ui/rta/appVariant/S4HanaCloudBackend.js

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

package/src/sap/ui/rta/appVariant/Utils.js

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

package/src/sap/ui/rta/appVariant/manageApps/webapp/Component.js

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

package/src/sap/ui/rta/appVariant/manageApps/webapp/controller/ManageApps.controller.js

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

package/src/sap/ui/rta/appVariant/manageApps/webapp/index.js

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

package/src/sap/ui/rta/appVariant/manageApps/webapp/model/models.js

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.54

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.76

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/base/ManagedObject"], function(ManagedObject) {
@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function(ManagedObject) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.38

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -485,7 +485,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.52

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.50

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -91,19 +91,21 @@ sap.ui.define([
 	 * @returns {Promise} Returns resolve after undo
 	 */
 	ControlVariantSwitch.prototype.undo = function() {
-		var sOldVariantReference = this.getSourceVariantReference();
+		var sSourceVariantReference = this.getSourceVariantReference();
 		var oAppComponent = this._getAppComponent();
 
-		if (this.getDiscardVariantContent()) {
-			return this.oModel.addAndApplyChangesOnVariant(this._aSourceVariantDirtyChanges)
-			.then(function() {
-				this._aSourceVariantDirtyChanges = null;
-				this.oModel.checkUpdate(true);
-				return this._updateModelVariant(sOldVariantReference, oAppComponent);
-			}.bind(this));
-		}
-
-		return this._updateModelVariant(sOldVariantReference, oAppComponent);
+		return this._updateModelVariant(sSourceVariantReference, oAppComponent)
+		.then(function() {
+			// When discarding, dirty changes on source variant need to be applied AFTER the switch
+			if (this.getDiscardVariantContent()) {
+				return this.oModel.addAndApplyChangesOnVariant(this._aSourceVariantDirtyChanges)
+				.then(function() {
+					this._aSourceVariantDirtyChanges = null;
+					this.oModel.checkUpdate(true);
+				}.bind(this));
+			}
+			return undefined;
+		}.bind(this));
 	};
 
 	ControlVariantSwitch.prototype._updateModelVariant = function(sVariantReference, oAppComponent) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

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

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