@openui5/sap.ui.fl 1.108.2 → 1.110.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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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
@@ -299,14 +299,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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)
@@ -340,7 +340,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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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
@@ -352,14 +352,14 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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
@@ -469,7 +469,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 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

@@ -185,7 +185,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: 35.1
+Component: Unicode Common Locale Data Repository, version: 41
 Copyright: 1991-2014 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
@@ -478,7 +478,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.1.40
+Component: SAP Theming Base Content, version: 11.1.48
 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.108.2",
+  "version": "1.110.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.108.2",
-    "@openui5/sap.ui.core": "1.108.2"
+    "@openui5/sap.m": "1.110.0",
+    "@openui5/sap.ui.core": "1.110.0"
   }
 }

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

@@ -4,9 +4,9 @@
   <name>sap.ui.fl</name>
   <vendor>SAP SE</vendor>
   <copyright>OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.108.2</version>
+  <version>1.110.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

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

@@ -1,17 +1,17 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/base/Log"
 ],
 function(
 	FlexState,
-	Utils,
+	ControlVariantApplyAPI,
 	Log
 ) {
 	"use strict";
@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -121,8 +121,21 @@ function(
 			})
 			.then(function(sCacheKey) {
 				// concat current control variant ids to cachekey if available
-				var oVariantModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
-				var aCurrentControlVariantIds = oVariantModel ? oVariantModel.getCurrentControlVariantIds() : [];
+				var oVariantModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
+				if (!oVariantModel) {
+					return sCacheKey;
+				}
+				// If there are no changes, the standard variant is created after the variant management control is instantiated
+				// When the cache key is calculated before this happens, the standard variant id is unknown
+				// To avoid inconsistencies between page load and navigation scenarios, all standard variants are filtered
+				var aVariantManagementControlIds = oVariantModel.getVariantManagementControlIds();
+				var aCurrentControlVariantIds = oVariantModel.getCurrentControlVariantIds()
+					.filter(function(sVariantId) {
+						// FIXME: The standard variant flag should be part of the variant instance
+						// This can be changed once the variant data selector is ready
+						// For now rely on the fact that standard variants have the same name as the vm control
+						return !aVariantManagementControlIds.includes(sVariantId);
+					});
 				return _concatControlVariantIdWithCacheKey(sCacheKey, aCurrentControlVariantIds.join("-"));
 			});
 	};

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,6 +16,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject",
 	"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/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
@@ -25,7 +26,6 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/Cache",
-	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
@@ -43,6 +43,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObject,
 	FlexObjectFactory,
+	States,
 	DependencyHandler,
 	VariantManagementState,
 	FlexState,
@@ -52,7 +53,6 @@ sap.ui.define([
 	Storage,
 	Version,
 	Cache,
-	Change,
 	LayerUtils,
 	Layer,
 	Utils,
@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @experimental Since 1.25.0
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
 	 * @param {string} mComponent.name - Name of the component this instance is responsible for
@@ -94,19 +94,15 @@ sap.ui.define([
 
 	function getChangeInstance(oFileContent, oChangeOrChangeContent) {
 		var oChange;
-		if (oChangeOrChangeContent instanceof Change || oChangeOrChangeContent instanceof FlexObject) {
+		if (oChangeOrChangeContent instanceof FlexObject) {
 			oChange = oChangeOrChangeContent; // can have other states
 			this._mChangesEntries[oChange.getId()] = oChange;
 		} else {
 			if (!this._mChangesEntries[oChangeOrChangeContent.fileName]) {
-				if (oChangeOrChangeContent.changeType === "codeExt") {
-					this._mChangesEntries[oChangeOrChangeContent.fileName] = FlexObjectFactory.createFromFileContent(oChangeOrChangeContent);
-				} else {
-					this._mChangesEntries[oChangeOrChangeContent.fileName] = new Change(oChangeOrChangeContent);
-				}
+				this._mChangesEntries[oChangeOrChangeContent.fileName] = FlexObjectFactory.createFromFileContent(oChangeOrChangeContent);
 			}
 			oChange = this._mChangesEntries[oChangeOrChangeContent.fileName];
-			oChange.setState(Change.states.PERSISTED);
+			oChange.setState(States.LifecycleState.PERSISTED);
 		}
 		return oChange;
 	}
@@ -150,7 +146,7 @@ sap.ui.define([
 		var sVariantReference;
 		var sSelectorId;
 
-		if (oChangeOrChangeContent instanceof Change) {
+		if (oChangeOrChangeContent instanceof FlexObject) {
 			var oChange = oChangeOrChangeContent;
 			sFileType = oChange.getFileType();
 			sVariantReference = oChange.getVariantReference();
@@ -183,7 +179,6 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.cacheKey] Key to validate the cache entry stored on client side
 	 * @param {sap.ui.core.Component} [mPropertyBag.component] - Component instance
 	 * @param {boolean} bInvalidateCache - should the cache be invalidated
-	 * @see sap.ui.fl.Change
 	 * @returns {Promise} Promise resolving with an array of changes
 	 * @public
 	 */
@@ -264,7 +259,7 @@ sap.ui.define([
 		var sChangeLayer;
 		if (
 			typeof oChangeOrChangeContent.isA === "function"
-			&& (oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.FlVariant") || oChangeOrChangeContent.isA("sap.ui.fl.Change"))
+			&& (oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.FlVariant") || oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.UIChange"))
 		) {
 			sChangeLayer = oChangeOrChangeContent.getLayer();
 		} else {
@@ -291,7 +286,6 @@ sap.ui.define([
 	 * 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)
-	 * @see sap.ui.fl.Change
 	 * @returns {Promise} Promise resolving with a getter for the changes map
 	 * @public
 	 */
@@ -319,13 +313,13 @@ sap.ui.define([
 	 *
 	 * @param {object} oSelector selector of the control
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
+	 * @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 getInitalDependencyClone(oChange) {
+	function getInitialDependencyClone(oChange) {
 		var mInitialDependencies = merge({}, this._mChangesInitial.mDependencies);
 		return mInitialDependencies[oChange.getId()];
 	}
@@ -357,13 +351,13 @@ sap.ui.define([
 	 * 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.Change} oChange The change whose dependencies should be copied
+	 * @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.copyDependenciesFromInitialChangesMapSync = function(oChange, fnDependencyValidation, oAppComponent) {
-		var oInitialDependency = getInitalDependencyClone.call(this, oChange);
+	ChangePersistence.prototype.copyDependenciesFromInitialChangesMap = function(oChange, fnDependencyValidation, oAppComponent) {
+		var oInitialDependency = getInitialDependencyClone.call(this, oChange);
 		if (oInitialDependency) {
 			var aNewValidDependencies = [];
 			oInitialDependency.dependencies.forEach(function(sChangeId) {
@@ -378,45 +372,12 @@ sap.ui.define([
 		return this._mChanges;
 	};
 
-	/**
-	 * 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.Change} 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 {Promise} Resolves the mChanges object with the updated dependencies
-	 */
-	ChangePersistence.prototype.copyDependenciesFromInitialChangesMap = function(oChange, fnDependencyValidation, oAppComponent) {
-		var oInitialDependency = getInitalDependencyClone.call(this, oChange);
-		if (oInitialDependency) {
-			var aNewValidDependencies = [];
-			return oInitialDependency.dependencies.reduce(function (oPreviousPromise, sChangeId) {
-				return oPreviousPromise.then(function () {
-					return fnDependencyValidation(sChangeId);
-				}).then(function (bDependencyIsStillValid) {
-					if (bDependencyIsStillValid) {
-						this._mChanges.mDependentChangesOnMe[sChangeId] = this._mChanges.mDependentChangesOnMe[sChangeId] || [];
-						this._mChanges.mDependentChangesOnMe[sChangeId].push(oChange.getId());
-						aNewValidDependencies.push(sChangeId);
-					}
-				}.bind(this));
-			}.bind(this), Promise.resolve())
-			.then(function () {
-				copyDependencies.call(this, oInitialDependency, aNewValidDependencies, oAppComponent, oChange);
-				return this._mChanges;
-			}.bind(this));
-		}
-		return Promise.resolve(this._mChanges);
-	};
-
 	/**
 	 * Adds a new change into changes 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.changeObject} oChange - Change instance
-	 * @param {sap.ui.fl.changeObject} [oReferenceChange] - Refernce change. New change is positioned right after this one in the changes map
+	 * @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
 	 */
 	ChangePersistence.prototype.addChangeAndUpdateDependencies = function(oAppComponent, oChange, oReferenceChange) {
 		// the change status should always be initial when it gets added to the map / dependencies
@@ -433,7 +394,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Getter for the private aggregation containing sap.ui.fl.Change objects mapped by their selector ids.
+	 * Getter for the private aggregation containing sap.ui.fl.apply._internal.flexObjects.FlexObject objects mapped by their selector ids.
 	 * @return {map} mChanges mapping with changes sorted by their selector ids
 	 * @public
 	 */
@@ -446,7 +407,7 @@ sap.ui.define([
 	 * @param {map} mPropertyBag - Contains additional data needed for reading changes
 	 * @param {string} [mPropertyBag.layer] - Specifies a single layer for loading changes
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Whether dirty changes of the current session should be included
-	 * @returns {sap.ui.fl.Change[]} Array of changes
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of changes
 	 * @public
 	 */
 	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
@@ -506,7 +467,7 @@ sap.ui.define([
 	 *
 	 * @param {object} vChange - The complete and finalized JSON object representation the file content of the change or a Change instance
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
-	 * @returns {sap.ui.fl.Change} the newly created change
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} the newly created change
 	 * @public
 	 */
 	ChangePersistence.prototype.addChange = function(vChange, oAppComponent) {
@@ -521,23 +482,21 @@ sap.ui.define([
 	 * Adds a new dirty change.
 	 *
 	 * @param {object} vChange - JSON object of change or change object
-	 * @returns {sap.ui.fl.Change} The prepared change object
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} The prepared change object
 	 * @public
 	 */
 	ChangePersistence.prototype.addDirtyChange = function(vChange) {
 		var oNewChange;
-		if (
-			typeof vChange.isA === "function"
-			&& (vChange.isA("sap.ui.fl.Change") || vChange.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject"))
-		) {
+		if (typeof vChange.isA === "function" && vChange.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject")) {
 			oNewChange = vChange;
 		} else {
-			oNewChange = new Change(vChange);
+			oNewChange = FlexObjectFactory.createFromFileContent(vChange);
 		}
 
 		// don't add the same change twice
 		if (this._aDirtyChanges.indexOf(oNewChange) === -1) {
 			this._aDirtyChanges.push(oNewChange);
+			FlexState.addDirtyFlexObject(this._mComponent.name, oNewChange);
 		}
 		return oNewChange;
 	};
@@ -639,9 +598,9 @@ sap.ui.define([
 		}
 		var aPersistedAndSameLayerChanges = this._mChanges.aChanges.filter(function(oChange) {
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
-				return oChange.getState() === Change.states.PERSISTED && aDraftFilenames.includes(oChange.getId());
+				return oChange.getState() === States.LifecycleState.PERSISTED && aDraftFilenames.includes(oChange.getId());
 			}
-			return oChange.getState() === Change.states.PERSISTED && LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
+			return oChange.getState() === States.LifecycleState.PERSISTED && LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
 		});
 		return aPersistedAndSameLayerChanges.concat(aDirtyChanges);
 	}
@@ -650,7 +609,7 @@ sap.ui.define([
 		if (aDirtyChanges.length) {
 			var aRequests = getRequests(aDirtyChanges);
 			var aStates = getStates(aDirtyChanges);
-			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW;
+			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === States.LifecycleState.NEW;
 		}
 		return true;
 	}
@@ -665,7 +624,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
 	 * @param {boolean} [bSkipUpdateCache] - If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
-	 * @param {sap.ui.fl.Change} [aChanges] - If passed only those changes are saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} [aChanges] - If passed only those changes are saved
 	 * @param {string} sParentVersion - Parent version
 	 * @param {string[]} [aDraftFilenames] - Filenames from persisted changes draft version
 	 * @param {boolean} [bCondenseAnyLayer] - This will enable condensing regardless of the current layer
@@ -728,7 +687,7 @@ sap.ui.define([
 	 * to ensure the correct order, the methods are called sequentially;
 	 * after a change was saved successfully, it is removed from the dirty changes and the cache is updated.
 	 *
-	 * @param {sap.ui.fl.Change[]} aDirtyChanges - Array of dirty changes to be saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges - Array of dirty changes to be saved
 	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 * @param {string} [sParentVersion] - Indicates if changes should be written as a draft and on which version the changes should be based on
@@ -740,7 +699,7 @@ sap.ui.define([
 			// in case of changes saved for a draft only the first writing operation must have the parentVersion targeting the basis
 			// followup changes must point the the existing draft created with the first request
 			var aNewChanges = aDirtyChanges.filter(function (oChange) {
-				return oChange.getState() === Change.states.NEW;
+				return oChange.getState() === States.LifecycleState.NEW;
 			});
 			oFirstNewChange = [].concat(aNewChanges).shift();
 		}
@@ -754,7 +713,7 @@ sap.ui.define([
 
 	function performSingleSaveAction(oDirtyChange, oFirstChange, sParentVersion) {
 		switch (oDirtyChange.getState()) {
-			case Change.states.NEW:
+			case States.LifecycleState.NEW:
 				if (sParentVersion !== undefined) {
 					sParentVersion = oDirtyChange === oFirstChange ? sParentVersion : Version.Number.Draft;
 				}
@@ -764,7 +723,7 @@ sap.ui.define([
 					transport: oDirtyChange.getRequest(),
 					parentVersion: sParentVersion
 				});
-			case Change.states.DELETED:
+			case States.LifecycleState.DELETED:
 				return Storage.remove({
 					flexObject: oDirtyChange.convertToFileContent(),
 					layer: oDirtyChange.getLayer(),
@@ -777,7 +736,7 @@ sap.ui.define([
 
 	/**
 	 * Updates the cache with the dirty change passed and removes it from the array of dirty changes if present.
-	 * @param {sap.ui.fl.Change} oDirtyChange Dirty change which was saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oDirtyChange Dirty change which was saved
 	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app
 	 * therefore, the cache update of the current app is skipped
 	 */
@@ -794,15 +753,15 @@ sap.ui.define([
 				});
 			} else {
 				switch (oDirtyChange.getState()) {
-					case Change.states.NEW:
-						oDirtyChange.setState(Change.states.PERSISTED);
+					case States.LifecycleState.NEW:
+						oDirtyChange.setState(States.LifecycleState.PERSISTED);
 						Cache.addChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
-					case Change.states.DELETED:
+					case States.LifecycleState.DELETED:
 						Cache.deleteChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
-					case Change.states.DIRTY:
-						oDirtyChange.setState(Change.states.PERSISTED);
+					case States.LifecycleState.DIRTY:
+						oDirtyChange.setState(States.LifecycleState.PERSISTED);
 						Cache.updateChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
 				}
@@ -811,7 +770,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {sap.ui.fl.Change[]} aDirtyChanges - Array of dirty changes
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges - Array of dirty changes
 	 * @param {boolean} [bSkipUpdateCache]-  If <code>true</code>, then the dirty change shall be saved for the newly created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 */
@@ -871,17 +830,18 @@ sap.ui.define([
 	 *
 	 * Otherwise it will be marked for deletion.
 	 *
-	 * @param {sap.ui.fl.Change} oChange the change to be deleted
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange the change to be deleted
 	 * @param {boolean} [bRunTimeCreatedChange] set if the change was created at runtime
 	 */
 	ChangePersistence.prototype.deleteChange = function(oChange, bRunTimeCreatedChange) {
 		var nIndexInDirtyChanges = this._aDirtyChanges.indexOf(oChange);
 
 		if (nIndexInDirtyChanges > -1) {
-			if (oChange.getState() === Change.states.DELETED) {
+			if (oChange.getState() === States.LifecycleState.DELETED) {
 				return;
 			}
 			this._aDirtyChanges.splice(nIndexInDirtyChanges, 1);
+			FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
 			this._deleteChangeInMap(oChange, bRunTimeCreatedChange);
 			return;
 		}
@@ -896,6 +856,7 @@ sap.ui.define([
 
 		if (nIndexInDirtyChanges > -1) {
 			this._aDirtyChanges.splice(nIndexInDirtyChanges, 1);
+			FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
 		}
 		this._deleteChangeInMap(oChange);
 	};
@@ -903,7 +864,7 @@ sap.ui.define([
 	/**
 	 * Deletes a change object from the internal map.
 	 *
-	 * @param {sap.ui.fl.Change} oChange change which has to be removed from the mapping
+	 * @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
 	 * @private
 	 */
@@ -918,7 +879,7 @@ sap.ui.define([
 	}
 
 	function isPersistedAndInLayer(sLayer, oObject) {
-		return oObject.getState() === Change.states.PERSISTED && oObject.getLayer() === sLayer;
+		return oObject.getState() === States.LifecycleState.PERSISTED && oObject.getLayer() === sLayer;
 	}
 
 	function getAllCompVariantsEntities() {
@@ -964,7 +925,7 @@ sap.ui.define([
 	 * Collect changes from the internal map by names
 	 *
 	 * @param {string[]} aNames Names of changes
-	 * @returns {sap.ui.fl.Change[]} aChanges Array of changes with corresponding names
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges Array of changes with corresponding names
 	 * @private
 	 */
 	ChangePersistence.prototype._getChangesFromMapByNames = function(aNames) {
@@ -1014,7 +975,8 @@ sap.ui.define([
 		aChangesToBeRemoved.forEach(function (oChange) {
 			var nIndex = aDirtyChanges.indexOf(oChange);
 			aDirtyChanges.splice(nIndex, 1);
-		});
+			FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
+		}.bind(this));
 
 		return Promise.resolve(aChangesToBeRemoved);
 	};

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */