@openui5/sap.ui.fl 1.110.0 → 1.111.0

package/package.json

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

package/src/sap/ui/fl/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.110.0</version>
+  <version>1.111.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

package/src/sap/ui/fl/Cache.js

@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -32,6 +32,7 @@ function(
 	var Cache = function() {};
 
 	function _getArray(sComponentName, oChange) {
+		// FIXME Don't mutate the storage response
 		var mStorageResponse = FlexState.getFlexObjectsFromStorageResponse(sComponentName);
 
 		if (oChange.fileType === "variant") {
@@ -77,6 +78,7 @@ function(
 	 * @param {string} mComponent.name - Name of the component
 	 * @param {object} [mPropertyBag] - Contains additional data needed for reading changes
 	 * @param {string} [mPropertyBag.componentId] - ID of the current component, needed if bInvalidataCache is set
+	 * @param {string} [mPropertyBag.version] - Number of the version being processed
 	 * @param {boolean} bInvalidateCache - should the cache be invalidated
 	 * @returns {Promise} resolves with the change file for the given component, either from cache or back end
 	 */

package/src/sap/ui/fl/ChangePersistence.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @experimental Since 1.25.0
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
 	 * @param {string} mComponent.name - Name of the component this instance is responsible for
@@ -178,6 +178,7 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.includeCtrlVariants] - Indicates that control variant changes shall be included
 	 * @param {string} [mPropertyBag.cacheKey] Key to validate the cache entry stored on client side
 	 * @param {sap.ui.core.Component} [mPropertyBag.component] - Component instance
+	 * @param {string} [mPropertyBag.version] Number of the version to retrieve changes for
 	 * @param {boolean} bInvalidateCache - should the cache be invalidated
 	 * @returns {Promise} Promise resolving with an array of changes
 	 * @public
@@ -609,7 +610,14 @@ sap.ui.define([
 		if (aDirtyChanges.length) {
 			var aRequests = getRequests(aDirtyChanges);
 			var aStates = getStates(aDirtyChanges);
-			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === States.LifecycleState.NEW;
+			var bCheckLayer = true;
+			if (Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().hasPersoConnector()) {
+				// Created public fl-Variant as default variant will created public and user changes
+				// no single request can be used, because CF needs PersoConnector and KeyuserConntector
+				var aLayers = getLayers(aDirtyChanges);
+				bCheckLayer = aLayers.length === 1;
+			}
+			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === States.LifecycleState.NEW && bCheckLayer;
 		}
 		return true;
 	}
@@ -764,6 +772,7 @@ sap.ui.define([
 						oDirtyChange.setState(States.LifecycleState.PERSISTED);
 						Cache.updateChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
+					default:
 				}
 			}
 		}
@@ -806,6 +815,19 @@ sap.ui.define([
 		return aStates;
 	}
 
+	function getLayers(aDirtyChanges) {
+		var aLayers = [];
+
+		aDirtyChanges.forEach(function(oChange) {
+			var sLayer = oChange.getLayer();
+			if (aLayers.indexOf(sLayer) === -1) {
+				aLayers.push(sLayer);
+			}
+		});
+
+		return aLayers;
+	}
+
 	function prepareDirtyChanges(aDirtyChanges) {
 		var aChanges = [];
 

package/src/sap/ui/fl/ChangePersistenceFactory.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @since 1.58

package/src/sap/ui/fl/FakeLrepLocalStorage.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FlexController.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;

package/src/sap/ui/fl/FlexControllerFactory.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/LayerUtils.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 */
 	var FlexCustomData = {};
 

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @experimental
 	 * @since 1.77
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSource
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -25,7 +25,7 @@ sap.ui.define([
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
      * @experimental
-     * @version 1.110.0
+     * @version 1.111.0
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @experimental
 	 * @since 1.86
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
 	 * @experimental
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function () {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/Utils",
 	"sap/base/Log",
+	"sap/base/util/deepEqual",
 	"sap/base/util/merge",
 	"sap/base/util/ObjectPath",
 	"sap/base/util/isEmptyObject",
@@ -20,6 +21,7 @@ sap.ui.define([
 	Component,
 	Utils,
 	Log,
+	deepEqual,
 	merge,
 	ObjectPath,
 	isEmptyObject,
@@ -177,6 +179,7 @@ sap.ui.define([
 		var oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
 
 		if (oParsedHash && oParsedHash.params) {
+			var mOldHashParams = Object.assign({}, oParsedHash.params);
 			var mTechnicalParameters = oModel.oAppComponent
 				&& oModel.oAppComponent.getComponentData
 				&& oModel.oAppComponent.getComponentData()
@@ -197,7 +200,7 @@ sap.ui.define([
 				hasher.changed.active = false; // disable changed signal
 				hasher.replaceHash(oURLParsingService.constructShellHash(oParsedHash));
 				hasher.changed.active = true; // re-enable changed signal
-			} else {
+			} else if (!deepEqual(mOldHashParams, oParsedHash.params)) {
 				oCrossApplicationNavigationService.toExternal({
 					target: {
 						semanticObject: oParsedHash.semanticObject,

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

@@ -34,7 +34,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 */
 	var Processor;
 

package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
 	 * @since 1.105
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
 	 * @since 1.103
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
 	 * @since 1.105
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
 	 * @since 1.104
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @since 1.103
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -517,11 +517,12 @@ sap.ui.define([
 		}
 	};
 
-	FlexState.setInitialNonFlCompVariantData = function(sReference, sPersistencyKey, oStandardVariant, aVariants) {
+	FlexState.setInitialNonFlCompVariantData = function(sReference, sPersistencyKey, oStandardVariant, aVariants, sSVMControlId) {
 		_mExternalData.compVariants[sReference] = _mExternalData.compVariants[sReference] || {};
 		_mExternalData.compVariants[sReference][sPersistencyKey] = {};
 		_mExternalData.compVariants[sReference][sPersistencyKey].standardVariant = oStandardVariant;
 		_mExternalData.compVariants[sReference][sPersistencyKey].variants = aVariants;
+		_mExternalData.compVariants[sReference][sPersistencyKey].controlId = sSVMControlId;
 	};
 
 	FlexState.getInitialNonFlCompVariantData = function(sReference) {

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -77,7 +77,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 */
 	var ManifestUtils = {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @experimental Since 1.75
 	 * @since 1.75
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -117,7 +117,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -182,7 +182,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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) {