@openui5/sap.ui.core 1.94.0 → 1.95.0

package/src/sap/ui/core/IconRenderer.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(['./IconPool', './library', "sap/base/security/encodeCSS"], function(IconPool, library, encodeCSS) {
+sap.ui.define(['./_IconRegistry', './library', "sap/base/security/encodeCSS"], function(_IconRegistry, library, encodeCSS) {
 	"use strict";
 
 	// shortcut for enum(s)
@@ -26,7 +26,7 @@ sap.ui.define(['./IconPool', './library', "sap/base/security/encodeCSS"], functi
 	 */
 	IconRenderer.render = function(oRm, oControl) {
 		// write the HTML into the render manager
-		var vIconInfo = IconPool.getIconInfo(oControl.getSrc(), undefined, "mixed"),
+		var vIconInfo = _IconRegistry.getIconInfo(oControl.getSrc(), undefined, "mixed"),
 			sWidth = oControl.getWidth(),
 			sHeight = oControl.getHeight(),
 			sColor = oControl.getColor(),

package/src/sap/ui/core/IndicationColorSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./library'],
 		 * Helper functionality for indication color support.
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.95.0
 		 * @public
 		 * @namespace sap.ui.core.IndicationColorSupport
 		 * @since 1.66

package/src/sap/ui/core/IntervalTrigger.js

@@ -23,7 +23,7 @@ sap.ui.define(['../base/Object', './EventBus', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.95.0
 		 * @public
 		 * @since 1.11.0
 		 * @alias sap.ui.core.IntervalTrigger

package/src/sap/ui/core/InvisibleMessage.js

@@ -32,7 +32,7 @@ function (coreLibrary, ManagedObject, Log) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @hideconstructor
 	 * @public
 	 * @since 1.78

package/src/sap/ui/core/InvisibleRenderer.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 * Provides the default renderer for the controls that have set their <code>visible</code> property to <code>false</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @alias module:sap/ui/core/InvisibleRenderer
 	 * @since 1.66.0
 	 * @protected

package/src/sap/ui/core/InvisibleText.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @since 1.27.0

package/src/sap/ui/core/Item.js

@@ -24,7 +24,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Item

package/src/sap/ui/core/LabelEnablement.js

@@ -129,7 +129,7 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 	 * @see sap.ui.core.LabelEnablement#enrich
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @protected
 	 * @alias sap.ui.core.LabelEnablement
 	 * @namespace

package/src/sap/ui/core/LayoutData.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData

package/src/sap/ui/core/ListItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem

package/src/sap/ui/core/LocalBusyIndicator.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @since 1.11.0

package/src/sap/ui/core/Locale.js

@@ -5,8 +5,8 @@
  */
 
 //Provides the locale object sap.ui.core.Locale
-sap.ui.define(['sap/ui/base/Object', "sap/base/assert"],
-	function(BaseObject, assert) {
+sap.ui.define(['sap/ui/base/Object', 'sap/base/assert', './CalendarType'],
+	function(BaseObject, assert, CalendarType) {
 	"use strict";
 
 
@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.95.0
 		 * @public
 		 * @alias sap.ui.core.Locale
 		 */
@@ -291,8 +291,19 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert"],
 					|| M_LOCALE_TO_ABAP_LANGUAGE[getPseudoLanguageTag(this.sPrivateUse)]
 					|| sLanguage.toUpperCase()
 				);
-			}
+			},
 
+			/**
+			 *
+			 * @returns {sap.ui.core.CalendarType} The preferred Calendar type.
+			 * @private
+			 * @ui5-restricted sap.ui.core
+			 */
+			getPreferredCalendarType: function() {
+				return Locale._mPreferredCalendar[this.getLanguage() + "-" + this.getRegion()] ||
+					Locale._mPreferredCalendar[this.getLanguage()] ||
+					Locale._mPreferredCalendar["default"];
+			}
 		});
 
 		/*
@@ -366,6 +377,17 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert"],
 		 */
 		Locale._cldrLocales = getDesigntimePropertyAsArray("$cldr-locales:ar,ar_EG,ar_SA,bg,ca,cy,cs,da,de,de_AT,de_CH,el,el_CY,en,en_AU,en_GB,en_HK,en_IE,en_IN,en_NZ,en_PG,en_SG,en_ZA,es,es_AR,es_BO,es_CL,es_CO,es_MX,es_PE,es_UY,es_VE,et,fa,fi,fr,fr_BE,fr_CA,fr_CH,fr_LU,he,hi,hr,hu,id,it,it_CH,ja,kk,ko,lt,lv,ms,nb,nl,nl_BE,pl,pt,pt_PT,ro,ru,ru_UA,sk,sl,sr,sr_Latn,sv,th,tr,uk,vi,zh_CN,zh_HK,zh_SG,zh_TW$");
 
+		/**
+		 * A map of preferred Calendar types according to the language.
+		 * @private
+		 */
+		Locale._mPreferredCalendar = {
+			"ar-SA": CalendarType.Islamic,
+			"fa": CalendarType.Persian,
+			"th": CalendarType.Buddhist,
+			"default": CalendarType.Gregorian
+		};
+
 		/**
 		 * List of locales for which translated texts have been bundled with the UI5 runtime.
 		 * @private

package/src/sap/ui/core/LocaleData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @public
 	 * @alias sap.ui.core.LocaleData
 	 */

package/src/sap/ui/core/Manifest.js

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */
@@ -438,7 +438,7 @@ sap.ui.define([
 							if (bAsync) {
 								oPromise = oPromise.then(requireAsync(sJsUrl));
 							} else {
-								sap.ui.requireSync(sJsUrl);
+								sap.ui.requireSync(sJsUrl); // legacy-relevant: Sync path
 							}
 						}
 					}
@@ -687,19 +687,8 @@ sap.ui.define([
 		 */
 		init: function(oInstance) {
 			if (this._iInstanceCount === 0) {
-
 				this.loadDependenciesAndIncludes();
-
-				// activate the static customizing
-				this.activateCustomizing();
-
 			}
-
-			// activate the instance customizing
-			if (oInstance) {
-				this.activateCustomizing(oInstance);
-			}
-
 			this._iInstanceCount++;
 		},
 
@@ -751,16 +740,7 @@ sap.ui.define([
 			// ensure that the instance count is never negative
 			var iInstanceCount = Math.max(this._iInstanceCount - 1, 0);
 
-			// deactivate the instance customizing
-			if (oInstance) {
-				this.deactivateCustomizing(oInstance);
-			}
-
 			if (iInstanceCount === 0) {
-
-				// deactivcate the customizing
-				this.deactivateCustomizing();
-
 				// remove the custom scripts and CSS files
 				this.removeIncludes();
 
@@ -769,44 +749,6 @@ sap.ui.define([
 
 			this._iInstanceCount = iInstanceCount;
 
-		},
-
-		/**
-		 * Activates the customizing for the component or a dedicated component
-		 * instance when providing the component instance as parameter.
-		 * @param {sap.ui.core.Component} [oInstance] Reference to the Component instance
-		 * @private
-		 */
-		activateCustomizing: function(oInstance) {
-			// activate the customizing configuration
-			var oUI5Manifest = this.getEntry("sap.ui5", true),
-				mExtensions = oUI5Manifest && oUI5Manifest["extends"] && oUI5Manifest["extends"].extensions;
-			if (!isEmptyObject(mExtensions)) {
-				var CustomizingConfiguration = sap.ui.requireSync('sap/ui/core/CustomizingConfiguration');
-				if (!oInstance) {
-					CustomizingConfiguration.activateForComponent(this.getComponentName());
-				} else {
-					CustomizingConfiguration.activateForComponentInstance(oInstance);
-				}
-			}
-		},
-
-		/**
-		 * Deactivates the customizing for the component or a dedicated component
-		 * instance when providing the component instance as parameter.
-		 * @param {sap.ui.core.Component} [oInstance] Reference to the Component instance
-		 * @private
-		 */
-		deactivateCustomizing: function(oInstance) {
-			// deactivate the customizing configuration
-			var CustomizingConfiguration = sap.ui.require('sap/ui/core/CustomizingConfiguration');
-			if (CustomizingConfiguration) {
-				if (!oInstance) {
-					CustomizingConfiguration.deactivateForComponent(this.getComponentName());
-				} else {
-					CustomizingConfiguration.deactivateForComponentInstance(oInstance);
-				}
-			}
 		}
 
 	});

package/src/sap/ui/core/Message.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message

package/src/sap/ui/core/RenderManager.js

@@ -182,7 +182,7 @@ sap.ui.define([
 	 *
 	 * @extends Object
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @alias sap.ui.core.RenderManager
 	 * @public
 	 */
@@ -773,6 +773,9 @@ sap.ui.define([
 		 * <li><code>alt: ""</code></li>
 		 * </ul>
 		 *
+		 * <b>Note:</b> This function requires the {@link sap.ui.core.IconPool} module. Ensure that the module is
+		 * loaded before this function is called to avoid syncXHRs.
+		 *
 		 * @param {sap.ui.core.URI} sURI URI of an image or of an icon registered in {@link sap.ui.core.IconPool}
 		 * @param {array|string} [aClasses] Additional classes that are added to the rendered tag
 		 * @param {object} [mAttributes] Additional attributes that will be added to the rendered tag.
@@ -1866,8 +1869,19 @@ sap.ui.define([
 	 * @deprecated Since 1.92. Instead use {@link sap.ui.core.RenderManager#icon} of the {@link sap.ui.core.RenderManager Semantic Rendering API}.
 	 */
 	RenderManager.prototype.writeIcon = function(sURI, aClasses, mAttributes){
-		var IconPool = sap.ui.requireSync("sap/ui/core/IconPool"), // legacy-relevant
-			bIconURI = IconPool.isIconURI(sURI),
+		var IconPool = sap.ui.require("sap/ui/core/IconPool");
+		if (!IconPool) {
+			Log.warning("Synchronous loading of IconPool due to sap.ui.core.RenderManager#icon call. " +
+				"Ensure that 'sap/ui/core/IconPool is loaded before this function is called" , "SyncXHR", null, function() {
+				return {
+					type: "SyncXHR",
+					name: "rendermanager-icon"
+				};
+			});
+			IconPool = sap.ui.requireSync("sap/ui/core/IconPool"); // legacy-relevant: Sync fallback
+		}
+
+		var bIconURI = IconPool.isIconURI(sURI),
 			bAriaLabelledBy = false,
 			sProp, oIconInfo, mDefaultAttributes, sLabel, sInvTextId;
 

package/src/sap/ui/core/Renderer.js

@@ -6,18 +6,19 @@
 
 // Provides (optional) base class for all renderers
 sap.ui.define([
+	"sap/base/Log",
 	"sap/base/util/isPlainObject",
 	"sap/base/util/ObjectPath",
 	"sap/base/assert",
 	"sap/base/util/extend"
-], function(isPlainObject, ObjectPath, assert, extend) {
+], function(Log, isPlainObject, ObjectPath, assert, extend) {
 	"use strict";
 
 	/**
 	 * @classdesc Base Class for a Renderer.
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @namespace
 	 * @public
 	 * @alias sap.ui.core.Renderer
@@ -218,8 +219,17 @@ sap.ui.define([
 	 */
 	Renderer.getTextAlign = function(oTextAlign, oTextDirection) {
 		// lazy require sap.ui.core library
+		sapUiCore = sap.ui.require("sap/ui/core/library");
+
 		if (!sapUiCore) {
-			sapUiCore = sap.ui.requireSync("sap/ui/core/library");
+			Log.warning("Synchronous loading of a library.js. Ensure that 'sap/ui/core/library.js' is loaded" +
+				" before sap.ui.core.Renderer#getTextAlign is called.", "SyncXHR", null, function() {
+				return {
+					type: "SyncXHR",
+					name: "renderer-getTextAlign"
+				};
+			});
+			sapUiCore = sap.ui.requireSync("sap/ui/core/library"); // legacy-relevant: core/library.js available via dependency in most cases
 		}
 
 		// create shortcuts for enums from sap.ui.core library

package/src/sap/ui/core/ResizeHandler.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @alias sap.ui.core.ResizeHandler
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @public
 	 */
 

package/src/sap/ui/core/ScrollBar.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * The ScrollBar control can be used for virtual scrolling of a certain area.
 	 * This means: to simulate a very large scrollable area when technically the area is small and the control takes care of displaying the respective part only. E.g. a Table control can take care of only rendering the currently visible rows and use this ScrollBar control to make the user think he actually scrolls through a long list.
 	 * @extends sap.ui.core.Control
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @deprecated as of version 1.56

package/src/sap/ui/core/SeparatorItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.SeparatorItem

package/src/sap/ui/core/ShortcutHintsMixin.js

@@ -394,7 +394,7 @@ sap.ui.define([
 			return;
 		}
 
-		oInvText = getInvisibleText();
+		oInvText = getInvisibleText(oControl);
 		sInvTextId = oInvText.getId();
 
 		oInvText.setText(_getShortcutHintText(oHintInfo.id));
@@ -502,15 +502,22 @@ sap.ui.define([
 	}
 
 	/**
-	 * Gets or creates an InvisibleText for the shortcut's accessiblity.
+	 * Gets or creates an InvisibleText for the control's shortcut accessiblity.
+	 *
+	 * @param {sap.ui.core.Control} oControl A control that have shortcut assigned
 	 */
-	function getInvisibleText() {
-		if (!ShortcutHintsMixin._invisibleText) {
-			ShortcutHintsMixin._invisibleText = new InvisibleText();
-			ShortcutHintsMixin._invisibleText.toStatic();
+	function getInvisibleText(oControl) {
+		if (!oControl._shortcutInvisibleText) {
+			var oFunc = oControl.exit;
+			oControl._shortcutInvisibleText = new InvisibleText();
+			oControl._shortcutInvisibleText.toStatic();
+			oControl.exit = function() {
+				this._shortcutInvisibleText.destroy();
+				oFunc.call(this);
+			};
 		}
 
-		return ShortcutHintsMixin._invisibleText;
+		return oControl._shortcutInvisibleText;
 	}
 
 	/**

package/src/sap/ui/core/Title.js

@@ -25,7 +25,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @since 1.16.0

package/src/sap/ui/core/TooltipBase.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class
 	 * Abstract class that can be extended in order to implement any extended tooltip. For example, RichTooltip Control is based on it. It provides the opening/closing behavior and the main "text" property.
 	 * @extends sap.ui.core.Control
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.TooltipBase

package/src/sap/ui/core/UIArea.js

@@ -175,7 +175,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @param {sap.ui.core.Core} oCore internal API of the <core>Core</code> that manages this UIArea
 	 * @param {object} [oRootNode] reference to the DOM element that should be 'hosting' the UI Area.
 	 * @public

package/src/sap/ui/core/UIComponent.js

@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @alias sap.ui.core.UIComponent
 	 * @since 1.9.2
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
@@ -298,7 +298,7 @@ sap.ui.define([
 		}
 
 		function setRootControl(vRootControl) {
-			var fnFireInstanceCreated = function() {
+			var fnFireInstanceInitialized = function() {
 				if (typeof UIComponent._fnOnInstanceInitialized === "function") {
 					UIComponent._fnOnInstanceInitialized(that);
 				}
@@ -309,19 +309,19 @@ sap.ui.define([
 			if (vRootControl instanceof Promise) {
 				that.pRootControlLoaded = that.pRootControlLoaded.then(function(oRootControl) {
 					fnAggregateRootControl(oRootControl);
-					fnFireInstanceCreated();
+					fnFireInstanceInitialized();
 					return oRootControl;
 				});
 			} else if (vRootControl instanceof View && vRootControl.oAsyncState && vRootControl.oAsyncState.promise) {
 				fnAggregateRootControl(vRootControl);
 				that.pRootControlLoaded = that.pRootControlLoaded.then(function(oRootControl) {
 					// notify Component initialization callback handler
-					fnFireInstanceCreated();
+					fnFireInstanceInitialized();
 					return oRootControl;
 				});
 			} else {
 				fnAggregateRootControl(vRootControl);
-				fnFireInstanceCreated();
+				fnFireInstanceInitialized();
 			}
 		}
 
@@ -367,7 +367,8 @@ sap.ui.define([
 				fnRouterConstructor = getConstructorFunctionFor(sRouterClassName);
 			} else {
 				// require default Router class
-				fnRouterConstructor = sap.ui.require("sap/ui/core/routing/Router") || sap.ui.requireSync("sap/ui/core/routing/Router");
+				fnRouterConstructor = sap.ui.require("sap/ui/core/routing/Router")
+					|| sap.ui.requireSync("sap/ui/core/routing/Router"); // legacy-relevant: Sync path
 			}
 			this._oRouter = new fnRouterConstructor(vRoutes, oRoutingConfig, this, oRoutingManifestEntry.targets, this._oRouterHashChanger);
 			this._oTargets = this._oRouter.getTargets();
@@ -375,7 +376,8 @@ sap.ui.define([
 		} else if (oRoutingManifestEntry.targets) {
 			// legacy-relevant: Sync path via sync component factory.
 			// For async, no sync request is triggered as the class is already loaded by the component factory.
-			var Views = sap.ui.require("sap/ui/core/routing/Views") || sap.ui.requireSync("sap/ui/core/routing/Views");
+			var Views = sap.ui.require("sap/ui/core/routing/Views")
+				|| sap.ui.requireSync("sap/ui/core/routing/Views"); // legacy-relevant: Sync path
 
 			this._oViews = new Views({
 				component: this
@@ -387,7 +389,8 @@ sap.ui.define([
 				fnTargetsConstructor = getConstructorFunctionFor(oRoutingConfig.targetsClass);
 			} else {
 				// For async, no sync request is triggered as the class is already loaded by the component factory.
-				fnTargetsConstructor = sap.ui.require("sap/ui/core/routing/Targets") || sap.ui.requireSync("sap/ui/core/routing/Targets");
+				fnTargetsConstructor = sap.ui.require("sap/ui/core/routing/Targets")
+					|| sap.ui.requireSync("sap/ui/core/routing/Targets"); // legacy-relevant: Sync path
 			}
 			this._oTargets = new fnTargetsConstructor({
 				targets: oRoutingManifestEntry.targets,
@@ -733,6 +736,12 @@ sap.ui.define([
 				type: ViewType.XML
 			});
 		} else if (oRootView && typeof oRootView === "object") {
+
+			// default ViewType to XML, except for typed views
+			if (!oRootView.type && !View._getModuleName(oRootView)) {
+				oRootView.type = ViewType.XML;
+			}
+
 			// make sure to prefix the ID of the rootView
 			if (oRootView.id) {
 				oRootView.id = this.createId(oRootView.id);

package/src/sap/ui/core/UIComponentMetadata.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ComponentMetadata', 'sap/ui/core/mvc/ViewType'],
 	 * @experimental Since 1.15.1. The Component concept is still under construction, so some implementation details can be changed in future.
 	 * @class
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @since 1.15.1
 	 * @alias sap.ui.core.UIComponentMetadata
 	 * @extends sap.ui.core.ComponentMetadata

package/src/sap/ui/core/ValueStateSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./Element', './library', "sap/base/assert"],
 		 * Helper functionality for value state support.
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.95.0
 		 * @public
 		 * @namespace sap.ui.core.ValueStateSupport
 		 */

package/src/sap/ui/core/VariantLayoutData.js

@@ -20,7 +20,7 @@ sap.ui.define(['./LayoutData', './library'],
 	 * @class
 	 * Allows to add multiple LayoutData to one control in case that an easy switch of layouts (e.g. in a Form) is needed.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @since 1.9.2

package/src/sap/ui/core/XMLComposite.js

@@ -143,7 +143,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.95.0
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}

package/src/sap/ui/core/XMLCompositeMetadata.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} oClassInfo static info to construct the metadata from
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/ui/core/XMLTemplateProcessor.js

@@ -62,7 +62,7 @@ function(
 			return oBindingInfo;
 		}
 
-		var vValue = sValue = oBindingInfo || sValue; // oBindingInfo could be an unescaped string
+		var vValue = sValue = typeof oBindingInfo === "string" ? oBindingInfo : sValue; // oBindingInfo could be an unescaped string
 		var oType = DataType.getType(sType);
 		if (oType) {
 			if (oType instanceof DataType) {