@openui5/sap.ui.layout 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ 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/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -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
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 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)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ 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: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -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
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 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.34
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

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

package/src/sap/ui/layout/.library

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

package/src/sap/ui/layout/AlignedFlowLayout.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @private
@@ -221,18 +221,22 @@ sap.ui.define([
 			var oEndItemDomRef,
 				oObserverEntry = aObserverEntries[0],
 				bWidthChangedSignificantly = hasWidthChangedSignificantly(this.fLayoutWidth, oObserverEntry, oDomRef),
-				fNewWidth = oObserverEntry.contentRect.width;
+				fNewWidth = oObserverEntry.contentRect.width,
+				fNewHeight = oObserverEntry.contentRect.height;
 
 			if (bWidthChangedSignificantly) {
 				this.fLayoutWidth = fNewWidth;
+				this.fLayoutHeight = fNewHeight;
 			} else {
 				oEndItemDomRef = this.getDomRef("endItem");
 				bWidthChangedSignificantly = hasWidthChangedSignificantly(this.fEndItemWidth, oObserverEntry, oEndItemDomRef);
 
 				if (bWidthChangedSignificantly) {
 					this.fEndItemWidth = fNewWidth;
+					this.fLayoutHeight = fNewHeight;
+				} else if (this.fLayoutHeight !== fNewHeight) {	// we may still have relevant height changes
+					this.fLayoutHeight = fNewHeight;
 				} else {
-
 					// avoid cyclic dependencies and/or infinite resizing callback loops
 					return;
 				}

package/src/sap/ui/layout/AssociativeSplitter.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.Splitter
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/layout/BlockLayout.js

@@ -62,7 +62,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCell.js

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCellData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 * @class
 	 * Holds layout data for the BlockLayoutCells contents.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @public
 	 * @since 1.50.0

package/src/sap/ui/layout/BlockLayoutRow.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/DynamicSideContent.js

@@ -94,7 +94,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/FixFlex.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Grid.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/GridData.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/GridRenderer.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/Device", "sap/ui/layout/library"],
 	/**
 	 * @author SAP SE
 	 * @version
-	 * 1.94.0
+	 * 1.97.0
 	 * @namespace
 	 */
 	var GridRenderer = {

package/src/sap/ui/layout/HorizontalLayout.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Control', './library', "./HorizontalLayoutRenderer"]
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/PaneContainer.js

@@ -24,7 +24,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element', './AssociativeSplitter', 'sap
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayout.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayoutData.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitter.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitterPage.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/layout/SplitPane.js

@@ -26,7 +26,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Splitter.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -143,7 +143,9 @@ sap.ui.define([
 		this._resizeTimeout     = null;
 
 		// Context bound method for easy (de-)registering at the ResizeHandler
-		this._resizeCallback    = this._delayedResize.bind(this);
+		this._resizeCallback    = function (oEvent) {
+			this._delayedResize(0);
+		}.bind(this);
 		this._resizeHandlerId   = null;
 		// We need the information whether auto resize is enabled to temporarily disable it
 		// during live resize and then set it back to the value before
@@ -686,8 +688,12 @@ sap.ui.define([
 	 */
 	Splitter.prototype._resize = function() {
 		var oDomRef = this.getDomRef();
-		if (!oDomRef || RenderManager.getPreserveAreaRef().contains(oDomRef)) {
-			// Do not attempt to resize the content areas in case we are in the preserved area
+
+		// Do not attempt to resize the content areas in case the splitter
+		if (
+			!oDomRef || RenderManager.getPreserveAreaRef().contains(oDomRef) // is in the preserved area
+			|| oDomRef.scrollHeight === 0 || oDomRef.scrollWidth === 0 // has 0 width or height (display: none, etc.)
+		) {
 			return;
 		}
 

package/src/sap/ui/layout/SplitterLayoutData.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 * (The CSS value "auto" is used internally to recalculate the size of the content
 	 * dynamically and is not directly set as style property.)
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/VerticalLayout.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/changeHandler/AddFormContainer.js

@@ -21,7 +21,7 @@ sap.ui.define([
 		* Change handler for adding a form group.
 		* @alias sap.ui.layout.changeHandler.AddFormContainer
 		* @author SAP SE
-		* @version 1.94.0
+		* @version 1.97.0
 		* @experimental Since 1.48.0
 		*/
 	var AddGroup = { };

package/src/sap/ui/layout/changeHandler/AddFormField.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @experimental Since 1.50.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/layout/changeHandler/AddSimpleFormField.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @experimental Since 1.49.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js

@@ -19,7 +19,7 @@ sap.ui.define([
 		* Change handler for adding a simple form group.
 		* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
 		* @author SAP SE
-		* @version 1.94.0
+		* @version 1.97.0
 		* @experimental Since 1.27.0
 		*/
 	var AddSimpleFormGroup = {};

package/src/sap/ui/layout/changeHandler/HideSimpleForm.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @experimental Since 1.27.0
 	 */
 	var HideForm = { };
@@ -40,6 +40,10 @@ sap.ui.define([
 		return undefined;
 	};
 
+	function _isXmlModifier(mPropertyBag) {
+		return mPropertyBag.modifier.targets === "xmlTree";
+	}
+
 	/**
 	 * Hides a control.
 	 *
@@ -56,6 +60,12 @@ sap.ui.define([
 
 		var oChangeDefinition = oChange.getDefinition();
 
+		// in case of custom fields the application needs to be on JS.
+		// In the other case the visuality of the hidden control will be overriden by the custom field binding afterwards
+		if (_isXmlModifier(mPropertyBag)) {
+			return Promise.reject(Error("Change cannot be applied in XML. Retrying in JS."));
+		}
+
 		// !important : sHideId was used in 1.40, do not remove for compatibility!
 		var oRemovedElement = oModifier.bySelector(oChangeDefinition.content.elementSelector || oChangeDefinition.content.sHideId, oAppComponent, oView);
 		var aContent;

package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.MoveSimpleForm
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @experimental Since 1.34.0
 	 */
 	var MoveSimpleForm = {};

package/src/sap/ui/layout/changeHandler/RenameFormContainer.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameFormContainer
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @since 1.48
 	 * @private
 	 * @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js

@@ -4,8 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/*global sap */
-
 sap.ui.define([
 	"sap/ui/fl/changeHandler/Base",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
@@ -22,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameForm
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @since 1.40
 	 * @private
 	 * @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -55,15 +53,11 @@ sap.ui.define([
 				return Promise.reject(new Error("no Control provided for renaming"));
 			}
 
-			return Promise.resolve()
-				.then(function() {
-					return oModifier.getProperty(oRenamedElement, "text");
-				})
-				.then(function(sProperty) {
-					oChangeWrapper.setRevertData(sProperty);
-					var sValue = oChangeDefinition.texts.formText.value;
-					oModifier.setProperty(oRenamedElement, "text", sValue);
-				});
+			return oModifier.getProperty(oRenamedElement, "text").then(function(sProperty) {
+				oChangeWrapper.setRevertData(sProperty);
+				var sValue = oChangeDefinition.texts.formText.value;
+				oModifier.setProperty(oRenamedElement, "text", sValue);
+			});
 		} else {
 			Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
 			//however subsequent changes should be applied
@@ -145,7 +139,11 @@ sap.ui.define([
 		var oElementSelector = oChange.getDefinition().content.elementSelector;
 		var oAffectedControlSelector = JsControlTreeModifier.bySelector(oElementSelector, oAppComponent).getParent().getId();
 		return {
-			affectedControls: [oAffectedControlSelector]
+			affectedControls: [oAffectedControlSelector],
+			payload: {
+				originalLabel: oChange.getRevertData(),
+				newLabel:  oChange.getDefinition().texts.formText.value
+			}
 		};
 	};
 

package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js

@@ -13,11 +13,15 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideForm = { };
 
+	function _isXmlModifier(mPropertyBag) {
+		return mPropertyBag.modifier.targets === "xmlTree";
+	}
+
 	/**
 	 * Unhides a control
 	 *
@@ -35,6 +39,12 @@ sap.ui.define([
 
 		var oChangeDefinition = oChangeWrapper.getDefinition();
 
+		// in case of custom fields the application needs to be on JS.
+		// In the other case the visuality of the control will be overriden by the custom field binding afterwards
+		if (_isXmlModifier(mPropertyBag)) {
+			return Promise.reject(Error("Change cannot be applied in XML. Retrying in JS."));
+		}
+
 		// !important : sUnhideId was used in 1.40, do not remove for compatibility reasons!
 		var oControlToUnhide = oModifier.bySelector(oChangeDefinition.content.elementSelector || oChangeDefinition.content.sUnhideId, oAppComponent, oView);
 		return Promise.resolve()