@openui5/sap.ui.fl 1.110.0 → 1.111.1

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js

@@ -31,9 +31,10 @@ sap.ui.define([
 		return mMap[sPersistencyKey];
 	}
 
-	function initialize(mMap, sPersistencyKey, aVariants) {
+	function initialize(mMap, sPersistencyKey, aVariants, sSVMControlId) {
 		aVariants = aVariants || [];
 		var mMapOfKey = getOrCreate(mMap, sPersistencyKey);
+		mMapOfKey.controlId = sSVMControlId;
 
 		// clear all non-persisted variants in case of a reinitialization
 		mMapOfKey.nonPersistedVariants.forEach(function (oVariant) {

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -106,6 +106,15 @@ sap.ui.define([
 		}
 	}
 
+	function updateChange(oChangeContent, oFlexObjects) {
+		var sChangeCategory = getVariantChangeCategory(oChangeContent);
+		oFlexObjects[sChangeCategory] = oFlexObjects[sChangeCategory].map(function(oExistingFlexObject) {
+			return oChangeContent.fileName === oExistingFlexObject.fileName
+				? oChangeContent
+				: oExistingFlexObject;
+		});
+	}
+
 	function getVariantChangeCategory(oChangeContent) {
 		switch (oChangeContent.fileType) {
 			case "change":
@@ -550,12 +559,18 @@ sap.ui.define([
 		var oFlexObjects = FlexState.getFlexObjectsFromStorageResponse(mPropertyBag.reference);
 
 		if (mPropertyBag.changeToBeAddedOrDeleted) {
+			var oFileContent = mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent();
 			switch (mPropertyBag.changeToBeAddedOrDeleted.getState()) {
 				case States.LifecycleState.NEW:
-					addChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
+					addChange(oFileContent, oFlexObjects);
+					mPropertyBag.changeToBeAddedOrDeleted.setState(States.LifecycleState.PERSISTED);
 					break;
 				case States.LifecycleState.DELETE:
-					deleteChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
+					deleteChange(oFileContent, oFlexObjects);
+					break;
+				case States.LifecycleState.DIRTY:
+					updateChange(oFileContent, oFlexObjects);
+					mPropertyBag.changeToBeAddedOrDeleted.setState(States.LifecycleState.PERSISTED);
 					break;
 				default:
 			}

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {};

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessor = function() {};

package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js

@@ -40,6 +40,8 @@ sap.ui.define([
 
 	function getCompEntities(mPropertyBag) {
 		var oControl = mPropertyBag.control;
+		var oVMControl = (oControl.getVariantManagement && oControl.getVariantManagement()) || oControl;
+		var sSVMControlId = oVMControl.getId();
 		var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
 
 		// TODO clarify why in a test we come here without an initialized FlexState (1980546095)
@@ -52,8 +54,8 @@ sap.ui.define([
 			var sPersistencyKey = CompVariantUtils.getPersistencyKey(oControl);
 			var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
 			//Store external input data to FlexState so they can be restored after invalidating cache
-			FlexState.setInitialNonFlCompVariantData(sReference, sPersistencyKey, mPropertyBag.standardVariant, mPropertyBag.variants);
-			return mCompVariantsMap._initialize(sPersistencyKey, mPropertyBag.variants);
+			FlexState.setInitialNonFlCompVariantData(sReference, sPersistencyKey, mPropertyBag.standardVariant, mPropertyBag.variants, sSVMControlId);
+			return mCompVariantsMap._initialize(sPersistencyKey, mPropertyBag.variants, sSVMControlId);
 		});
 	}
 
@@ -112,7 +114,7 @@ sap.ui.define([
 			return getCompEntities(mPropertyBag)
 				.then(function(mCompMaps) {
 					var sPersistencyKey = CompVariantUtils.getPersistencyKey(mPropertyBag.control);
-					return CompVariantMerger.merge(sPersistencyKey, mCompMaps, mPropertyBag.standardVariant);
+					return CompVariantMerger.merge(sPersistencyKey, mCompMaps, mPropertyBag.standardVariant, mPropertyBag.control);
 				});
 		},
 

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.54
 	 * @private
 	 * @experimental Since 1.54. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 */
 	var BaseAddViaDelegate = {

package/src/sap/ui/fl/changeHandler/BaseAddXml.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/BaseRename.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.46
 	 */
 	var BaseRename = {

package/src/sap/ui/fl/changeHandler/HideControl.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 */
 	var HideControl = {};

package/src/sap/ui/fl/changeHandler/MoveControls.js

@@ -21,7 +21,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.46
 	 */
 	var MoveControls = { };

package/src/sap/ui/fl/changeHandler/MoveElements.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.34.0
 	 */
 	var MoveElements = { };

package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.38
 	 * @private
 	 * @experimental Since 1.38. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/PropertyChange.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.36
 	 * @private
 	 * @experimental Since 1.36. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/StashControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 */
 	var StashControl = {};

package/src/sap/ui/fl/changeHandler/UnhideControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for unhiding of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideControl = {};

package/src/sap/ui/fl/changeHandler/UnstashControl.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnstashControl = {};

package/src/sap/ui/fl/changeHandler/UpdateIFrame.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

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

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

package/src/sap/ui/fl/initial/_internal/StorageUtils.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @alias sap.ui.fl.registry.ChangeHandlerRegistration
 		 *
 		 * @author SAP SE
-		 * @version 1.110.0
+		 * @version 1.111.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeHandlerStorage
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeRegistryItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeRegistryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

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

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

package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js

@@ -51,7 +51,7 @@ function(
 	 * @name sap.ui.fl.initial._internal.storageResultDisassemble
 	 * @function
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 * Disassembles a response with a variant section into one or more plain responses.

package/src/sap/ui/fl/interfaces/BaseLoadConnector.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @name sap.ui.fl.interfaces.BaseLoadConnector
 	 * @since 1.79
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @ui5-restricted SAP Web IDE (Visual Editor), UX Tools

package/src/sap/ui/fl/interfaces/Delegate.js

@@ -108,7 +108,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 * @since 1.78
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @private
 	 * @ui5-restricted