@openui5/sap.ui.fl 1.110.0 → 1.111.1

package/src/sap/ui/fl/variants/context/controller/ContextVisibility.controller.js

@@ -202,7 +202,7 @@ sap.ui.define([
 		},
 
 		isRemoveAllEnabled: function(aSelectedRoleIds) {
-			return aSelectedRoleIds.length !== 0;
+			return aSelectedRoleIds && aSelectedRoleIds.length !== 0;
 		},
 
 		isMessageStripVisible: function(aSelectedRoles, bShowMessageStrip) {

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -174,7 +174,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -249,6 +249,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Property Bag
 	 * @param {string} mPropertyBag.reference - ID of the application for which the versions are requested (this reference must not contain the ".Component" suffix)
 	 * @param {string} mPropertyBag.layer - Layer for which the versions should be retrieved
+	 * @param {boolean} [mPropertyBag.contextBasedAdaptation] - Parameter that indicates whether or not a new backend draft was triggered via contextBasedAdaptationsAPI
 	 */
 	Versions.onAllChangesSaved = function (mPropertyBag) {
 		mPropertyBag.reference = Utils.normalizeReference(mPropertyBag.reference);
@@ -256,8 +257,11 @@ sap.ui.define([
 		var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
 		var bDirtyChanges = oModel.getProperty("/dirtyChanges");
 		oModel.setProperty("/dirtyChanges", true);
-		oModel.setProperty("/backendDraft", bVersioningEnabled && bDirtyChanges);
+		oModel.setProperty("/backendDraft", bVersioningEnabled && bDirtyChanges || !!mPropertyBag.contextBasedAdaptation);
 		oModel.updateDraftVersion();
+		// Save can happen without a reload and the model must be kept up-to-date
+		oModel.setProperty("/persistedVersion", Version.Number.Draft);
+		oModel.updateBindings(true);
 	};
 
 	/**

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var Condenser = {};
 
@@ -129,6 +129,8 @@ sap.ui.define([
 				oChange.condenserState = "delete";
 			}
 			mClassifications[sClassification][0].updateChange = oChange;
+		} else {
+			oChange.condenserState = "delete";
 		}
 
 		if (

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var UIReconstruction = {};
 

package/src/sap/ui/fl/write/_internal/condenser/Utils.js

@@ -63,18 +63,20 @@ sap.ui.define([
 	 * Retrieves the aggregation from the container instance and returns all the Ids of the controls
 	 *
 	 * @param {string} sContainerId - Container Id
-	 * @param {string} sAggregationName Name of the aggregation
+	 * @param {string} sAggregationName - Name of the aggregation
+	 * @param {object} [aCustomAggregation] - Custom Aggregation
+	 * @param {string} [sAffectedControlIdProperty] - Property name of the ID used for the container element
 	 * @returns {Promise<string[]>} Array of Ids wrapped in Promise
 	 */
-	Utils.getContainerElementIds = function(sContainerId, sAggregationName) {
+	Utils.getContainerElementIds = function(sContainerId, sAggregationName, aCustomAggregation, sAffectedControlIdProperty) {
 		var oContainer = Core.byId(sContainerId);
-		return Promise.resolve()
-			.then(JsControlTreeModifier.getAggregation.bind(JsControlTreeModifier, oContainer, sAggregationName))
-			.then(function (aContainerElements) {
-				return aContainerElements.map(function(oElement) {
-					return oElement.getId();
-				});
+
+		return Promise.resolve(aCustomAggregation || JsControlTreeModifier.getAggregation(oContainer, sAggregationName))
+		.then(function(aContainerElements) {
+			return aContainerElements.map(function(oElement) {
+				return sAffectedControlIdProperty ? oElement.sAffectedControlIdProperty : oElement.getId();
 			});
+		});
 	};
 
 	/**

package/src/sap/ui/fl/write/_internal/condenser/classifications/Create.js

@@ -24,15 +24,18 @@ sap.ui.define([
 		addToReconstructionMap: function(mUIReconstructions, oCondenserInfo) {
 			var oAffectedControl = Core.byId(oCondenserInfo.affectedControl);
 			var sAggregationName = oCondenserInfo.targetAggregation || oAffectedControl && oAffectedControl.sParentAggregationName;
-			return CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, sAggregationName)
-				.then(function (aTargetContainerElementIds) {
-					var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-					var iIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-					// if the index is -1 the element was already removed by a different add change
-					if (iIndex > -1) {
-						aContainerElementIds.splice(iIndex, 1);
-					}
-				});
+			return CondenserUtils.getContainerElementIds(
+				oCondenserInfo.targetContainer, sAggregationName,
+				oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
+			)
+			.then(function (aTargetContainerElementIds) {
+				var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+				var iIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+				// if the index is -1 the element was already removed by a different add change
+				if (iIndex > -1) {
+					aContainerElementIds.splice(iIndex, 1);
+				}
+			});
 		},
 
 		/**

package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js

@@ -20,19 +20,25 @@ sap.ui.define([
  		 * @returns {Promise} resolves when a destroy change is added to UI Reconstruction Map
 		 */
 		addToReconstructionMap: function(mUIReconstructions, oCondenserInfo) {
-			return CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation)
-				.then(function (aTargetContainerElementIds) {
-					var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-					if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-						while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-							var iIndex = aContainerElementIds.length;
-							aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
-						}
-						aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
-					} else {
-						aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+			return CondenserUtils.getContainerElementIds(
+				oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation,
+				oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
+			)
+			.then(function (aTargetContainerElementIds) {
+				var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+					mUIReconstructions, oCondenserInfo.targetContainer,
+					oCondenserInfo.targetAggregation, aTargetContainerElementIds
+				);
+				if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+					while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+						var iIndex = aContainerElementIds.length;
+						aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
 					}
-				});
+					aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
+				} else {
+					aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+				}
+			});
 		},
 
 		/**

package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js

@@ -21,8 +21,14 @@ sap.ui.define([
 		 */
 		addToReconstructionMap: function(mUIReconstructions, oCondenserInfo) {
 			return Promise.all([
-				CondenserUtils.getContainerElementIds(oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation),
-				CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation)
+				CondenserUtils.getContainerElementIds(
+					oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation,
+					oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
+				),
+				CondenserUtils.getContainerElementIds(
+					oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation,
+					oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
+				)
 			]).then(function (aSourceTargetElementIds) {
 				var aSourceContainerElementIds = aSourceTargetElementIds[0];
 				var aTargetContainerElementIds = aSourceTargetElementIds[1];
@@ -33,14 +39,23 @@ sap.ui.define([
 					oCondenserInfo.targetContainer === oCondenserInfo.sourceContainer
 					&& oCondenserInfo.targetAggregation === oCondenserInfo.sourceAggregation
 				) {
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+						mUIReconstructions, oCondenserInfo.targetContainer,
+						oCondenserInfo.targetAggregation, aTargetContainerElementIds
+					);
 					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
 					CondenserUtils.shiftElement(aContainerElementIds, iTargetIndex, oCondenserInfo.sourceIndex);
 				} else {
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+						mUIReconstructions, oCondenserInfo.targetContainer,
+						oCondenserInfo.targetAggregation, aTargetContainerElementIds
+					);
 					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
 					aContainerElementIds.splice(iTargetIndex, 1);
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation, aSourceContainerElementIds);
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+						mUIReconstructions, oCondenserInfo.sourceContainer,
+						oCondenserInfo.sourceAggregation, aSourceContainerElementIds
+					);
 					aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
 				}
 			});

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.isContextSharing] Indicator whether this is a request for context sharing
 	 * @param {boolean} [mPropertyBag.skipIam=false] - Indicates whether the default IAM item creation and registration is skipped. This is S4/Hana specific flag passed by only Smart Business
 	 * @param {boolean} [mPropertyBag.isCondensingEnabled] Indicator whether this is a request for condensing
-	 * @param {boolean} [mPropertyBag.isContextBasedAdaptationEnabled] Indicator whether this is an context-based adaptation
+	 * @param {boolean} [mPropertyBag.isContextBasedAdaptationEnabled] Indicator whether this is a context-based adaptation
 	 * @param {boolean} [mPropertyBag.parentVersion] Indicates if changes should be written as a draft and on which version the changes should be based on
 	 * @private
 	 * @returns {Promise} Promise resolves as soon as the writing was completed
@@ -166,7 +166,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -19,7 +19,8 @@ sap.ui.define([
 	var API_VERSION = "/v1";
 
 	var FEATURES = {
-		isProductiveSystem: true
+		isProductiveSystem: true,
+		hasPersoConnector: true
 	};
 
 	/**
@@ -27,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/Utils.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js

@@ -28,7 +28,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var Processor = {
 		applyExtensionPoint: function(oExtensionPoint) {

package/src/sap/ui/fl/write/_internal/extensionPoint/Registry.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var ABAPAccess = {};
 
@@ -68,7 +68,7 @@ sap.ui.define([
 			return Promise.resolve(false);
 		}
 		return Settings.getInstance(sComponentName).then(function(oSettings) {
-			return oSettings.isModelS();
+			return oSettings.isAtoEnabled();
 		});
 	};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js

@@ -117,7 +117,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var ABAPExtensibilityVariantFactory = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var ServiceValidation = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var UriParser = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js

@@ -249,7 +249,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var Utils = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @experimental Since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 */
 	var CAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.93
 	 * @experimental Since 1.93
 	 * @private

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectState.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -62,7 +62,7 @@ sap.ui.define([
 			var oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
 			if (oDataToRestore) {
 				Object.keys(oDataToRestore).forEach(function(sPersistencyKey) {
-					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants);
+					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants, oDataToRestore[sPersistencyKey].controlId);
 					CompVariantMerger.merge(sPersistencyKey, mCompEntities[sPersistencyKey], oDataToRestore[sPersistencyKey].standardVariant);
 				});
 			}
@@ -172,9 +172,10 @@ sap.ui.define([
 	 *
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Retrieves the associated flex persistence
-	 * @param {boolean} mPropertyBag.invalidateCache - Flag if the cache should be invalidated
-	 * @param {boolean} mPropertyBag.includeCtrlVariants - Flag if control variant changes should be included
-	 * @param {boolean} mPropertyBag.includeDirtyChanges - Flag if dirty UI changes should be included
+	 * @param {boolean} [mPropertyBag.invalidateCache] - Flag if the cache should be invalidated
+	 * @param {boolean} [mPropertyBag.includeCtrlVariants] - Flag if control variant changes should be included
+	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Flag if dirty UI changes should be included
+	 * @param {boolean} [mPropertyBag.version] - The version for which the objects are retrieved
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectState.getFlexObjects = function (mPropertyBag) {
@@ -238,6 +239,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.cacheKey] - Key to validate the cache entry stored on client side
 	 * @param {boolean} [mPropertyBag.invalidateCache] - Indicates whether the cache is to be invalidated
 	 * @param {boolean} [mPropertyBag.removeOtherLayerChanges=false] - Whether to remove changes on other layers before saving
+	 * @param {boolean} [mPropertyBag.version] - Version for which the objects are saved
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectState.saveFlexObjects = function(mPropertyBag) {

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js

@@ -259,12 +259,20 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	var CompVariantState = {};
 
+	CompVariantState.checkSVMControlsForDirty = function(sReference) {
+		var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
+		return Object.values(mCompVariantsMap).some(function(mMap) {
+			var oControl = mMap.controlId && Core.byId(mMap.controlId);
+			return oControl && oControl.getModified();
+		});
+	};
+
 	/**
 	 * Creates a change to set which variant should be selected at the application start-up.
 	 *

package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.74.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/write/_internal/transport/Transports.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport