@openui5/sap.ui.fl 1.140.0 → 1.141.1

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

@@ -6,17 +6,26 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Component",
 	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
+	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	Log,
+	JsControlTreeModifier,
 	Component,
 	Element,
 	URLHandler,
+	VariantUtil,
 	VariantManagementState,
+	FlexObjectState,
+	ManifestUtils,
 	Utils
 ) {
 	"use strict";
@@ -41,6 +50,68 @@ sap.ui.define([
 		});
 	}
 
+	function handleInitialLoadScenario(sVMReference, oVariantManagementControl, sFlexReference) {
+		const aVariantChangesForVariant = VariantManagementState.getVariantChangesForVariant({
+			vmReference: sVMReference,
+			reference: sFlexReference
+		});
+
+		const sDefaultVariantReference = VariantManagementState.getDefaultVariantReference({
+			vmReference: sVMReference,
+			reference: sFlexReference
+		});
+
+		if (
+			oVariantManagementControl.getExecuteOnSelectionForStandardDefault()
+			&& sDefaultVariantReference === sVMReference
+			&& !aVariantChangesForVariant.some((oVariantChange) => oVariantChange.getChangeType() === "setExecuteOnSelect")
+		) {
+			const oStandardVariant = VariantManagementState.getVariant({
+				vmReference: sVMReference,
+				reference: sFlexReference,
+				vReference: sVMReference
+			});
+			// set executeOnSelect without creating a change
+			oStandardVariant.instance.setExecuteOnSelection(true);
+			VariantManagementState.updateVariant({
+				reference: sFlexReference,
+				variant: oStandardVariant.instance
+			});
+			return true;
+		}
+		return false;
+	}
+
+	function waitForInitialVariantChanges(mPropertyBag) {
+		const aCurrentVariantChanges = VariantManagementState.getInitialUIChanges({
+			vmReference: mPropertyBag.vmReference,
+			reference: mPropertyBag.reference
+		});
+		const aSelectors = aCurrentVariantChanges.reduce((aCurrentControls, oChange) => {
+			const oSelector = oChange.getSelector();
+			const oControl = JsControlTreeModifier.bySelector(oSelector, mPropertyBag.appComponent);
+			if (oControl && Utils.indexOfObject(aCurrentControls, { selector: oControl }) === -1) {
+				aCurrentControls.push({ selector: oControl });
+			}
+			return aCurrentControls;
+		}, []);
+		return aSelectors.length ? FlexObjectState.waitForFlexObjectsToBeApplied(aSelectors) : Promise.resolve();
+	}
+
+	function waitForControlToBeRendered(oControl) {
+		return new Promise((resolve) => {
+			if (oControl.getDomRef()) {
+				resolve();
+			} else {
+				oControl.addEventDelegate({
+					onAfterRendering() {
+						resolve();
+					}
+				});
+			}
+		});
+	}
+
 	/**
 	 * Provides an API for applications to work with control variants. See also {@link sap.ui.fl.variants.VariantManagement}.
 	 *
@@ -64,7 +135,7 @@ sap.ui.define([
 		/**
 		 * Returns a promise that resolves to the variant model once it is available
 		 *
-		 * @param {object} oAppComponent - Application component
+		 * @param {sap.ui.core.Component} oAppComponent - Application component
 		 * @returns {Promise} Promise resolving to the Variant Model
 		 *
 		 * @private
@@ -74,10 +145,26 @@ sap.ui.define([
 			return waitForVariantModel(oAppComponent);
 		},
 
+		/**
+		 * Returns the variant management control instance for a variant management reference.
+		 *
+		 * @param {string} sVariantManagementReference - Reference to the variant management control
+		 * @param {sap.ui.core.Component} oAppComponent - Application component
+		 * @returns {sap.ui.fl.variants.VariantManagement} The variant management control instance
+		 */
+		getVariantManagementControlByVMReference(sVariantManagementReference, oAppComponent) {
+			const sVMControlId = oAppComponent.byId(sVariantManagementReference)
+				? oAppComponent.createId(sVariantManagementReference)
+				: sVariantManagementReference;
+			return Element.getElementById(sVMControlId);
+		},
+
 		/**
 		 * Clears URL technical parameter <code>sap-ui-fl-control-variant-id</code> for control variants.
-		 * Use this method in case you normally want the variant parameter in the URL, but have a few special navigation patterns where you want to clear it.
-		 * If you don't want that parameter in general, set the <code>updateVariantInURL</code> parameter on your variant management control to <code>false</code>. SAP Fiori elements use this method.
+		 * Use this method in case you normally want the variant parameter in the URL,
+		 * but have a few special navigation patterns where you want to clear it.
+		 * If you don't want that parameter in general, set the <code>updateVariantInURL</code> parameter
+		 * on your variant management control to <code>false</code>. SAP Fiori elements use this method.
 		 * If a variant management control is given as a parameter, only parameters specific to that control are cleared.
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
@@ -116,11 +203,11 @@ 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.
+		 * Activates the passed variant applicable to the passed control/component. The corresponding variant management control must be
+		 * available when this function is called.
+		 * If the variant is not found 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
@@ -132,9 +219,9 @@ sap.ui.define([
 		 * @public
 		 */
 		async activateVariant(mPropertyBag) {
-			function logAndReject(oError) {
+			function logAndThrowError(oError) {
 				Log.error(oError);
-				return Promise.reject(oError);
+				throw oError;
 			}
 
 			let oElement;
@@ -144,7 +231,7 @@ sap.ui.define([
 					oElement = Element.getElementById(mPropertyBag.element);
 
 					if (!(oElement instanceof Element)) {
-						return logAndReject(Error("No valid component or control found for the provided ID"));
+						logAndThrowError(Error("No valid component or control found for the provided ID"));
 					}
 				}
 			} else if (mPropertyBag.element instanceof Component || mPropertyBag.element instanceof Element) {
@@ -152,52 +239,71 @@ sap.ui.define([
 			}
 
 			const oAppComponent = Utils.getAppComponentForControl(oElement);
+			const sFlexReference = ManifestUtils.getFlexReferenceForControl(oElement);
 			if (!oAppComponent) {
-				return logAndReject(Error("A valid variant management control or component (instance or ID) should be passed as parameter"));
+				logAndThrowError(
+					Error("A valid variant management control or component (instance or ID) should be passed as parameter")
+				);
 			}
 
 			const oVariantModel = oAppComponent.getModel(VARIANT_MODEL_NAME);
 			if (!oVariantModel) {
-				return logAndReject(Error("No variant management model found for the passed control or application component"));
+				logAndThrowError(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"));
+				logAndThrowError(
+					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;
+			let sVariantManagementReference;
+			let sVariantReference;
+			let oVMControl;
+			if (mPropertyBag.standardVariant) {
+				sVariantManagementReference = oElement.getVariantManagementReference();
+				sVariantReference = sVariantManagementReference;
+				oVMControl = oElement;
+			} else {
+				sVariantManagementReference = VariantManagementState.getVariantManagementReferenceForVariant(
+					sFlexReference,
+					mPropertyBag.variantReference
+				);
+				sVariantReference = mPropertyBag.variantReference;
 
-			// if the variant management reference is not available, the variant is not yet loaded
-			if (!oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference) {
-				try {
-					await VariantManagementState.loadVariant({
-						reference: oVariantModel.sFlexReference,
-						variantReference: sVariantReference
-					});
-				} catch (oError) {
-					return logAndReject(Error(`Variant with reference '${sVariantReference}' could not be found`));
-				}
-			}
+				if (!sVariantManagementReference) {
+					// if the variant management reference is not available, the variant is maybe not yet loaded
+					try {
+						await VariantManagementState.loadVariant({
+							reference: sFlexReference,
+							variantReference: sVariantReference
+						});
 
-			const sVariantManagementReference = oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference;
-			if (!sVariantManagementReference) {
-				return logAndReject(Error("A valid control or component, and a valid variant/ID combination are required"));
+						sVariantManagementReference = VariantManagementState.getVariantManagementReferenceForVariant(
+							sFlexReference,
+							mPropertyBag.variantReference
+						);
+					} catch (oError) {
+						logAndThrowError(Error(`Variant with reference '${sVariantReference}' could not be found`));
+					}
+					if (!sVariantManagementReference) {
+						logAndThrowError(Error("Variant management reference not found. Check the passed element and variantReference"));
+					}
+				}
+				oVMControl = this.getVariantManagementControlByVMReference(sVariantManagementReference, oAppComponent);
 			}
 
 			// sap/fe is using this API very early during app start, sometimes before FlexState is initialized
-			await oVariantModel.waitForVMControlInit(sVariantManagementReference);
+			await oVMControl.waitForInit();
 
 			try {
-				return oVariantModel.updateCurrentVariant({
+				await oVariantModel.updateCurrentVariant({
 					variantManagementReference: sVariantManagementReference,
 					newVariantReference: sVariantReference,
 					appComponent: oAppComponent
 				});
 			} catch (oError) {
-				Log.error(oError);
-				throw oError;
+				logAndThrowError(oError);
 			}
 		},
 
@@ -216,18 +322,49 @@ sap.ui.define([
 		 *
 		 * @public
 		 */
-		attachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
-			var oAppComponent = Utils.getAppComponentForControl(oControl);
-
-			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
-				oVariantModel.attachVariantApplied({
-					vmControlId: mPropertyBag.vmControlId,
-					control: oControl,
-					callback: mPropertyBag.callback,
-					callAfterInitialVariant: mPropertyBag.callAfterInitialVariant
+		async attachVariantApplied(mPropertyBag) {
+			const oVariantManagementControl = Element.getElementById(mPropertyBag.vmControlId);
+			await oVariantManagementControl.waitForInit();
+
+			const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
+			const oAppComponent = Utils.getAppComponentForControl(oControl);
+			const sVMReference = oVariantManagementControl.getVariantManagementReference();
+			const sFlexReference = ManifestUtils.getFlexReferenceForControl(oVariantManagementControl);
+
+			const bInitialLoad = handleInitialLoadScenario(sVMReference, oVariantManagementControl, sFlexReference);
+			// if the parameter callAfterInitialVariant or initialLoad is true call the function without check
+			if (mPropertyBag.callAfterInitialVariant || bInitialLoad) {
+				waitForInitialVariantChanges({
+					appComponent: oAppComponent,
+					reference: sFlexReference,
+					vmReference: sVMReference
+				}).then(() => {
+					const sCurrentVariantReference = VariantManagementState.getCurrentVariantReference({
+						vmReference: sVMReference,
+						reference: sFlexReference
+					});
+					const oVariant = VariantManagementState.getVariant({
+						vmReference: sVMReference,
+						reference: sFlexReference,
+						vReference: sCurrentVariantReference
+					});
+					mPropertyBag.callback(oVariant);
 				});
-			});
+			}
+
+			// first check if the passed vmControlId is correct, then save the callback
+			// for this check the control has to be in the control tree already
+			await waitForControlToBeRendered(oControl);
+			if (VariantUtil.getRelevantVariantManagementControlId(oControl) === mPropertyBag.vmControlId) {
+				// showExecuteOnSelection is only relevant when a control can react to the variant applied event
+				// e.g. for ListReport, Table, etc.
+				oVariantManagementControl.setShowExecuteOnSelection(true);
+				oVariantManagementControl._addVariantAppliedListener(oControl, mPropertyBag.callback);
+			} else {
+				Log.error(
+					"Error in attachVariantApplied: The passed VariantManagement ID doesn't match the responsible VariantManagement control"
+				);
+			}
 		},
 
 		/**
@@ -239,12 +376,12 @@ sap.ui.define([
 		 *
 		 * @public
 		 */
-		detachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
-			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
-				oVariantModel.detachVariantApplied(mPropertyBag.vmControlId, oControl);
-			});
+		async detachVariantApplied(mPropertyBag) {
+			const oVariantManagementControl = Element.getElementById(mPropertyBag.vmControlId);
+			const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
+			// Ensure that the variant attach process is finished before removing the listener
+			await Promise.all([oVariantManagementControl.waitForInit(), waitForControlToBeRendered(oControl)]);
+			oVariantManagementControl._removeVariantAppliedListener(oControl);
 		}
 	};
 

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

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/DelegateMediator"
+	"sap/ui/fl/apply/_internal/DelegateMediator",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	DelegateMediator
 ) {
@@ -89,6 +90,21 @@ sap.ui.define([
 				mPropertyBag.control,
 				mPropertyBag.modifier
 			);
+		},
+
+		/**
+		 * Registers a handler for adjusting XML fragments. The handler will be stored without reference to the app,
+		 * and will therefore be available for all apps.
+		 *
+		 * @param {object} mPropertyBag - Property bag
+		 * @param {string} mPropertyBag.key - Key for the handler
+		 * @param {function} mPropertyBag.handler - Handler function returning the adjusted fragment or a Promise resolving with the adjusted fragment
+		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 */
+		registerAddXMLAdjustFragmentHandler(mPropertyBag) {
+			DelegateMediator.registerAddXMLAdjustFragmentHandler(mPropertyBag);
 		}
 	};
 

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

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/extensionPoint/Registry"
+	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	ExtensionPointRegistry
 ) {

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

@@ -17,7 +17,8 @@ sap.ui.define([
 	"sap/ui/fl/initial/api/InitialFlexAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
-	"sap/ui/VersionInfo"
+	"sap/ui/VersionInfo",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	Log,
 	JsControlTreeModifier,

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

@@ -9,7 +9,8 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/initial/_internal/ManifestUtils",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	CompVariantManagementState,
 	CompVariantUtils,

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

@@ -7,7 +7,8 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/initial/_internal/ManifestUtils"
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	UI2PersonalizationState,
 	FlexState,

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.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.1
 	 * @since 1.54
 	 * @private
 	 */
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.view Root view
 	 * @returns {boolean} <true> if the change got applied successfully
 	 * @private
-	 * @ui5-restricted sap.ui.fl.apply.changes.Applyer
+	 * @ui5-restricted sap.ui.fl.apply.changes.Applier
 	 * @name sap.ui.fl.changeHandler.AddXML#applyChange
 	 */
 	AddXML.applyChange = function(oChange, oControl, mPropertyBag) {

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

@@ -5,10 +5,10 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/api/ExtensionPointRegistryAPI",
+	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
 	"sap/ui/fl/changeHandler/BaseAddXml"
 ], function(
-	ExtensionPointRegistryAPI,
+	ExtensionPointRegistry,
 	BaseAddXml
 ) {
 	"use strict";
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.75
 	 * @private
 	 */
@@ -79,7 +79,7 @@ sap.ui.define([
 			// Confirm with ready function in sync apply scenario (preprocessing with JSView)
 			mExtensionPointInfo.ready(aNewControls);
 		}
-		ExtensionPointRegistryAPI.addCreatedControlsToExtensionPointInfo({
+		ExtensionPointRegistry.addCreatedControls({
 			name: oSelector.name,
 			viewId: sViewId,
 			createdControlsIds: aNewControls.map((oNewControl) => oModifier.getId(oNewControl))

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.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */
@@ -66,7 +66,8 @@ sap.ui.define([
 
 			const oModifier = mPropertyBag.modifier;
 			const oView = mPropertyBag.view;
-			const sFragment = LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
+			const sFragment = mPropertyBag.fragment || LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
+
 			try {
 				return await oModifier.instantiateFragment(sFragment, sIdPrefix, oView);
 			} catch (oError) {

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

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

@@ -5,13 +5,15 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/changeHandler/Base",
 	"sap/base/util/LoaderExtensions",
-	"sap/ui/fl/changeHandler/common/revertAddedControls"
+	"sap/ui/fl/apply/_internal/DelegateMediator",
+	"sap/ui/fl/changeHandler/common/revertAddedControls",
+	"sap/ui/fl/changeHandler/Base"
 ], function(
-	Base,
 	LoaderExtensions,
-	revertAddedControls
+	DelegateMediator,
+	revertAddedControls,
+	Base
 
 ) {
 	"use strict";
@@ -21,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.75
 	 * @private
 	 * @ui5-restricted change handlers
@@ -36,7 +38,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Property bag
 	 * @param {object} mPropertyBag.modifier - Modifier for the controls
 	 * @param {object} mPropertyBag.view - Root view
-	 * @param {object} mChangeInfo - Change Informantion map
+	 * @param {object} mChangeInfo - Change Information map
 	 * @param {number} mChangeInfo.index - Index defines the position at witch the xml fragment is added
 	 * @param {string} mChangeInfo.aggregationName - Aggregation name of the control to be extended by the xml fragment
 	 * @param {boolean} [mChangeInfo.skipAdjustIndex] - True in case of inserting an XML node or element at an extension point, needed only in XML case
@@ -48,14 +50,24 @@ sap.ui.define([
 	BaseAddXml.applyChange = async function(oChange, oControl, mPropertyBag, mChangeInfo) {
 		const oModifier = mPropertyBag.modifier;
 		const sAggregationName = mChangeInfo.aggregationName;
-		const sModuleName = oChange.getFlexObjectMetadata().moduleName;
+		const oFlexObjectMetadata = oChange.getFlexObjectMetadata();
+		const sModuleName = oFlexObjectMetadata.moduleName;
 
 		const oAggregationDefinition = await oModifier.findAggregation(oControl, sAggregationName);
 		if (!oAggregationDefinition) {
 			throw Error(`The given Aggregation is not available in the given control: ${oModifier.getId(oControl)}`);
 		}
-		const sFragment = await LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
-		const aNewControls = await Base.instantiateFragment(oChange, mPropertyBag);
+		let sFragment = await LoaderExtensions.loadResource(sModuleName, {dataType: "text"}); // complete xml fragment as string
+
+		const oAdjustFragmentHandlers = DelegateMediator.getAddXMLAdjustFragmentHandlers();
+		if (oAdjustFragmentHandlers) {
+			for (const sKey in oAdjustFragmentHandlers) {
+				sFragment = await oAdjustFragmentHandlers[sKey](sFragment, mPropertyBag);
+			}
+		}
+
+		// now the real UI5 controls are created from the XML string
+		const aNewControls = await Base.instantiateFragment(oChange, { ...mPropertyBag, fragment: sFragment });
 
 		let iIterator = 0;
 		for (const oNewControl of aNewControls) {

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.46
 	 *
 	 * @private

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Default change handler for annotations.
 	 * @alias sap.ui.fl.changeHandler.ChangeAnnotation
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.132
 	 * @public
 	 */
@@ -41,7 +41,12 @@ sap.ui.define([
 
 		const oObjectTemplateInfo = oContent.objectTemplateInfo;
 		if (oObjectTemplateInfo) {
-			oReturn.value = JSON.parse(oObjectTemplateInfo.templateAsString.replace(oObjectTemplateInfo.placeholder, sValue));
+			// Parse the object before replacing the placeholder to avoid issues with escaped special characters
+			const oParsedTemplate = JSON.parse(oObjectTemplateInfo.templateAsString);
+			Object.keys(oParsedTemplate).forEach((sKey) => {
+				oParsedTemplate[sKey] = oParsedTemplate[sKey].replace(oObjectTemplateInfo.placeholder, sValue);
+			});
+			oReturn.value = oParsedTemplate;
 		} else {
 			oReturn.value = sValue;
 		}

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.140.0
+	 * @version 1.141.1
 	 * @since 1.27.0
 	 */
 	const HideControl = {};

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.46
 	 */
 	const MoveControls = { };

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

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @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.140.0
+	 * @version 1.141.1
 	 * @since 1.38
 	 * @private
 	 */

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.140.0
+	 * @version 1.141.1
 	 * @since 1.36
 	 * @private
 	 */