@openui5/sap.ui.fl 1.123.1 → 1.124.1

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -73,11 +73,22 @@ sap.ui.define([
 
 	function isSelectorInArray(aExistingDependentSelectorList, oDependentSelector) {
 		return aExistingDependentSelectorList.some(function(oExistingDependentSelector) {
-			return (oExistingDependentSelector.id === oDependentSelector.id && oExistingDependentSelector.idIsLocal === oDependentSelector.idIsLocal);
+			return (
+				oExistingDependentSelector.id === oDependentSelector.id
+				&& oExistingDependentSelector.idIsLocal === oDependentSelector.idIsLocal
+			);
 		});
 	}
 
-	function addChangesDependencies(oTargetChange, aDependentSelectorsOfTargetChange, oExistingChange, bCheckingOrder, oAppComponent, aChanges, oDependencyMap) {
+	function addChangesDependencies(
+		oTargetChange,
+		aDependentSelectorsOfTargetChange,
+		oExistingChange,
+		bCheckingOrder,
+		oAppComponent,
+		aChanges,
+		oDependencyMap
+	) {
 		var aDependentSelectorsOfExistingChange = oExistingChange.getDependentSelectorList();
 		aDependentSelectorsOfTargetChange.some(function(oDependentSelector) {
 			// If 2 changes have the same dependent selector, they are depend on each other
@@ -92,6 +103,7 @@ sap.ui.define([
 				}
 				return true;
 			}
+			return false;
 		});
 	}
 
@@ -157,7 +169,8 @@ sap.ui.define([
 	}
 
 	function isDependencyNeeded(oDependentChange, oChange, sDependentControlId, oDependencyMap, bIsChangesInRevertOrder) {
-		var bSelectorAlreadyThere = !bIsChangesInRevertOrder && oDependencyMap.mDependencies[oDependentChange.getId()].dependentIds.includes(sDependentControlId);
+		var bSelectorAlreadyThere =
+			!bIsChangesInRevertOrder && oDependencyMap.mDependencies[oDependentChange.getId()].dependentIds.includes(sDependentControlId);
 		var bIndirectDependency = false;
 		if (oDependencyMap.mDependentChangesOnMe[oChange.getId()]) {
 			oDependencyMap.mDependentChangesOnMe[oChange.getId()].some(function(sChangeId) {
@@ -169,6 +182,14 @@ sap.ui.define([
 		return !bSelectorAlreadyThere && !bIndirectDependency;
 	}
 
+	function removeChangeFromList(oDependencyMap, sChangeKey) {
+		const iIndex = oDependencyMap.aChanges.findIndex((oChange) => oChange.getId() === sChangeKey);
+
+		if (iIndex !== -1) {
+			oDependencyMap.aChanges.splice(iIndex, 1);
+		}
+	}
+
 	/**
 	 * Iterating over <code>mDependencies</code> once, executing relevant dependencies, and clearing dependencies queue.
 	 *
@@ -295,6 +316,7 @@ sap.ui.define([
 			if (bContinue) {
 				return DependencyHandler.processDependentQueue(oDependencyMap, oAppComponent, sControlId);
 			}
+			return undefined;
 		}.bind(undefined, sControlId));
 	};
 
@@ -344,6 +366,7 @@ sap.ui.define([
 	/**
 	 * Resolves the dependency from the dependent changes;
 	 * Loops over all the dependent changes and removes the dependency to this change
+	 * After the dependency is resolved the change is removed from the list of changes (aChanges)
 	 *
 	 * @param {object} oDependencyMap - Changes Map
 	 * @param {string} sChangeKey - Key of the change which dependencies have to be resolved
@@ -368,6 +391,7 @@ sap.ui.define([
 			});
 			delete oDependencyMap.mDependentChangesOnMe[sChangeKey];
 		}
+		removeChangeFromList(oDependencyMap, sChangeKey);
 	};
 
 	/**
@@ -388,15 +412,10 @@ sap.ui.define([
 				aChanges.splice(iIndexInMapElement, 1);
 				return true;
 			}
+			return false;
 		});
 
-		var iIndex = oDependencyMap.aChanges.map(function(oExistingChange) {
-			return oExistingChange.getId();
-		}).indexOf(sChangeKey);
-
-		if (iIndex !== -1) {
-			oDependencyMap.aChanges.splice(iIndex, 1);
-		}
+		removeChangeFromList(oDependencyMap, sChangeKey);
 	};
 
 	/**

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

@@ -12,6 +12,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
@@ -25,6 +26,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObjectFactory,
 	FlexObjectStates,
+	UIChangesState,
 	FlexState,
 	ManifestUtils,
 	ChangeHandlerStorage,
@@ -39,19 +41,12 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */
 	const ExtensionPointState = {};
 
-	function isChangeValidForExtensionPoint(mPropertyBag, oChange) {
-		if (oChange.getSelector().name !== mPropertyBag.extensionPointName) {
-			return false;
-		}
-		return ChangesUtils.isChangeInView(mPropertyBag, oChange);
-	}
-
 	function isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo) {
 		if (mExtensionPointInfo.fragmentId) {
 			const oExtensionPointFromChange = oChange.getExtensionPointInfo && oChange.getExtensionPointInfo();
@@ -132,24 +127,27 @@ sap.ui.define([
 	/**
 	 * Gets the changes for the given extension point.
 	 *
-	 * @param {object} oChangePersistence - Change persistence to get changes from
+	 * @param {string} sReference - Flex reference of the application
 	 * @param {object} mPropertyBag - Additional data that are needed to read the changes
 	 * @param {string} mPropertyBag.viewId - ID of the view
 	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Application component for the extension point
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Responsible modifier
 	 * @param {string} mPropertyBag.extensionPointName - Name of the extension point
-	 * @returns {Promise} Promise that resolves with an array of changes
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Returns an array of FlexObjects
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.extensionPoint.Processor
 	 */
-	ExtensionPointState.getChangesForExtensionPoint = function(oChangePersistence, mPropertyBag) {
+	ExtensionPointState.getChangesForExtensionPoint = function(sReference, mPropertyBag) {
 		if (!mPropertyBag.extensionPointName) {
 			Log.error("Missing name from extension point info!");
-			return Promise.resolve([]);
+			return [];
 		}
-		return oChangePersistence.getChangesForComponent()
-		.then(function(aChanges) {
-			return aChanges.filter(isChangeValidForExtensionPoint.bind(undefined, mPropertyBag));
+		const aFlexObjects = UIChangesState.getAllApplicableUIChanges(sReference);
+		return aFlexObjects.filter((oFlexObject) => {
+			if (oFlexObject.getSelector().name !== mPropertyBag.extensionPointName) {
+				return false;
+			}
+			return ChangesUtils.isChangeInView(mPropertyBag, oFlexObject);
 		});
 	};
 
@@ -170,65 +168,64 @@ sap.ui.define([
 	ExtensionPointState.enhanceExtensionPointChanges = function(mPropertyBag, mExtensionPointInfo) {
 		mPropertyBag.extensionPointName = mExtensionPointInfo.name;
 		const oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(mExtensionPointInfo.targetControl);
+		const sReference = ManifestUtils.getFlexReferenceForControl(mExtensionPointInfo.targetControl);
 
-		return ExtensionPointState.getChangesForExtensionPoint(oChangePersistence, mPropertyBag)
-		.then(function(aChanges) {
-			const aPromises = [];
-			aChanges.forEach(function(oChange) {
-				// Only continue process if the change has not been applied, such as in case of XMLPreprocessing of an async view
-				if (oChange.isInInitialState() && !(oChange.getExtensionPointInfo && oChange.getExtensionPointInfo())) {
-					oChange.setExtensionPointInfo(mExtensionPointInfo);
+		const aChanges = ExtensionPointState.getChangesForExtensionPoint(sReference, mPropertyBag);
+		const aPromises = [];
+		aChanges.forEach(function(oChange) {
+			// Only continue process if the change has not been applied, such as in case of XMLPreprocessing of an async view
+			if (oChange.isInInitialState() && !(oChange.getExtensionPointInfo && oChange.getExtensionPointInfo())) {
+				oChange.setExtensionPointInfo(mExtensionPointInfo);
 
-					// Set correct selector from extension point targetControl's ID
-					replaceChangeSelector(oChange, mExtensionPointInfo, false);
+				// Set correct selector from extension point targetControl's ID
+				replaceChangeSelector(oChange, mExtensionPointInfo, false);
 
-					// If the component creation is async, the changesMap already created without changes on EP --> it need to be updated
-					// Otherwise, update the selector of changes is enough, change map will be created later correctly
-					if (FlexState.isInitialized(mPropertyBag)) {
-						oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oChange);
-					}
-				} else if (isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo)) {
-					// Change is applied but we need to create additional runtime only changes
-					// in case of duplicate extension points with different fragment id (fragment as template)
-					const oChangeFileContent = oChange.convertToFileContent();
-					const oChangeContent = oChange.getContent();
-					const mChangeSpecificData = _omit(oChangeFileContent, [
-						"dependentSelector",
-						"fileName",
-						"selector",
-						"content",
-						"adaptationId"
-					]);
-					Object.keys(oChangeContent).forEach(function(sKey) {
-						mChangeSpecificData[sKey] = oChangeContent[sKey];
-					});
-					mChangeSpecificData.support.sourceChangeFileName = oChange.getId() || "";
-					aPromises.push(
-						createAdditionalChange({
-							changeSpecificData: mChangeSpecificData,
-							selector: {
-								view: mExtensionPointInfo.view,
-								name: mExtensionPointInfo.name
-							}
-						})
-						.then(function(oRuntimeOnlyChange) {
-							// Set correct selector from extension point targetControl's ID
-							replaceChangeSelector(oRuntimeOnlyChange, mExtensionPointInfo, true);
-							oRuntimeOnlyChange.setExtensionPointInfo(mExtensionPointInfo);
-							const oFlexObjectMetadata = oRuntimeOnlyChange.getFlexObjectMetadata();
-							oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
-							oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
-							oRuntimeOnlyChange.setCreation(oChange.getCreation());
-							oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
-							aPromises.push(oRuntimeOnlyChange);
-						})
-					);
+				// If the component creation is async, the changesMap already created without changes on EP --> it need to be updated
+				// Otherwise, update the selector of changes is enough, change map will be created later correctly
+				if (FlexState.isInitialized(mPropertyBag)) {
+					oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oChange);
 				}
-			});
-			return Promise.all(aPromises)
-			.then(function() {
-				return aChanges;
-			});
+			} else if (isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo)) {
+				// Change is applied but we need to create additional runtime only changes
+				// in case of duplicate extension points with different fragment id (fragment as template)
+				const oChangeFileContent = oChange.convertToFileContent();
+				const oChangeContent = oChange.getContent();
+				const mChangeSpecificData = _omit(oChangeFileContent, [
+					"dependentSelector",
+					"fileName",
+					"selector",
+					"content",
+					"adaptationId"
+				]);
+				Object.keys(oChangeContent).forEach(function(sKey) {
+					mChangeSpecificData[sKey] = oChangeContent[sKey];
+				});
+				mChangeSpecificData.support.sourceChangeFileName = oChange.getId() || "";
+				aPromises.push(
+					createAdditionalChange({
+						changeSpecificData: mChangeSpecificData,
+						selector: {
+							view: mExtensionPointInfo.view,
+							name: mExtensionPointInfo.name
+						}
+					})
+					.then(function(oRuntimeOnlyChange) {
+						// Set correct selector from extension point targetControl's ID
+						replaceChangeSelector(oRuntimeOnlyChange, mExtensionPointInfo, true);
+						oRuntimeOnlyChange.setExtensionPointInfo(mExtensionPointInfo);
+						const oFlexObjectMetadata = oRuntimeOnlyChange.getFlexObjectMetadata();
+						oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
+						oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
+						oRuntimeOnlyChange.setCreation(oChange.getCreation());
+						oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
+						aPromises.push(oRuntimeOnlyChange);
+					})
+				);
+			}
+		});
+		return Promise.all(aPromises)
+		.then(function() {
+			return aChanges;
 		});
 	};
 

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -88,7 +88,10 @@ sap.ui.define([
 		parentDataSelector: oAllUIChangesDataSelector,
 		executeFunction(aFlexObjects) {
 			return aFlexObjects.filter((oFlexObject) => {
-				return !oFlexObject.getVariantReference() && !oFlexObject.getSelector().persistencyKey;
+				return !oFlexObject.getVariantReference()
+				&& !oFlexObject.getSelector().persistencyKey
+				&& oFlexObject.getFileType() !== "ctrl_variant_management_change"
+				&& oFlexObject.getFileType() !== "ctrl_variant_change";
 			});
 		},
 		checkInvalidation(mParameters, oUpdateInfo) {
@@ -96,7 +99,9 @@ sap.ui.define([
 			return bRelevantType
 				&& oUpdateInfo.updatedObject?.isA(sUIChangeNameSpace)
 				&& !oUpdateInfo.updatedObject.getVariantReference()
-				&& !oUpdateInfo.updatedObject.getSelector().persistencyKey;
+				&& !oUpdateInfo.updatedObject.getSelector().persistencyKey
+				&& oUpdateInfo.updatedObject.getFileType() !== "ctrl_variant_management_change"
+				&& oUpdateInfo.updatedObject.getFileType() !== "ctrl_variant_change";
 		}
 	});
 
@@ -150,12 +155,15 @@ sap.ui.define([
 	 */
 	UIChangesState.getAllApplicableUIChanges = function(sReference) {
 		const aVMIndependentUIChanges = oVMIndependentUIChangesDataSelector.get({reference: sReference});
-		return aVMIndependentUIChanges.concat(VariantManagementState.getInitialChanges({
-			reference: sReference,
-			includeDirtyChanges: true
+		return aVMIndependentUIChanges.concat(VariantManagementState.getInitialUIChanges({
+			reference: sReference
 		}));
 	};
 
+	UIChangesState.getVariantIndependentUIChanges = function(sReference) {
+		return oVMIndependentUIChangesDataSelector.get({reference: sReference});
+	};
+
 	/**
 	 * Fetches the current dependency map from the Flex State.
 	 * This map is continuously being modified as changes are getting applied.

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

@@ -123,7 +123,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.123.1
+		 * @version 1.124.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -30,6 +30,10 @@ sap.ui.define([], function() {
 	Utils.getDefaultVariantId = (mCompVariantsMap) => {
 		const aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
 		const oChange = [...aDefaultVariantChanges].reverse().find((oChange) => {
+			// Default variant is set to standard variant
+			if (oChange?.getContent().defaultVariantName === "*standard*") {
+				return true;
+			}
 			return mCompVariantsMap.variants.some((oVariant) => {
 				return oChange?.getContent().defaultVariantName === oVariant.getId();
 			});

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

@@ -6,12 +6,14 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_pick",
-	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
-	"sap/ui/fl/apply/_internal/changes/Reverter"
+	"sap/ui/fl/apply/_internal/changes/Applier",
+	"sap/ui/fl/apply/_internal/changes/Reverter",
+	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState"
 ], function(
 	_pick,
-	VariantManagementState,
-	Reverter
+	Applier,
+	Reverter,
+	VariantManagementState
 ) {
 	"use strict";
 
@@ -75,7 +77,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -99,8 +101,7 @@ sap.ui.define([
 			var mChangesToBeSwitched = getControlChangesForVariantSwitch(mPropertyBag);
 
 			await Reverter.revertMultipleChanges(mChangesToBeSwitched.changesToBeReverted, mPropertyBag);
-			// TODO: apply variantChanges() should be moved out of flex controller
-			await mPropertyBag.flexController.applyVariantChanges(mChangesToBeSwitched.changesToBeApplied, mPropertyBag.appComponent);
+			await Applier.applyMultipleChanges(mChangesToBeSwitched.changesToBeApplied, mPropertyBag);
 			VariantManagementState.setCurrentVariant(mPropertyBag);
 		}
 

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -85,17 +85,14 @@ sap.ui.define([
 		});
 	}
 
-	function createVariantManagement(aFlexObjects, sReference, sVMReference) {
+	function createVariantManagement(aCtrlVariantManagementChanges, sReference, sVMReference) {
 		var sCurrentVariantReference = (mCurrentVariantReferences[sReference] || {})[sVMReference];
 		return {
 			defaultVariant: sVMReference,
 			currentVariant: sCurrentVariantReference,
 			variants: [],
-			variantManagementChanges: aFlexObjects.filter(function(oFlexObject) {
-				return (
-					oFlexObject.getFileType() === "ctrl_variant_management_change"
-					&& oFlexObject.getSelector().id === sVMReference
-				);
+			variantManagementChanges: aCtrlVariantManagementChanges.filter(function(oFlexObject) {
+				return (oFlexObject.getSelector().id === sVMReference);
 			})
 		};
 	}
@@ -106,31 +103,28 @@ sap.ui.define([
 		});
 	}
 
-	function getAllReferencedVariantIds(aFlexObjects, oVariant) {
-		const aVariants = [];
+	function getAllReferencedVariantIds(aVariants, oVariant) {
+		const aFoundVariants = [];
 		let oCurrentVariant = oVariant;
 		let oFoundVariant;
 		do {
-			oFoundVariant = findVariantInFlexObjects(aFlexObjects, oCurrentVariant.getVariantReference());
+			oFoundVariant = findVariantInFlexObjects(aVariants, oCurrentVariant.getVariantReference());
 			if (oFoundVariant) {
-				aVariants.push(oCurrentVariant);
+				aFoundVariants.push(oCurrentVariant);
 				oCurrentVariant = oFoundVariant;
 			}
 		} while (oFoundVariant);
-		return aVariants.map((oVariant) => oVariant.getId());
+		return aFoundVariants.map((oVariant) => oVariant.getId());
 	}
 
-	function createVariantEntry(aFlexObjects, oVariantInstance) {
-		var aReferencedVariantIds = getAllReferencedVariantIds(aFlexObjects, oVariantInstance);
+	function createVariantEntry(oGroupedFlexObjects, oVariantInstance) {
+		const aReferencedVariantIds = getAllReferencedVariantIds(oGroupedFlexObjects.variants, oVariantInstance);
 		return {
 			instance: oVariantInstance,
-			variantChanges: aFlexObjects.filter(function(oFlexObject) {
-				return (
-					oFlexObject.getFileType() === "ctrl_variant_change"
-					&& oFlexObject.getSelector().id === oVariantInstance.getId()
-				);
+			variantChanges: oGroupedFlexObjects.variantChanges.filter(function(oFlexObject) {
+				return oFlexObject.getSelector().id === oVariantInstance.getId();
 			}),
-			controlChanges: aFlexObjects.filter(function(oFlexObject) {
+			controlChanges: oGroupedFlexObjects.changes.filter(function(oFlexObject) {
 				var bCorrectFlexObjectType = oFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.UIChange");
 				if (!bCorrectFlexObjectType) {
 					return false;
@@ -188,38 +182,57 @@ sap.ui.define([
 		});
 	}
 
+	function groupFlexObjects(aFlexObjects) {
+		const oGroupedFlexObjects = {
+			variants: [],
+			variantManagementChanges: [],
+			changes: [],
+			variantChanges: []
+		};
+		aFlexObjects.forEach((oFlexObject) => {
+			switch (oFlexObject.getFileType()) {
+				case "ctrl_variant":
+					oGroupedFlexObjects.variants.push(oFlexObject);
+					break;
+				case "ctrl_variant_management_change":
+					oGroupedFlexObjects.variantManagementChanges.push(oFlexObject);
+					break;
+				case "change":
+					oGroupedFlexObjects.changes.push(oFlexObject);
+					break;
+				case "ctrl_variant_change":
+					oGroupedFlexObjects.variantChanges.push(oFlexObject);
+					break;
+				default:
+					break;
+			}
+		});
+		return oGroupedFlexObjects;
+	}
+
 	function createVariantsMap(aFlexObjects) {
+		const oGroupedFlexObjects = groupFlexObjects(aFlexObjects);
 		const sReference = aFlexObjects[0]?.getFlexObjectMetadata().reference;
-		const aVariants = aFlexObjects.filter((oFlexObject) => {
-			return oFlexObject.getFileType() === "ctrl_variant";
-		});
 
 		const oVariantManagementsMap = {};
-		aVariants.forEach((oVariantInstance) => {
+		oGroupedFlexObjects.variants.forEach((oVariantInstance) => {
 			var sVMReference = oVariantInstance.getVariantManagementReference();
-			oVariantManagementsMap[sVMReference] ||= createVariantManagement(aFlexObjects, sReference, sVMReference);
+			oVariantManagementsMap[sVMReference] ||= createVariantManagement(
+				oGroupedFlexObjects.variantManagementChanges, sReference, sVMReference
+			);
 			oVariantManagementsMap[sVMReference].variants.push(
-				createVariantEntry(aFlexObjects, oVariantInstance)
+				createVariantEntry(oGroupedFlexObjects, oVariantInstance)
 			);
 		});
 
-		aFlexObjects
-		.filter((oFlexObject) => {
-			return oFlexObject.getFileType() === "ctrl_variant_change";
-		})
-		.forEach((oVariantChange) => {
+		oGroupedFlexObjects.variantChanges.forEach((oVariantChange) => {
 			const oVariantEntry = findVariant(oVariantManagementsMap, oVariantChange);
 			if (oVariantEntry) {
 				applyVariantChange(oVariantEntry, oVariantChange, sReference, oVariantManagementsMap);
 			}
 		});
 
-		const aCtrlVariantManagementChanges = aFlexObjects
-		.filter((oFlexObject) => {
-			return oFlexObject.getFileType() === "ctrl_variant_management_change";
-		});
-
-		aCtrlVariantManagementChanges.forEach((oVariantManagementChange) => {
+		oGroupedFlexObjects.variantManagementChanges.forEach((oVariantManagementChange) => {
 			const oVariantManagementEntry = oVariantManagementsMap[oVariantManagementChange.getSelector().id];
 			if (oVariantManagementEntry) {
 				applyVariantManagementChange(oVariantManagementEntry, oVariantManagementChange);
@@ -231,7 +244,7 @@ sap.ui.define([
 
 			// If current variant is not already set, set initial current variant
 			// Current variant might be unavailable due to layer filtering
-			// or because a component with a different id but the same flex reference was initalized
+			// or because a component with a different id but the same flex reference was initialized
 			if (
 				!oVariantManagement.currentVariant || !oVariantManagement.variants.some((oVariant) => {
 					return oVariant.key === oVariantManagement.currentVariant;
@@ -239,7 +252,7 @@ sap.ui.define([
 			) {
 				const sCurrentVariant = getInitialCurrentVariant(
 					sReference,
-					aCtrlVariantManagementChanges,
+					oGroupedFlexObjects.variantManagementChanges,
 					oVariantManagement.variants
 				) || sVMReference;
 				oVariantManagement.currentVariant = sCurrentVariant;
@@ -517,6 +530,26 @@ sap.ui.define([
 		return oVariantManagementSection.currentVariant;
 	};
 
+	/**
+	 * Returns the instances of all current variants
+	 *
+	 * @param {string} sReference - Component reference
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlVariant[]} Array of current variant instances
+	 */
+	VariantManagementState.getAllCurrentVariants = function(sReference) {
+		const oVariantsMap = oVariantManagementMapDataSelector.get({
+			reference: sReference
+		});
+		return Object.entries(oVariantsMap).map((aEntry) => {
+			const oCurrentVariant = VariantManagementState.getVariant({
+				vmReference: aEntry[0],
+				vReference: aEntry[1].currentVariant,
+				reference: sReference
+			}).instance;
+			return oCurrentVariant;
+		});
+	};
+
 	/**
 	 * Returns the variant management references saved in the FlexState.
 	 *
@@ -560,7 +593,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 */
-	VariantManagementState.getInitialChanges = function(mPropertyBag) {
+	VariantManagementState.getInitialUIChanges = function(mPropertyBag) {
 		var oVariantsMap = oVariantManagementMapDataSelector.get({
 			reference: mPropertyBag.reference
 		});
@@ -582,6 +615,40 @@ sap.ui.define([
 		}, []);
 	};
 
+	/**
+	 * Returns the following FlexObjects: All Variants and VariantManagementChanges, and all ControlChanges for the current variants.
+	 *
+	 * @param {object} mPropertyBag - Object with the necessary properties
+	 * @param {string} mPropertyBag.reference - Component reference
+	 *
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All changes of current or default variants
+	 * @private
+	 * @ui5-restricted
+	 */
+	VariantManagementState.getAllCurrentFlexObjects = function(mPropertyBag) {
+		const oVariantsMap = oVariantManagementMapDataSelector.get({
+			reference: mPropertyBag.reference
+		});
+		return Object.keys(oVariantsMap).reduce(function(aInitialChanges, sVMReference) {
+			if (
+				(mPropertyBag.vmReference && mPropertyBag.vmReference === sVMReference)
+				|| !mPropertyBag.vmReference
+			) {
+				const mArguments = Object.assign({}, mPropertyBag, {
+					vmReference: sVMReference,
+					vReference: oVariantsMap[sVMReference].currentVariant
+				});
+				const oVariant = VariantManagementState.getVariant(mArguments);
+				return aInitialChanges
+				.concat(oVariant.variantChanges)
+				.concat(oVariant.controlChanges)
+				.concat(oVariantsMap[sVMReference].variantManagementChanges)
+				.concat(oVariantsMap[sVMReference].variants.map((oVariant) => oVariant.instance));
+			}
+			return aInitialChanges;
+		}, []);
+	};
+
 	/**
 	 * Takes an array of FlexObjects and filters out any hidden variant and changes on those hidden variants
 	 *
@@ -645,7 +712,7 @@ sap.ui.define([
 	 * @returns {Promise} Promise that resolves when all changes for the initial variant are applied
 	 */
 	VariantManagementState.waitForInitialVariantChanges = function(mPropertyBag) {
-		var aCurrentVariantChanges = VariantManagementState.getInitialChanges({
+		var aCurrentVariantChanges = VariantManagementState.getInitialUIChanges({
 			vmReference: mPropertyBag.vmReference,
 			reference: mPropertyBag.reference
 		});