@openui5/sap.ui.fl 1.120.7 → 1.121.0

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -68,7 +68,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -83,35 +83,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -123,14 +123,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -162,7 +162,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -177,6 +177,13 @@ Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: JUnit Reporter for QUnit
 
+Files: src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
+Copyright:
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    jQuery Foundation and other contributors
+License: Apache-2.0 and MIT
+Comment: these files contain content from SAP and JUnit Reporter for QUnit: qunit-junit.js is overall written by SAP, but contains a modified copy of JUnit Reporter for QUnit (qunit-reporter-junit)
+
 Files: src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js
 Copyright: 2012 Matteo Spinelli
 License: MIT
@@ -294,14 +301,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -335,7 +342,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -347,14 +354,14 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
 
 Files: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Arthur David Olson, Paul Eggert and other contributors
 License: Apache-2.0 and LicenseRef-tzdata-PublicDomain
 Comment: these files contain content from SAP and Time Zone Database: _timezones.js is overall written by SAP, but the list of IANA timezone IDs is taken from the Timezone Database
@@ -362,11 +369,6 @@ Comment: these files contain content from SAP and Time Zone Database: _timezones
 
 # Library: sap.ui.documentation:
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
-Copyright: 2013 Ariya Hidayat and other contributors
-License: BSD-2-Clause
-Comment: these files belong to: Esprima
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -459,7 +461,7 @@ Comment: these files belong to: UI5 Web Components
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -15,7 +15,7 @@ Contained in: src/sap.m/src/sap/m/_thirdparty/purify.js
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.31.1
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -124,6 +124,7 @@ Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-reporter-junit.js
+	src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
 
 Component: cubiq.org - iScroll, version: 4.2.5
 Copyright: 2012 Matteo Spinelli
@@ -179,7 +180,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
-Component: Unicode Common Locale Data Repository, version: 43
+Component: Unicode Common Locale Data Repository, version: 44
 Copyright: 1991-2023 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
@@ -334,7 +335,7 @@ License: ISC
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/ISC.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 
-Component: Time Zone Database, version: 2023c
+Component: Time Zone Database, version: 2023d
 Copyright: Arthur David Olson, Paul Eggert and other contributors
 License: LicenseRef-tzdata-PublicDomain
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-tzdata-PublicDomain.txt
@@ -343,13 +344,7 @@ Contained in: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
 
 Library: sap.ui.documentation:
 
-Component: Esprima, version: 1.2.2
-Copyright: 2013 Ariya Hidayat and other contributors
-License: BSD-2-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
-
-Component: highlight.js, version: 10.4.1
+Component: highlight.js, version: 11.9.0
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -466,7 +461,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.6.8
+Component: SAP Theming Base Content, version: 11.10.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -663,38 +658,6 @@ END of license: Apache-2.0
 =================================
 
 
-=================================
-BEGIN of license: BSD-2-Clause
-=================================
-
-Copyright (c) <year> <owner>. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=================================
-END of license: BSD-2-Clause
-=================================
-
-
 =================================
 BEGIN of license: BSD-3-Clause
 =================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.120.7",
+  "version": "1.121.0",
   "description": "OpenUI5 UI Library sap.ui.fl",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.120.7",
-    "@openui5/sap.ui.core": "1.120.7"
+    "@openui5/sap.m": "1.121.0",
+    "@openui5/sap.ui.core": "1.121.0"
   }
 }

package/src/sap/ui/fl/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.120.7</version>
+  <version>1.121.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

package/src/sap/ui/fl/ChangePersistence.js

@@ -6,8 +6,6 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_union",
-	"sap/base/util/includes",
-	"sap/base/util/merge",
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Component",
@@ -16,6 +14,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
@@ -25,12 +24,9 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils",
-	"sap/ui/performance/Measurement"
+	"sap/ui/fl/Utils"
 ], function(
 	union,
-	includes,
-	merge,
 	Log,
 	JsControlTreeModifier,
 	Component,
@@ -39,6 +35,7 @@ sap.ui.define([
 	FlexObjectFactory,
 	States,
 	DependencyHandler,
+	UIChangesState,
 	VariantManagementState,
 	DataSelector,
 	FlexState,
@@ -48,8 +45,7 @@ sap.ui.define([
 	Storage,
 	Layer,
 	LayerUtils,
-	Utils,
-	Measurement
+	Utils
 ) {
 	"use strict";
 
@@ -74,7 +70,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
@@ -83,12 +79,6 @@ sap.ui.define([
 	var ChangePersistence = function(mComponent) {
 		this._mComponent = mComponent;
 
-		this._mChanges = DependencyHandler.createEmptyDependencyMap();
-		this._bChangesMapCreated = false;
-
-		// _mChangesInitial contains a clone of _mChanges to recreated dependencies if changes need to be reapplied
-		this._mChangesInitial = merge({}, this._mChanges);
-
 		if (!this._mComponent || !this._mComponent.name) {
 			Log.error("The Control does not belong to an SAPUI5 component. Personalization and changes for this control might not work as expected.");
 			throw new Error("Missing component name.");
@@ -96,12 +86,10 @@ sap.ui.define([
 
 		this._aDirtyChanges = [];
 		this._oMessagebundle = undefined;
-		this._mChangesEntries = {};
 		oVariantIndependentUIChangesDataSelector.clearCachedResult({reference: this._mComponent.name});
 	};
 
 	async function getChangesFromFlexState(sReference, mPropertyBag, bInvalidateCache) {
-		// TODO the CompVariantState causes an exception in the save scenario
 		try {
 			if (bInvalidateCache) {
 				await FlexState.update(mPropertyBag);
@@ -109,7 +97,8 @@ sap.ui.define([
 
 			await FlexState.getStorageResponse(sReference);
 		} catch (oError) {
-			Log.error("Error during ChangePersistence.prototype.getChangesForComponent");
+			// FIXME the CompVariantState causes an exception in the save scenario,
+			Log.warning("Problem during ChangePersistence.prototype.getChangesForComponent");
 		}
 	}
 
@@ -123,7 +112,6 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.ignoreMaxLayerParameter] Indicates that changes shall be loaded without layer filtering
 	 * @param {boolean} [mPropertyBag.includeCtrlVariants] - Indicates that control variant changes shall be included
 	 * @param {string} [mPropertyBag.cacheKey] Key to validate the cache entry stored on client side
-	 * @param {sap.ui.core.Component} [mPropertyBag.component] - Component instance
 	 * @param {string} [mPropertyBag.version] Number of the version to retrieve changes for
 	 * @param {boolean} bInvalidateCache - should the cache be invalidated
 	 * @returns {Promise} Promise resolving with an array of changes
@@ -138,49 +126,25 @@ sap.ui.define([
 			return [];
 		}
 
+		// TODO: remove and use UIChangesState
 		let aRelevantUIChanges = oVariantIndependentUIChangesDataSelector.get({reference: this._mComponent.name});
 
 		if (!mPropertyBag.includeCtrlVariants) {
-			aRelevantUIChanges = aRelevantUIChanges.concat(VariantManagementState.getInitialChanges({reference: this._mComponent.name}));
+			aRelevantUIChanges = aRelevantUIChanges.concat(
+				VariantManagementState.getInitialChanges({reference: this._mComponent.name})
+			);
 		} else {
-			aRelevantUIChanges = aRelevantUIChanges.concat(VariantManagementState.getVariantDependentFlexObjects(this._mComponent.name));
+			aRelevantUIChanges = aRelevantUIChanges.concat(
+				VariantManagementState.getVariantDependentFlexObjects(this._mComponent.name)
+			);
 		}
 
 		if (mPropertyBag.currentLayer) {
 			aRelevantUIChanges = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aRelevantUIChanges, mPropertyBag.currentLayer);
 		}
-
-		aRelevantUIChanges.forEach(function(oFlexObject) {
-			this._mChangesEntries[oFlexObject.getId()] = oFlexObject;
-		}.bind(this));
 		return aRelevantUIChanges;
 	};
 
-	/**
-	 * Calls the back end asynchronously and fetches all changes for the component
-	 * New changes (dirty state) that are not yet saved to the back end won't be returned.
-	 * @param {object} oAppComponent - Component instance used to prepare the IDs (e.g. local)
-	 * @returns {Promise} Promise resolving with a getter for the changes map
-	 * @public
-	 */
-	ChangePersistence.prototype.loadChangesMapForComponent = function(oAppComponent) {
-		return this.getChangesForComponent({component: oAppComponent}).then(createChangeMap.bind(this));
-
-		function createChangeMap(aChanges) {
-			Measurement.start("fl.createDependencyMap", "Measurement of creating initial dependency map");
-			// Since starting RTA does not recreate ChangePersistence instance, resets changes map is required to filter personalized changes
-			this._mChanges = DependencyHandler.createEmptyDependencyMap();
-
-			aChanges.forEach(this.addChangeAndUpdateDependencies.bind(this, oAppComponent));
-
-			this._mChangesInitial = merge({}, this._mChanges);
-
-			Measurement.end("fl.createDependencyMap", "Measurement of creating initial dependency map");
-			this._bChangesMapCreated = true;
-			return this.getChangesMapForComponent.bind(this);
-		}
-	};
-
 	/**
 	 * Checks the current dependencies map for any open (unresolved) dependencies belonging to the given control
 	 * and returns the IDs of the open dependent changes.
@@ -190,81 +154,32 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
 	 */
 	ChangePersistence.prototype.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
-		return DependencyHandler.getOpenDependentChangesForControl(this._mChanges, JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent), oAppComponent);
-	};
-
-	function getInitialDependencyClone(oChange) {
-		var mInitialDependencies = merge({}, this._mChangesInitial.mDependencies);
-		return mInitialDependencies[oChange.getId()];
-	}
-
-	function copyDependencies(oInitialDependency, aNewValidDependencies, oAppComponent, oChange) {
-		var sControlId;
-		var aNewValidControlDependencies = [];
-		oInitialDependency.controlsDependencies.forEach(function(oDependentControlSelector) {
-			// if the control is already available we don't need to add a dependency to it
-			if (!JsControlTreeModifier.bySelector(oDependentControlSelector, oAppComponent)) {
-				sControlId = JsControlTreeModifier.getControlIdBySelector(oDependentControlSelector, oAppComponent);
-				aNewValidControlDependencies.push(oDependentControlSelector);
-				this._mChanges.mControlsWithDependencies[sControlId] ||= [];
-				if (!includes(this._mChanges.mControlsWithDependencies[sControlId], oChange.getId())) {
-					this._mChanges.mControlsWithDependencies[sControlId].push(oChange.getId());
-				}
-			}
-		}.bind(this));
-
-		oInitialDependency.dependencies = aNewValidDependencies;
-		oInitialDependency.controlsDependencies = aNewValidControlDependencies;
-		if (aNewValidDependencies.length || aNewValidControlDependencies.length) {
-			this._mChanges.mDependencies[oChange.getId()] = oInitialDependency;
-		}
-	}
-
-	/**
-	 * This function copies the initial dependencies (before any changes got applied and dependencies got deleted) for the given change to the mChanges map
-	 * Also checks if the dependency is still valid in a callback
-	 * This function is used in the case that controls got destroyed and recreated
-	 *
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange The change whose dependencies should be copied
-	 * @param {function} fnDependencyValidation this function is called to check if the dependency is still valid
-	 * @param {sap.ui.core.Component} oAppComponent Application component instance that is currently loading
-	 * @returns {object} Returns the mChanges object with the updated dependencies
-	 */
-	ChangePersistence.prototype.copyDependenciesFromInitialChangesMap = function(oChange, fnDependencyValidation, oAppComponent) {
-		var oInitialDependency = getInitialDependencyClone.call(this, oChange);
-		if (oInitialDependency) {
-			var aNewValidDependencies = [];
-			oInitialDependency.dependencies.forEach(function(sChangeId) {
-				if (fnDependencyValidation(sChangeId)) {
-					this._mChanges.mDependentChangesOnMe[sChangeId] ||= [];
-					this._mChanges.mDependentChangesOnMe[sChangeId].push(oChange.getId());
-					aNewValidDependencies.push(sChangeId);
-				}
-			}.bind(this));
-			copyDependencies.call(this, oInitialDependency, aNewValidDependencies, oAppComponent, oChange);
-		}
-		return this._mChanges;
+		return DependencyHandler.getOpenDependentChangesForControl(
+			this.getDependencyMapForComponent(),
+			JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent),
+			oAppComponent
+		);
 	};
 
 	/**
-	 * Adds a new change into changes map positioned right after the referenced change and updates the change dependencies
+	 * Adds a new change into dependency map positioned right after the referenced change and updates the change dependencies
 	 *
 	 * @param {sap.ui.core.Component} oAppComponent - Application component for the view
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} [oReferenceChange] - Reference change. New change is positioned right after this one in the changes map
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} [oReferenceChange] - Reference change. New change is positioned right after this one in the dependency map
 	 */
 	ChangePersistence.prototype.addChangeAndUpdateDependencies = function(oAppComponent, oChange, oReferenceChange) {
 		// the change status should always be initial when it gets added to the map / dependencies
 		// if the component gets recreated the status of the change might not be initial
 		oChange.setInitialApplyState();
 		if (oReferenceChange) {
-			DependencyHandler.insertChange(oChange, this._mChanges, oReferenceChange);
+			DependencyHandler.insertChange(oChange, this.getDependencyMapForComponent(), oReferenceChange);
 		}
-		DependencyHandler.addChangeAndUpdateDependencies(oChange, oAppComponent, this._mChanges);
+		DependencyHandler.addChangeAndUpdateDependencies(oChange, oAppComponent, this.getDependencyMapForComponent());
 	};
 
-	ChangePersistence.prototype._addRunTimeCreatedChangeAndUpdateDependencies = function(oAppComponent, oChange) {
-		DependencyHandler.addRuntimeChangeAndUpdateDependencies(oChange, oAppComponent, this._mChanges, this._mChangesInitial);
+	ChangePersistence.prototype._addRunTimeCreatedChangeToDependencyMap = function(oAppComponent, oChange) {
+		DependencyHandler.addRuntimeChangeToMap(oChange, oAppComponent, this.getDependencyMapForComponent());
 	};
 
 	/**
@@ -272,8 +187,8 @@ sap.ui.define([
 	 * @return {Object<string,object>} mChanges mapping with changes sorted by their selector ids
 	 * @public
 	 */
-	ChangePersistence.prototype.getChangesMapForComponent = function() {
-		return this._mChanges;
+	ChangePersistence.prototype.getDependencyMapForComponent = function() {
+		return UIChangesState.getLiveDependencyMap(this._mComponent.name);
 	};
 
 	/**
@@ -286,7 +201,7 @@ sap.ui.define([
 	 */
 	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
 		var aChanges = union(
-			this.getChangesMapForComponent().aChanges,
+			this.getDependencyMapForComponent().aChanges,
 			mPropertyBag.includeDirtyChanges && this.getDirtyChanges()
 		).filter(function(oChange) {
 			return (
@@ -298,15 +213,6 @@ sap.ui.define([
 		return aChanges;
 	};
 
-	/**
-	 * Checks if the changes map for the component has been created or not.
-	 * @return {boolean} <code>true</code> if the changes map has been created
-	 * @public
-	 */
-	ChangePersistence.prototype.isChangeMapCreated = function() {
-		return this._bChangesMapCreated;
-	};
-
 	/**
 	 * Gets the changes for the given view id. The complete view prefix has to match.
 	 *
@@ -337,8 +243,7 @@ sap.ui.define([
 	};
 
 	function finalizeChangeCreation(oChange, oAppComponent) {
-		this._addRunTimeCreatedChangeAndUpdateDependencies(oAppComponent, oChange);
-		this._mChangesEntries[oChange.getId()] = oChange;
+		this._addRunTimeCreatedChangeToDependencyMap(oAppComponent, oChange);
 		this._addPropagationListener(oAppComponent);
 	}
 
@@ -430,9 +335,7 @@ sap.ui.define([
 			var bNoFlPropagationListenerAttached = oAppComponent.getPropagationListeners().every(fnCheckIsNotFlPropagationListener);
 
 			if (bNoFlPropagationListenerAttached) {
-				var oFlexControllerFactory = sap.ui.require("sap/ui/fl/FlexControllerFactory");
-				var oFlexController = oFlexControllerFactory.create(this._mComponent.name);
-				var fnPropagationListener = Applier.applyAllChangesForControl.bind(Applier, this.getChangesMapForComponent.bind(this), oAppComponent, oFlexController);
+				var fnPropagationListener = Applier.applyAllChangesForControl.bind(Applier, oAppComponent, this._mComponent.name);
 				fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl = true;
 				oAppComponent.addPropagationListener(fnPropagationListener);
 			}
@@ -508,7 +411,7 @@ sap.ui.define([
 		if (!aDirtyChanges.length && !bCondenseAnyLayer) {
 			return [];
 		}
-		var aPersistedAndSameLayerChanges = this._mChanges.aChanges.filter(function(oChange) {
+		var aPersistedAndSameLayerChanges = this.getDependencyMapForComponent().aChanges.filter(function(oChange) {
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
 				return oChange.getState() === States.LifecycleState.PERSISTED && aDraftFilenames.includes(oChange.getId());
 			}
@@ -824,7 +727,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Deletes a change object from the internal map.
+	 * Deletes a change object from the dependency map.
 	 *
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange change which has to be removed from the mapping
 	 * @param {boolean} [bRunTimeCreatedChange] set if the change was created at runtime
@@ -832,8 +735,10 @@ sap.ui.define([
 	 */
 	ChangePersistence.prototype._deleteChangeInMap = function(oChange, bRunTimeCreatedChange) {
 		var sChangeKey = oChange.getId();
-		DependencyHandler.removeChangeFromMap(this._mChanges, sChangeKey);
-		DependencyHandler.removeChangeFromDependencies(bRunTimeCreatedChange ? this._mChangesInitial : this._mChanges, sChangeKey);
+		DependencyHandler.removeChangeFromMap(this.getDependencyMapForComponent(), sChangeKey);
+		if (!bRunTimeCreatedChange) {
+			DependencyHandler.removeChangeFromDependencies(this.getDependencyMapForComponent(), sChangeKey);
+		}
 	};
 
 	function isLocalAndInLayer(sLayer, oObject) {
@@ -883,14 +788,14 @@ sap.ui.define([
 	};
 
 	/**
-	 * Collect changes from the internal map by names
+	 * Collect changes from the dependency map by names
 	 *
 	 * @param {string[]} aNames Names of changes
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges Array of changes with corresponding names
 	 * @private
 	 */
 	ChangePersistence.prototype._getChangesFromMapByNames = function(aNames) {
-		return this._mChanges.aChanges.filter(function(oChange) {
+		return this.getDependencyMapForComponent().aChanges.filter(function(oChange) {
 			return aNames.indexOf(oChange.getId()) !== -1;
 		});
 	};

package/src/sap/ui/fl/ChangePersistenceFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @since 1.58