@openui5/sap.ui.fl 1.96.1 → 1.97.1

package/.reuse/dep5

@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components

package/THIRDPARTY.txt

@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.96.1",
+  "version": "1.97.1",
   "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.96.1",
-    "@openui5/sap.ui.core": "1.96.1"
+    "@openui5/sap.m": "1.97.1",
+    "@openui5/sap.ui.core": "1.97.1"
   }
 }

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -138,13 +138,13 @@ sap.ui.define([
 	ChangePersistence.prototype._preconditionsFulfilled = function(oChangeOrChangeContent) {
 		var oChangeContent = oChangeOrChangeContent instanceof Change ? oChangeOrChangeContent.getDefinition() : oChangeOrChangeContent;
 
-		function _isControlVariantChange() {
+		function isControlVariantChange() {
 			if ((oChangeContent.fileType === "ctrl_variant") || (oChangeContent.fileType === "ctrl_variant_change") || (oChangeContent.fileType === "ctrl_variant_management_change")) {
 				return oChangeContent.variantManagementReference || oChangeContent.variantReference || (oChangeContent.selector && oChangeContent.selector.id);
 			}
 		}
 
-		return oChangeContent.fileType === "change" || _isControlVariantChange();
+		return oChangeContent.fileType === "change" || isControlVariantChange();
 	};
 
 	/**
@@ -419,7 +419,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 {Promise} Promise resolving with an array of changes
+	 * @returns {sap.ui.fl.Change[]} Array of changes
 	 * @public
 	 */
 	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
@@ -659,6 +659,7 @@ sap.ui.define([
 	 * @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 {number} nParentVersion - Parent version
 	 * @returns {Promise} Resolving after all changes have been saved
 	 */
 	ChangePersistence.prototype.saveDirtyChanges = function(oAppComponent, bSkipUpdateCache, aChanges, nParentVersion) {
@@ -802,7 +803,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
+	 * @param {sap.ui.fl.Change[]} 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.
 	 */
 	ChangePersistence.prototype._massUpdateCacheAndDirtyState = function(aDirtyChanges, bSkipUpdateCache) {

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,7 +14,7 @@ sap.ui.define(function () {
 	 * @alias sap.ui.fl.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.RegistrationDelegator

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;

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

@@ -1,11 +1,9 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/* global WeakMap */
-
 sap.ui.define([
 	"sap/ui/fl/FlexController",
 	"sap/ui/fl/Utils",
@@ -32,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -110,8 +108,11 @@ sap.ui.define([
 			}
 
 			window.sessionStorage.removeItem("sap.ui.rta.restart." + Layer.CUSTOMER);
-			return new Promise(function (resolve) {
-				sap.ui.getCore().loadLibrary("sap.ui.rta", {async: true})
+			return new Promise(function (resolve, reject) {
+				Promise.all([
+					sap.ui.getCore().loadLibrary("sap.ui.rta", {async: true}),
+					oComponent.rootControlLoaded()
+				])
 				.then(function() {
 					sap.ui.require(["sap/ui/rta/api/startKeyUserAdaptation"], function (startKeyUserAdaptation) {
 						startKeyUserAdaptation({
@@ -119,6 +120,9 @@ sap.ui.define([
 						});
 						resolve(oResult);
 					});
+				})
+				.catch(function(oError) {
+					reject(oError);
 				});
 			});
 		}

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -17,8 +17,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/View",
 	"sap/base/util/isPlainObject",
 	"sap/ui/base/SyncPromise"
-],
-function(
+], function(
 	jQuery,
 	Component,
 	BaseTreeModifier,
@@ -47,7 +46,7 @@ function(
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @experimental Since 1.25.0
 	 */
 	var Utils = {
@@ -850,7 +849,7 @@ function(
 
 		/** Returns the type of "sap.app" from the manifest object passed.
 		 * @param {sap.ui.core.Manifest} oManifest - Manifest object
-		 * @returns {string | undefined} Manifest object's "type" property for "sap.app" entry
+		 * @returns {string|undefined} Manifest object's <code>type</code> property for <code>sap.app</code> entry
 		 * @private
 		 */
 		_getComponentTypeFromManifest: function(oManifest) {
@@ -858,8 +857,8 @@ function(
 		},
 
 		/** Returns the type of "sap.app" from the manifest object passed.
-		 * @param {sap.ui.core.Manifest} oRawManifest - raw manifest object
-		 * @returns {string | undefined} Manifest object's "type" property for "sap.app" entry
+		 * @param {sap.ui.core.Manifest} oManifest - Raw manifest object
+		 * @returns {string|undefined} Manifest object's <code>type</code> property for <code>sap.app</code> entry
 		 * @private
 		 */
 		_getComponentTypeFromRawManifest: function(oManifest) {
@@ -1018,8 +1017,9 @@ function(
 			}
 			var fnPromise = aPromiseQueue.shift();
 			if (typeof fnPromise === "function") {
+				var vResult;
 				try {
-					var vResult = fnPromise();
+					vResult = fnPromise();
 				} catch (e) {
 					vResult = Promise.reject(e);
 				}
@@ -1165,7 +1165,7 @@ function(
 
 		/**
 		 * Normalize reference, delete .Component at the end of the incoming string.
-		 * @param {string} reference
+		 * @param {string} sReference - Flex reference
 		 * @returns {string} Returns reference without .Component
 		 */
 		normalizeReference: function(sReference) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class Variant class.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @alias sap.ui.fl.Variant
 	 * @experimental Since 1.52.0
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,21 +26,19 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @experimental Since 1.27.0
 	 */
-	var XmlPreprocessorImpl = function() {
-	};
+	var XmlPreprocessorImpl = function() {};
 
 	/**
 	 * Asynchronous view processing method.
 	 *
-	 * @param {Node} oView XML node of the view to process
-	 * @param {object} mProperties
-	 * @param {string} mProperties.componentId - id of the component creating the view
-	 * @param {string} mPropertyBag.id - id of the processed view
-	 *
-	 * @returns {Promise.<Node>|Node} result of the processing, promise if executed asynchronously
+	 * @param {Node} oView - XML node of the view to process
+	 * @param {object} mProperties - Property Bag
+	 * @param {string} mProperties.componentId - ID of the component creating the view
+	 * @param {string} mPropertyBag.id - ID of the processed view
+	 * @returns {Promise.<Node>|Node} Result of the processing, promise if executed asynchronously
 	 *
 	 * @public
 	 */
@@ -92,8 +90,9 @@ sap.ui.define([
 	/**
 	 * Asynchronous determination of a hash key for caching purposes
 	 *
-	 * @param {Node} oView XML node of the view for which the key should be determined
-	 * @returns {Promise} promise returning the hash key
+	 * @param {object} mProperties - Property Bag
+	 * @param {string} mProperties.componentId - Component instance ID
+	 * @returns {Promise} Resolves with the hash key
 	 *
 	 * @public
 	 */

package/src/sap/ui/fl/apply/_internal/ChangesController.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -50,7 +50,8 @@ sap.ui.define([
 	function _checkAndAdjustChangeStatusSync(oControl, oChange, mChangesMap, oFlexController, mPropertyBag) {
 		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
 		var oModifier = mPropertyBag.modifier;
-		var bIsCurrentlyAppliedOnControl = FlexCustomData.sync.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier);
+		var bHasAppliedCustomData = !!FlexCustomData.sync.getAppliedCustomDataValue(mControl.control, oChange);
+		var bIsCurrentlyAppliedOnControl = bHasAppliedCustomData || FlexCustomData.sync.hasChangeApplyFinishedCustomData(mControl.control, oChange);
 		var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
 		if (bChangeStatusAppliedFinished && !bIsCurrentlyAppliedOnControl) {
 			// if a change was already processed and is not applied anymore, then the control was destroyed and recreated.
@@ -60,9 +61,11 @@ sap.ui.define([
 			oChange.setInitialApplyState();
 		} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 			// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
-			// and the revert data fetched from the Custom Data
 			// scenario: viewCache
-			oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
+			if (bHasAppliedCustomData) {
+				// if the change was applied, set the revert data fetched from the custom data
+				oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
+			}
 			oChange.markFinished();
 		}
 	}
@@ -75,8 +78,20 @@ sap.ui.define([
 		var bXmlModifier = _isXmlModifier(mPropertyBag);
 		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
 		var oModifier = mPropertyBag.modifier;
-		return FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier)
-			.then(function (bIsCurrentlyAppliedOnControl) {
+		return FlexCustomData.getAppliedCustomDataValue(mControl.control, oChange, oModifier)
+			.then(function(oAppliedCustomData) {
+				var bHasAppliedCustomData = !!oAppliedCustomData;
+				return Promise.all([
+					bHasAppliedCustomData,
+					(
+						bHasAppliedCustomData
+						|| FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier)
+					)
+				]);
+			})
+			.then(function(aCustomDataState) {
+				var bHasAppliedCustomData = aCustomDataState[0];
+				var bIsCurrentlyAppliedOnControl = aCustomDataState[1];
 				var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
 				var oModifier = mPropertyBag.modifier;
 				var oAppComponent = mPropertyBag.appComponent;
@@ -93,13 +108,17 @@ sap.ui.define([
 					return oPromise.then(oChange.setInitialApplyState.bind(oChange));
 				} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 					// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
-					// and the revert data fetched from the Custom Data
 					// scenario: viewCache
-					return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
-						.then(function (oParsedRevertDataFromCustomData) {
-							oChange.setRevertData(oParsedRevertDataFromCustomData);
-							oChange.markFinished();
-						});
+					if (bHasAppliedCustomData) {
+						// if the change was applied, set the revert data fetched from the custom data
+						return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
+							.then(function (oParsedRevertDataFromCustomData) {
+								oChange.setRevertData(oParsedRevertDataFromCustomData);
+								oChange.markFinished();
+							});
+					}
+					oChange.markFinished();
+					return undefined;
 				} else if (bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 					// both the change instance and the UI Control are already applied, so the change can be directly marked as finished
 					oChange.markFinished();

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
 	 * @since 1.70
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */