@openui5/sap.ui.fl 1.130.1 → 1.131.1

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

@@ -5,6 +5,7 @@
  */
 sap.ui.define([
 	"sap/base/util/restricted/_pick",
+	"sap/base/util/isPlainObject",
 	"sap/base/util/ObjectPath",
 	"sap/ui/fl/apply/_internal/flexObjects/AnnotationChange",
 	"sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange",
@@ -22,6 +23,7 @@ sap.ui.define([
 	"sap/ui/fl/Utils"
 ], function(
 	_pick,
+	isPlainObject,
 	ObjectPath,
 	AnnotationChange,
 	AppDescriptorChange,
@@ -50,6 +52,10 @@ sap.ui.define([
 		UPDATABLE_CHANGE: UpdatableChange
 	};
 
+	function cloneIfObject(oValue) {
+		return isPlainObject(oValue) ? { ...oValue } : oValue;
+	}
+
 	function getFlexObjectClass(oNewFileContent) {
 		if (oNewFileContent.fileType === "variant") {
 			return FLEX_OBJECT_TYPES.COMP_VARIANT_OBJECT;
@@ -67,7 +73,8 @@ sap.ui.define([
 		return FLEX_OBJECT_TYPES.UI_CHANGE;
 	}
 
-	function createBasePropertyBag(mProperties) {
+	function createBasePropertyBag(mOriginalProperties) {
+		const mProperties = cloneIfObject(mOriginalProperties);
 		const sChangeType = mProperties.type || mProperties.changeType;
 		const sFileName = mProperties.fileName || mProperties.id || Utils.createDefaultFileName(sChangeType);
 		const sUser = mProperties.user ||
@@ -78,11 +85,11 @@ sap.ui.define([
 			id: sFileName,
 			adaptationId: mProperties.adaptationId,
 			layer: mProperties.layer,
-			content: mProperties.content,
-			texts: mProperties.texts,
+			content: cloneIfObject(mProperties.content),
+			texts: cloneIfObject(mProperties.texts),
 			supportInformation: {
 				service: mProperties.ODataService,
-				oDataInformation: mProperties.oDataInformation,
+				oDataInformation: cloneIfObject(mProperties.oDataInformation),
 				command: mProperties.command,
 				compositeCommand: mProperties.compositeCommand,
 				generator: mProperties.generator,
@@ -106,7 +113,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -209,18 +216,19 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlVariant} Variant instance
 	 */
 	FlexObjectFactory.createFlVariant = function(mPropertyBag) {
-		mPropertyBag.generator ||= "FlexObjectFactory.createFlVariant";
-		const mProperties = createBasePropertyBag(mPropertyBag);
-		mProperties.variantManagementReference = mPropertyBag.variantManagementReference;
-		mProperties.variantReference = mPropertyBag.variantReference;
-		mProperties.contexts = mPropertyBag.contexts;
+		const mPropertyBagClone = cloneIfObject(mPropertyBag);
+		mPropertyBagClone.generator ||= "FlexObjectFactory.createFlVariant";
+		const mProperties = createBasePropertyBag(mPropertyBagClone);
+		mProperties.variantManagementReference = mPropertyBagClone.variantManagementReference;
+		mProperties.variantReference = mPropertyBagClone.variantReference;
+		mProperties.contexts = mPropertyBagClone.contexts;
 		mProperties.texts = {
 			variantName: {
-				value: mPropertyBag.variantName,
+				value: mPropertyBagClone.variantName,
 				type: "XFLD"
 			}
 		};
-		mProperties.author = getVariantAuthor(mProperties.supportInformation.user, mProperties.layer, mPropertyBag.authors);
+		mProperties.author = getVariantAuthor(mProperties.supportInformation.user, mProperties.layer, mPropertyBagClone.authors);
 		return new FlVariant(mProperties);
 	};
 
@@ -256,21 +264,23 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} Created comp variant object
 	 */
 	FlexObjectFactory.createCompVariant = function(oFileContent, mAuthors) {
-		oFileContent.generator ||= "FlexObjectFactory.createCompVariant";
-		oFileContent.user = ObjectPath.get("support.user", oFileContent);
-		const mCompVariantContent = createBasePropertyBag(oFileContent);
+		const oFileContentClone = cloneIfObject(oFileContent);
+		oFileContentClone.generator ||= "FlexObjectFactory.createCompVariant";
+		oFileContentClone.user = ObjectPath.get("support.user", oFileContentClone);
+		const mCompVariantContent = createBasePropertyBag(oFileContentClone);
 
-		mCompVariantContent.variantId = oFileContent.variantId || mCompVariantContent.id;
-		mCompVariantContent.contexts = oFileContent.contexts;
-		mCompVariantContent.favorite = oFileContent.favorite;
-		mCompVariantContent.persisted = oFileContent.persisted;
-		mCompVariantContent.persistencyKey = oFileContent.persistencyKey || ObjectPath.get("selector.persistencyKey", oFileContent);
+		mCompVariantContent.variantId = oFileContentClone.variantId || mCompVariantContent.id;
+		mCompVariantContent.contexts = oFileContentClone.contexts;
+		mCompVariantContent.favorite = oFileContentClone.favorite;
+		mCompVariantContent.persisted = oFileContentClone.persisted;
+		mCompVariantContent.persistencyKey = oFileContentClone.persistencyKey ||
+			ObjectPath.get("selector.persistencyKey", oFileContentClone);
 
-		if (oFileContent.layer === Layer.VENDOR || oFileContent.layer === Layer.CUSTOMER_BASE) {
+		if (oFileContentClone.layer === Layer.VENDOR || oFileContentClone.layer === Layer.CUSTOMER_BASE) {
 			mCompVariantContent.favorite = true;
 		}
-		if (oFileContent.executeOnSelection !== undefined) {
-			mCompVariantContent.executeOnSelection = oFileContent.executeOnSelection;
+		if (oFileContentClone.executeOnSelection !== undefined) {
+			mCompVariantContent.executeOnSelection = oFileContentClone.executeOnSelection;
 		} else {
 			// Legacy changes contains 'executeOnSelect' information inside content structure
 			mCompVariantContent.executeOnSelection = mCompVariantContent.content && (

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.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -19,7 +19,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.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -102,7 +102,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

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

@@ -78,7 +78,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 */
 	var ManifestUtils = {

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.130.1
+	 * @version 1.131.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.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -190,17 +190,12 @@ sap.ui.define([
 				// 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({

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantManagementState
 	 * @since 1.129
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -125,7 +125,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -215,7 +215,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.130.1
+		 * @version 1.131.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -75,7 +75,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -463,15 +463,15 @@ sap.ui.define([
 	};
 
 	/**
-	 * Loads the flex objects for the given variant references and adds them to the FlexState.
+	 * Loads the flex objects for a given variant reference and adds them to the FlexState.
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
 	 * @param {string} mPropertyBag.reference - Flexibility reference
-	 * @param {string[]} mPropertyBag.variantReferences - List of variant references to be loaded
+	 * @param {string} mPropertyBag.variantReference - Variant reference to be loaded
 	 */
-	VariantManagementState.loadVariants = async function(mPropertyBag) {
-		const oStorageResponse = await Storage.loadFlVariants({
-			variantReferences: mPropertyBag.variantReferences,
+	VariantManagementState.loadVariant = async function(mPropertyBag) {
+		const oStorageResponse = await Storage.loadFlVariant({
+			variantReference: mPropertyBag.variantReference,
 			reference: mPropertyBag.reference
 		});
 		FlexState.updateWithDataProvided({

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

@@ -39,7 +39,7 @@ sap.ui.define([
 
 	/**
 	 * @namespace sap.ui.fl.apply._internal.preprocessors.ComponentLifecycleHooks
-	 * @since Since 1.114
+	 * @since 1.114
 	 * @author SAP SE
 	 *
 	 * @private

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @since 1.43.0
 	 * @private
 	 */

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @since 1.27.0
 	 * @private
 	 */

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

@@ -161,9 +161,9 @@ sap.ui.define([
 			// if the variant management reference is not available, the variant is not yet loaded
 			if (!oVariantModel.getVariantManagementReference(mPropertyBag.variantReference).variantManagementReference) {
 				try {
-					await VariantManagementState.loadVariants({
+					await VariantManagementState.loadVariant({
 						reference: oVariantModel.sFlexReference,
-						variantReferences: [mPropertyBag.variantReference]
+						variantReference: mPropertyBag.variantReference
 					});
 				} catch (oError) {
 					return logAndReject(Error(`Variant with reference '${mPropertyBag.variantReference}' could not be found`));

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

@@ -55,7 +55,7 @@ sap.ui.define([
 		 * The instance-specific read delegate is returned if available.
 		 *
 		 * @param {object} mPropertyBag - Property bag
-		 * @param {sap.ui.core.Element|DomNode} mPropertyBag.control - Control for which the corresponding delegate should be returned
+		 * @param {sap.ui.core.Element|Element} mPropertyBag.control - Control for which the corresponding delegate should be returned
 		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
 		 * @param {string} [mPropertyBag.modelType] - Model type; required in case you passed the <code>XmlTreeModifier</code>
 		 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
@@ -77,7 +77,7 @@ sap.ui.define([
 	 	 * The instance-specific write delegate is returned if available.
 		 *
 		 * @param {object} mPropertyBag - Property bag
-		 * @param {sap.ui.core.Element|DomNode} mPropertyBag.control - Control for which the corresponding delegate should be returned
+		 * @param {sap.ui.core.Element|Element} mPropertyBag.control - Control for which the corresponding delegate should be returned
 		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
 		 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
 		 *

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.130.1
+	 * @version 1.131.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.130.1
+	 * @version 1.131.1
 	 * @since 1.54
 	 * @private
 	 */
@@ -72,17 +72,19 @@ sap.ui.define([
 	 * @name sap.ui.fl.changeHandler.AddXML#completeChangeContent
 	 */
 	AddXML.completeChangeContent = function(oChange, oSpecificChangeInfo) {
-		var oContent = {};
-		if (oSpecificChangeInfo.targetAggregation) {
-			oContent.targetAggregation = oSpecificChangeInfo.targetAggregation;
-		} else {
+		// TODO: Remove assignment without content after all derived change handlers are adjusted to use content. todos#4
+		const oChangeInfoContent = oSpecificChangeInfo.content || oSpecificChangeInfo;
+		const oContent = {};
+		if (!oChangeInfoContent.targetAggregation) {
 			BaseAddXml._throwMissingAttributeError("targetAggregation");
+		} else {
+			oContent.targetAggregation = oChangeInfoContent.targetAggregation;
 		}
 
-		if (oSpecificChangeInfo.index !== undefined) {
-			oContent.index = oSpecificChangeInfo.index;
-		} else {
+		if (oChangeInfoContent.index === undefined) {
 			BaseAddXml._throwMissingAttributeError("index");
+		} else {
+			oContent.index = oChangeInfoContent.index;
 		}
 
 		BaseAddXml.completeChangeContent(oChange, oSpecificChangeInfo, oContent);

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @since 1.75
 	 * @private
 	 */

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.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

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.130.1
+	 * @version 1.131.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */
@@ -282,41 +282,47 @@ sap.ui.define([
 				 */
 				completeChangeContent(oChange, mSpecificChangeInfo, mPropertyBag) {
 					const oAppComponent = mPropertyBag.appComponent;
+					// TODO: Remove assignment without content after all derived change handlers are adjusted to use content. todos#4
+					const oChangeInfoContent = mSpecificChangeInfo.content || mSpecificChangeInfo;
 					const oContent = {};
-					if (mSpecificChangeInfo.parentId) {
+					if (oChangeInfoContent.parentId) {
 						if (isFunction(mAddViaDelegateSettings.mapParentIdIntoChange)) {
-							mAddViaDelegateSettings.mapParentIdIntoChange(oChange, mSpecificChangeInfo, mPropertyBag);
+							mAddViaDelegateSettings.mapParentIdIntoChange(oChange, oChangeInfoContent, mPropertyBag);
 						} else {
-							oChange.addDependentControl(mSpecificChangeInfo.parentId, mAddViaDelegateSettings.parentAlias, mPropertyBag);
+							oChange.addDependentControl(
+								oChangeInfoContent.parentId,
+								mAddViaDelegateSettings.parentAlias,
+								mPropertyBag
+							);
 						}
 						try {
-							oContent.parentId = mPropertyBag.modifier.getSelector(mSpecificChangeInfo.parentId, oAppComponent);
+							oContent.parentId = mPropertyBag.modifier.getSelector(oChangeInfoContent.parentId, oAppComponent);
 						} catch (e) {
 							// If the parentId is not stable, e.g. in the case of SimpleForm groups
 							// don't set the parentId. This error is safe to ignore as a missing parentId
 							// will disable condensing
 						}
 					} else {
-						throw new Error("mSpecificChangeInfo.parentId attribute required");
+						throw new Error("mSpecificChangeInfo.content.parentId attribute required");
 					}
-					if (mSpecificChangeInfo.bindingPath) {
-						oContent.bindingPath = mSpecificChangeInfo.bindingPath;
+					if (oChangeInfoContent.bindingPath) {
+						oContent.bindingPath = oChangeInfoContent.bindingPath;
 					} else {
-						throw new Error("mSpecificChangeInfo.bindingPath attribute required");
+						throw new Error("mSpecificChangeInfo.content.bindingPath attribute required");
 					}
-					if (mSpecificChangeInfo.newControlId) {
-						oContent.newFieldSelector = mPropertyBag.modifier.getSelector(mSpecificChangeInfo.newControlId, oAppComponent);
+					if (oChangeInfoContent.newControlId) {
+						oContent.newFieldSelector = mPropertyBag.modifier.getSelector(oChangeInfoContent.newControlId, oAppComponent);
 					} else {
-						throw new Error("mSpecificChangeInfo.newControlId attribute required");
+						throw new Error("mSpecificChangeInfo.content.newControlId attribute required");
 					}
-					if (mSpecificChangeInfo.index === undefined) {
-						throw new Error("mSpecificChangeInfo.targetIndex attribute required");
+					if (oChangeInfoContent.index === undefined) {
+						throw new Error("mSpecificChangeInfo.content.targetIndex attribute required");
 					} else {
-						oContent.newFieldIndex = mSpecificChangeInfo.index;
+						oContent.newFieldIndex = oChangeInfoContent.index;
 					}
-					if (mSpecificChangeInfo.oDataServiceVersion) {
+					if (oChangeInfoContent.oDataServiceVersion) {
 						// used to connect to change handler mediator
-						oContent.oDataServiceVersion = mSpecificChangeInfo.oDataServiceVersion;
+						oContent.oDataServiceVersion = oChangeInfoContent.oDataServiceVersion;
 					}
 					oChange.setContent(oContent);
 				},

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.130.1
+	 * @version 1.131.1
 	 * @since 1.75
 	 * @private
 	 * @ui5-restricted change handlers
@@ -166,11 +166,12 @@ sap.ui.define([
 	 */
 	BaseAddXml.completeChangeContent = function(oChange, oSpecificChangeInfo, oContent) {
 		oContent ||= {};
-		if (oSpecificChangeInfo.fragmentPath) {
-			oContent.fragmentPath = oSpecificChangeInfo.fragmentPath;
-		} else {
+		// TODO: Remove assignment without content after all derived change handlers are adjusted to use content. todos#4
+		const oSpecificChangeContent = oSpecificChangeInfo.content || oSpecificChangeInfo;
+		if (!oSpecificChangeContent.fragmentPath) {
 			BaseAddXml._throwMissingAttributeError("fragmentPath");
 		}
+		oContent.fragmentPath ??= oSpecificChangeContent.fragmentPath;
 		oChange.setContent(oContent);
 
 		// Calculate the moduleName for the fragment

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.130.1
+	 * @version 1.131.1
 	 * @since 1.46
 	 *
 	 * @private
@@ -101,10 +101,10 @@ sap.ui.define([
 						originalControlType: mPropertyBag.modifier.getControlType(oControlToBeRenamed)
 					});
 
-					if (typeof (mSpecificChangeInfo.value) === "string") {
-						oChange.setText(sChangePropertyName, mSpecificChangeInfo.value, sTranslationTextType);
-					} else if (typeof (mSpecificChangeInfo.content.value) === "string") {
-						oChange.setText(sChangePropertyName, mSpecificChangeInfo.content.value, sTranslationTextType);
+					// TODO: Remove assignment without content after all derived change handlers are adjusted to use content. todos#4
+					const oChangeContent = mSpecificChangeInfo.content || mSpecificChangeInfo;
+					if (typeof (oChangeContent.value) === "string") {
+						oChange.setText(sChangePropertyName, oChangeContent.value, sTranslationTextType);
 					} else {
 						throw new Error("oSpecificChangeInfo.value attribute required");
 					}

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.130.1
+	 * @version 1.131.1
 	 * @since 1.27.0
 	 */
 	var 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.130.1
+	 * @version 1.131.1
 	 * @since 1.46
 	 */
 	var MoveControls = { };
@@ -282,12 +282,14 @@ function(
 	 * @name sap.ui.fl.changeHandler.MoveControls#completeChangeContent
 	 */
 	MoveControls.completeChangeContent = async function(oChange, mSpecificChangeInfo, mPropertyBag) {
-		var oModifier = mPropertyBag.modifier;
-		var oAppComponent = mPropertyBag.appComponent;
+		const oModifier = mPropertyBag.modifier;
+		const oAppComponent = mPropertyBag.appComponent;
+		// TODO: Remove assignment without content after all derived change handlers are adjusted to use content. todos#4
+		const oChangeContent = mSpecificChangeInfo.content || mSpecificChangeInfo;
 
-		checkCompleteChangeContentConditions(mSpecificChangeInfo);
-		const mCompleteSpecificChangeInfo = await completeSpecificChangeInfo(oModifier, mSpecificChangeInfo, oAppComponent);
-		var oContent = {
+		checkCompleteChangeContentConditions(oChangeContent);
+		const mCompleteSpecificChangeInfo = await completeSpecificChangeInfo(oModifier, oChangeContent, oAppComponent);
+		const oContent = {
 			movedElements: [],
 			source: {
 				selector: mCompleteSpecificChangeInfo.source.selector

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.130.1
+	 * @version 1.131.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.130.1
+	 * @version 1.131.1
 	 * @since 1.38
 	 * @private
 	 */