@openui5/sap.ui.fl 1.124.1 → 1.125.0

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

@@ -8,26 +8,22 @@ sap.ui.define([
 	"sap/base/util/restricted/_omit",
 	"sap/base/util/restricted/_pick",
 	"sap/base/util/ObjectPath",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/LayerUtils"
 ], function(
 	_omit,
 	_pick,
 	ObjectPath,
-	JsControlTreeModifier,
 	VariantsApplyUtil,
 	DependencyHandler,
 	DataSelector,
 	States,
 	FlexState,
-	LayerUtils,
-	Utils
+	LayerUtils
 ) {
 	"use strict";
 
@@ -36,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -45,7 +41,8 @@ sap.ui.define([
 	// Map that contains the IDs of selected current variants per flex reference and variant management
 	// Might contain outdated entries if a different component with the same flex reference is loaded
 	// However these outdated entries will be invalidated when the variant management map is built
-	var mCurrentVariantReferences = {};
+	const mCurrentVariantReferences = {};
+	const mVariantSwitchPromises = {};
 
 	function getInitialCurrentVariant(sReference, aCtrlVariantManagementChanges, aVariants) {
 		var oComponentData = FlexState.getComponentData(sReference);
@@ -702,30 +699,23 @@ sap.ui.define([
 	};
 
 	/**
-	 * Calls <code>waitForChangesToBeApplied</code> with all the controls that have changes in the initial variant.
+	 * Sets the promise for the variant switch for the given reference.
 	 *
-	 * @param {object} mPropertyBag - Object with necessary parameters
-	 * @param {string} mPropertyBag.vmReference - Variant management reference
-	 * @param {string} mPropertyBag.reference - Component reference
-	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - App component instance
-	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - FlexController instance
-	 * @returns {Promise} Promise that resolves when all changes for the initial variant are applied
+	 * @param {string} sReference - Flex reference of the app
+	 * @param {Promise<undefined>} oPromise - Variant Switch Promise
 	 */
-	VariantManagementState.waitForInitialVariantChanges = function(mPropertyBag) {
-		var aCurrentVariantChanges = VariantManagementState.getInitialUIChanges({
-			vmReference: mPropertyBag.vmReference,
-			reference: mPropertyBag.reference
-		});
-		var aControls = aCurrentVariantChanges.reduce(function(aCurrentControls, oChange) {
-			var oSelector = oChange.getSelector();
-			var oControl = JsControlTreeModifier.bySelector(oSelector, mPropertyBag.appComponent);
-			if (oControl && Utils.indexOfObject(aCurrentControls, { selector: oControl }) === -1) {
-				aCurrentControls.push({ selector: oControl });
-			}
-			return aCurrentControls;
-		}, []);
+	VariantManagementState.setVariantSwitchPromise = function(sReference, oPromise) {
+		mVariantSwitchPromises[sReference] = oPromise;
+	};
 
-		return aControls.length ? mPropertyBag.flexController.waitForChangesToBeApplied(aControls) : Promise.resolve();
+	/**
+	 * Gets the promise for the variant switch for the given reference.
+	 *
+	 * @param {string} sReference - Flex reference of the app
+	 * @returns {Promise<undefined>} Variant Switch Promise
+	 */
+	VariantManagementState.getVariantSwitchPromise = function(sReference) {
+		return mVariantSwitchPromises[sReference];
 	};
 
 	return VariantManagementState;

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @since 1.43.0
 	 * @private
 	 */

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

@@ -10,8 +10,8 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/Utils",
-	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/Utils",
@@ -22,8 +22,8 @@ sap.ui.define([
 	Component,
 	Applier,
 	ChangesUtils,
-	UIChangesState,
 	VariantManagementState,
+	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	Utils,
@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.27.0
 	 * @private
 	 */
@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @public
 	 */
 	function getChangesForView(mPropertyBag) {
-		const aAllApplicableUIChanges = UIChangesState.getAllApplicableUIChanges(mPropertyBag.reference);
+		const aAllApplicableUIChanges = FlexObjectState.getAllApplicableUIChanges(mPropertyBag.reference);
 		return aAllApplicableUIChanges.filter(ChangesUtils.isChangeInView.bind(undefined, mPropertyBag));
 	}
 

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @since 1.67
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

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

@@ -8,11 +8,11 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
 	"sap/ui/VersionInfo"
@@ -20,11 +20,11 @@ sap.ui.define([
 	Log,
 	JsControlTreeModifier,
 	VariantUtils,
+	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	FlexConfiguration,
 	FlexInfoSession,
-	FlexControllerFactory,
 	Layer,
 	Utils,
 	VersionInfo
@@ -117,25 +117,21 @@ sap.ui.define([
 		 * @ui5-restricted
 		 */
 		waitForChanges(mPropertyBag) {
-			var aComplexSelectors;
-			var oFirstElement;
+			let aComplexSelectors;
 			if (mPropertyBag.element) {
 				aComplexSelectors = [{
 					selector: mPropertyBag.element
 				}];
-				oFirstElement = mPropertyBag.element;
 			} else if (mPropertyBag.selectors) {
 				aComplexSelectors = mPropertyBag.selectors.map(function(oSelector) {
 					return {
 						selector: oSelector
 					};
 				});
-				[oFirstElement] = mPropertyBag.selectors;
 			} else if (mPropertyBag.complexSelectors) {
 				aComplexSelectors = mPropertyBag.complexSelectors;
-				oFirstElement = mPropertyBag.complexSelectors[0].selector;
 			}
-			return FlexControllerFactory.createForSelector(oFirstElement).waitForChangesToBeApplied(aComplexSelectors);
+			return FlexObjectState.waitForFlexObjectsToBeApplied(aComplexSelectors);
 		},
 
 		/**

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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @since 1.54
 	 * @private
 	 */

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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @private
 	 */
 	const BaseAddViaDelegate = {
@@ -206,6 +206,15 @@ sap.ui.define([
 						oRevertData.valueHelpSelector = oValueHelpSelector;
 						oChange.setRevertData(oRevertData);
 					}
+					// If the control is a layoutControl it should be destroyed in the revert, which will also destroy the field
+					if (mInnerControls.layoutControl) {
+						const oRevertData = oChange.getRevertData();
+						oRevertData.newFieldSelector = mPropertyBag.modifier.getSelector(
+							mPropertyBag.modifier.getId(mInnerControls.control),
+							oAppComponent
+						);
+						oChange.setRevertData(oRevertData);
+					}
 				},
 
 				/**

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.124.1
+	 * @version 1.125.0
 	 * @since 1.75
 	 * @private
 	 */

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.124.1
+	 * @version 1.125.0
 	 * @since 1.46
 	 *
 	 */

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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @since 1.46
 	 */
 	var 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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @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.124.1
+	 * @version 1.125.0
 	 * @since 1.36
 	 * @private
 	 */

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.27.0
 	 */
 	var StashControl = {};

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for unhiding of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.27.0
 	 */
 	var UnhideControl = {};

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.27.0
 	 */
 	var UnstashControl = {};

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/initial/_internal/FlexConfiguration.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * The flexibility Configuration.
 	 *
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @alias module:sap/ui/fl/initial/_internal/FlexConfiguration
 	 * @namespace

package/src/sap/ui/fl/initial/_internal/Storage.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.Storage
 	 * @since 1.67
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/initial/_internal/StorageFeaturesMerger.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.intial._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 */

package/src/sap/ui/fl/initial/_internal/StorageUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @alias sap.ui.fl.registry.ChangeHandlerRegistration
 		 *
 		 * @author SAP SE
-		 * @version 1.124.1
+		 * @version 1.125.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeHandlerStorage
 	 *
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

package/src/sap/ui/fl/initial/_internal/connectors/Utils.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.connectors, sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js

@@ -51,7 +51,7 @@ function(
 	 * @name sap.ui.fl.initial._internal.storageResultDisassemble
 	 * @function
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 * Disassembles a response with a variant section into one or more plain responses.

package/src/sap/ui/fl/interfaces/BaseLoadConnector.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @name sap.ui.fl.interfaces.BaseLoadConnector
 	 * @since 1.79
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 *
 	 * @private
 	 * @ui5-restricted SAP Web IDE (Visual Editor), UX Tools

package/src/sap/ui/fl/interfaces/Delegate.js

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 * @since 1.78
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 *
 	 * @private
 	 * @ui5-restricted