@openui5/sap.ui.fl 1.134.0 → 1.136.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -9,12 +9,14 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Storage",
+	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/registry/Settings"
 ], function(
 	ObjectPath,
 	ManagedObject,
 	ManifestUtils,
 	ApplyStorage,
+	StorageUtils,
 	Settings
 ) {
 	"use strict";
@@ -61,11 +63,7 @@ sap.ui.define([
 	}
 
 	function filterInvalidFileNames(mFlexData) {
-		[
-			"appDescriptorChanges", "annotationChanges", "changes",
-			"comp.changes", "comp.changes", "comp.defaultVariants", "comp.standardVariants",
-			"variants", "variantChanges", "variantDependentControlChanges", "variantManagementChanges"
-		].forEach(function(vKey) {
+		StorageUtils.getAllFlexObjectNamespaces().forEach(function(vKey) {
 			const aFlexItems = ObjectPath.get(vKey, mFlexData);
 			if (aFlexItems) {
 				ObjectPath.set(vKey, aFlexItems.filter((oFlexItem) => {
@@ -96,19 +94,48 @@ sap.ui.define([
 	}
 
 	function getSideId(oComponentData) {
-		if (oComponentData
-			&& oComponentData.startupParameters
-			&& Array.isArray(oComponentData.startupParameters.hcpApplicationId)) {
+		if (oComponentData?.startupParameters && Array.isArray(oComponentData.startupParameters.hcpApplicationId)) {
 			return oComponentData.startupParameters.hcpApplicationId[0];
 		}
 	}
 
+	/**
+	 * Removes the changes that should be deactivated and the deactivate changes from the Flex Data.
+	 * This is the equivalent of deleting changes from the backend.
+	 * Example Scenario: When creating an annotation rename change, any control based rename changes should be removed.
+	 * But Developer changes can't be deleted from the backend, so they are deactivated.
+	 *
+	 * @param {object} mFlexData - Flex Data as returned from the Storage
+	 * @returns {object} Flex Data without the deactivate and deactivated changes
+	 */
+	function applyDeactivateChanges(mFlexData) {
+		const sDeactivateChangeType = "deactivateChanges";
+		const aToBeDeactivatedIds = mFlexData.changes.map((oChange) => {
+			if (oChange.changeType === sDeactivateChangeType) {
+				return [oChange.fileName, ...oChange.content.changeIds];
+			}
+		})
+		.flat()
+		.filter(Boolean);
+
+		// Filter all changes that should be deactivated (also already includes the id of the deactivate changes)
+		if (aToBeDeactivatedIds.length) {
+			StorageUtils.getAllFlexObjectNamespaces().forEach(function(vKey) {
+				const aFlexItems = ObjectPath.get(vKey, mFlexData);
+				if (aFlexItems.length) {
+					ObjectPath.set(vKey, aFlexItems.filter((oFlexItem) => !aToBeDeactivatedIds.includes(oFlexItem.fileName)), mFlexData);
+				}
+			});
+		}
+		return mFlexData;
+	}
+
 	/**
 	 * Class for loading Flex Data from the backend via the Connectors.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */
@@ -157,6 +184,7 @@ sap.ui.define([
 				allContexts: mPropertyBag.allContexts,
 				adaptationId: mPropertyBag.adaptationId
 			})
+			.then(applyDeactivateChanges.bind())
 			.then(filterInvalidFileNames.bind())
 			.then(migrateSelectorFlags.bind(undefined, isMigrationNeeded(mPropertyBag.manifest)))
 			.then(formatFlexData);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -78,7 +78,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 */
 	var ManifestUtils = {
@@ -141,7 +141,7 @@ function(
 		},
 
 		getCacheKeyFromAsyncHints(sReference, oAsyncHints) {
-			var oFlAsyncHint = getFlAsyncHintRequest(oAsyncHints, sReference);
+			const oFlAsyncHint = getFlAsyncHintRequest(oAsyncHints, sReference);
 			if (oFlAsyncHint) {
 				return oFlAsyncHint.cachebusterToken || "<NO CHANGES>";
 			}
@@ -154,13 +154,11 @@ function(
 			}
 		},
 
-		getChangeManifestFromAsyncHints(oAsyncHints) {
-			// whenever there is a back end providing a fl async hint it is also not necessary to merge on client side
-			var oFlAsyncHint = getFlAsyncHintRequest(oAsyncHints);
-			if (oFlAsyncHint) {
-				return false;
-			}
-			return true;
+		getChangeManifestFromAsyncHints(oAsyncHints, sReference) {
+			const oFlAsyncHint = sReference && getFlAsyncHintRequest(oAsyncHints, sReference);
+			// Request entry might indicate that no changes exist.
+			// If entry is not there, it is unknown and there might be changes
+			return !!(!oFlAsyncHint || oFlAsyncHint.cachebusterToken);
 		},
 
 		getBaseComponentNameFromManifest(oManifest) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/communication/FLPAboutInfo.js

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantManagementState
 	 * @since 1.129
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -125,7 +125,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -215,7 +215,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -75,7 +75,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/changeHandler/condenser/Classification",
 	"sap/ui/fl/initial/_internal/Storage",
 	"sap/ui/fl/LayerUtils"
 ], function(
@@ -24,17 +25,37 @@ sap.ui.define([
 	DependencyHandler,
 	DataSelector,
 	FlexState,
+	Classification,
 	Storage,
 	LayerUtils
 ) {
 	"use strict";
 
+	const oChangeInformationProviders = {
+		ctrl_variant_change: {
+			getCondenserInfo(oFlexObject) {
+				return {
+					classification: Classification.LastOneWins,
+					uniqueKey: oFlexObject.getVariantId() + oFlexObject.getChangeType()
+				};
+			}
+		},
+		ctrl_variant_management_change: {
+			getCondenserInfo(oFlexObject, mPropertyBag) {
+				return {
+					classification: Classification.LastOneWins,
+					uniqueKey: mPropertyBag.modifier.getControlIdBySelector(oFlexObject.getSelector(), mPropertyBag.appComponent)
+				};
+			}
+		}
+	};
+
 	/**
 	 * Handler class to manipulate control variant changes in a variants map. See also {@link sap.ui.fl.variants.VariantManagement}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -126,7 +147,7 @@ sap.ui.define([
 		return {
 			instance: oVariantInstance,
 			variantChanges: oGroupedFlexObjects.variantChanges.filter(function(oFlexObject) {
-				return oFlexObject.getSelector().id === oVariantInstance.getId();
+				return oFlexObject.getVariantId() === oVariantInstance.getId();
 			}),
 			controlChanges: oGroupedFlexObjects.changes.filter(function(oFlexObject) {
 				var bCorrectFlexObjectType = oFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.UIChange");
@@ -304,7 +325,7 @@ sap.ui.define([
 		var oFoundVariant;
 		Object.values(oVariantsMap).some(function(oVariantsMapEntry) {
 			return oVariantsMapEntry.variants.some(function(oVariant) {
-				if (oVariantChange.getSelector().id === oVariant.key) {
+				if (oVariantChange.getVariantId() === oVariant.key) {
 					oFoundVariant = oVariant;
 					return true;
 				}
@@ -406,6 +427,10 @@ sap.ui.define([
 		return oVariantDependentFlexObjectsDataSelector.get({reference: sReference});
 	};
 
+	VariantManagementState.getChangeInformationProvider = function(oFlexObject) {
+		return oChangeInformationProviders[oFlexObject.getFileType()];
+	};
+
 	/**
 	 * Removes the saved current variant from the internal map for the given reference
 	 *
@@ -735,7 +760,7 @@ sap.ui.define([
 				// eslint-disable-next-line camelcase
 				ctrl_variant: () => (oFilteredFlexObject.getVariantId()),
 				// eslint-disable-next-line camelcase
-				ctrl_variant_change: () => (oFilteredFlexObject.getSelector().id),
+				ctrl_variant_change: () => (oFilteredFlexObject.getVariantId()),
 				change: () => (oFilteredFlexObject.getVariantReference())
 			}[oFilteredFlexObject.getFileType()]?.();
 			return !aHiddenVariants.includes(sVariantReference);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,8 +8,8 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Component",
 	"sap/ui/core/Lib",
-	"sap/ui/fl/apply/_internal/changes/descriptor/Applier",
 	"sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory",
+	"sap/ui/fl/apply/_internal/changes/descriptor/InlineApplier",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
@@ -26,8 +26,8 @@ sap.ui.define([
 	Log,
 	Component,
 	Lib,
-	AppDescriptorApplier,
 	ApplyStrategyFactory,
+	InlineApplier,
 	ChangesApplier,
 	FlexState,
 	ManifestUtils,
@@ -200,7 +200,7 @@ sap.ui.define([
 		// manifest descriptor changes for ABAP mixed mode can only be applied in this hook,
 		// because at this point all libs have been loaded (in contrast to the first Component(s) 'onPreprocessManifest' hook),
 		// but the manifest is still adaptable
-		return AppDescriptorApplier.applyChangesIncludedInManifest(oManifest, ApplyStrategyFactory.getRuntimeStrategy());
+		return InlineApplier.applyChanges(oManifest, ApplyStrategyFactory.getRuntimeStrategy());
 	}
 
 	// the current sinon version used in UI5 does not support stubbing the constructor
@@ -272,6 +272,7 @@ sap.ui.define([
 					changeType: oAnnotationChange.getChangeType()
 				});
 				aReturn.push(await oChangeHandler.applyChange(oAnnotationChange));
+				oAnnotationChange._appliedOnModel = true;
 			}
 			return aReturn;
 		} catch (oError) {

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

@@ -1,21 +1,21 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/core/Component",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/Utils",
-	"sap/base/Log"
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/Utils"
 ], function(
+	Log,
 	Component,
-	ManifestUtils,
 	FlexState,
-	Utils,
-	Log
+	ManifestUtils,
+	Utils
 ) {
 	"use strict";
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core
@@ -37,9 +37,25 @@ sap.ui.define([
 		return oChange.getChangeType() === "codeExt";
 	}
 
+	function migrateToNewSyntaxIfNecessary(sControllerName) {
+		if (!sControllerName.startsWith("module:")) {
+			return `module:${sControllerName.replace(/\./g, "/")}.controller`;
+		}
+		return sControllerName;
+	}
+
+	/**
+	 * Checks if the controller name saved in the change matches the provided controller name.
+	 * The syntax for the controller name changed to module syntax in 1.134, so legacy changes need
+	 * to be transformed to module syntax before the check.
+	 *
+	 * @param {string} sControllerName - Name of the controller in module syntax
+	 * @param {sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange} oChange - ControllerExtensionChange instance
+	 * @returns {boolean} - Returns true if the controller name of the change matches the provided controller name
+	 */
 	function isForController(sControllerName, oChange) {
-		var sSelectorControllerName = oChange.getSelector().controllerName;
-		return sControllerName === sSelectorControllerName;
+		var sSelectorControllerName = migrateToNewSyntaxIfNecessary(oChange.getSelector().controllerName);
+		return sSelectorControllerName === migrateToNewSyntaxIfNecessary(sControllerName);
 	}
 
 	function getExtensionModules(aCodeExtModuleNames) {
@@ -58,8 +74,8 @@ sap.ui.define([
 	}
 
 	/**
-	 * Provides an array of extension providers. An extension provider is an object which were defined as controller extensions. These objects
-	 * provides lifecycle and event handler functions of a specific controller.
+	 * Provides an array of extension providers. An extension provider is an object which were defined as controller extensions.
+	 * These objects provide lifecycle and event handler functions of a specific controller.
 	 *
 	 * @param {string} sControllerName - Name of the controller
 	 * @param {string} sComponentId - Unique id for the running controller - unique as well for manifest first

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

@@ -1,12 +1,12 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 // Provides object sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator
 sap.ui.define([
-	"sap/ui/core/mvc/Controller",
+	"sap/ui/core/mvc/ControllerExtensionProvider",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/ComponentHooks",
 	"sap/ui/core/ExtensionPoint",
@@ -22,7 +22,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/preprocessors/ControllerExtension",
 	"sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor"
 ], function(
-	MvcController,
+	MvcControllerExtensionProvider,
 	XMLView,
 	ComponentHooks,
 	ExtensionPoint,
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @since 1.43.0
 	 * @private
 	 */
@@ -71,7 +71,7 @@ sap.ui.define([
 	}
 
 	function registerExtensionProvider() {
-		MvcController.registerExtensionProvider("sap/ui/fl/apply/_internal/preprocessors/ControllerExtension");
+		MvcControllerExtensionProvider.registerExtensionProvider("sap/ui/fl/apply/_internal/preprocessors/ControllerExtension");
 	}
 
 	function registerXMLPreprocessor() {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @since 1.27.0
 	 * @private
 	 */

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -119,10 +119,13 @@ sap.ui.define([
 		 *
 		 * Activates the passed variant applicable to the passed control/component.
 		 * If the Variant is not available and the backend supports lazy loading, a backend request is made to fetch the variant.
+		 * If the flag standardVariant is set to true, the standard variant is activated and the variantReference is ignored.
+		 * In this scenario the passed element must be the variant management control.
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {sap.ui.base.ManagedObject|string} mPropertyBag.element - Component or control (instance or ID) on which the <code>variantModel</code> is set
 		 * @param {string} mPropertyBag.variantReference - Reference to the variant that needs to be activated
+		 * @param {boolean} [mPropertyBag.standardVariant] - If set to true, the standard variant is activated and the variantReference is ignored
 		 *
 		 * @returns {Promise} Resolves after the variant is activated or rejects if an error occurs
 		 *
@@ -158,19 +161,27 @@ sap.ui.define([
 				return logAndReject(Error("No variant management model found for the passed control or application component"));
 			}
 
+			if (mPropertyBag.standardVariant && !oElement.isA("sap.ui.fl.variants.VariantManagement")) {
+				return logAndReject(Error("With using standardVariant and no variantReference, a variant management control must be passed as element"));
+			}
+
+			const sVariantReference = mPropertyBag.standardVariant
+				? oVariantModel.getVariantManagementReferenceForControl(mPropertyBag.element)
+				: mPropertyBag.variantReference;
+
 			// if the variant management reference is not available, the variant is not yet loaded
-			if (!oVariantModel.getVariantManagementReference(mPropertyBag.variantReference).variantManagementReference) {
+			if (!oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference) {
 				try {
 					await VariantManagementState.loadVariant({
 						reference: oVariantModel.sFlexReference,
-						variantReference: mPropertyBag.variantReference
+						variantReference: sVariantReference
 					});
 				} catch (oError) {
-					return logAndReject(Error(`Variant with reference '${mPropertyBag.variantReference}' could not be found`));
+					return logAndReject(Error(`Variant with reference '${sVariantReference}' could not be found`));
 				}
 			}
 
-			const sVariantManagementReference = oVariantModel.getVariantManagementReference(mPropertyBag.variantReference).variantManagementReference;
+			const sVariantManagementReference = oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference;
 			if (!sVariantManagementReference) {
 				return logAndReject(Error("A valid control or component, and a valid variant/ID combination are required"));
 			}
@@ -181,7 +192,7 @@ sap.ui.define([
 			try {
 				return oVariantModel.updateCurrentVariant({
 					variantManagementReference: sVariantManagementReference,
-					newVariantReference: mPropertyBag.variantReference,
+					newVariantReference: sVariantReference,
 					appComponent: oAppComponent
 				});
 			} catch (oError) {

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

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

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

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