@openui5/sap.ui.core 1.112.0 → 1.113.0

package/src/sap/ui/base/Event.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Object', "sap/base/assert"],
 	 * @extends sap.ui.base.Object
 	 * @implements sap.ui.base.Poolable
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @alias sap.ui.base.Event
 	 * @public
 	 */

package/src/sap/ui/base/EventProvider.js

@@ -18,7 +18,7 @@ sap.ui.define(['./Event', './Object', './ObjectPool', "sap/base/assert"],
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @public
 	 * @alias sap.ui.base.EventProvider
 	 */

package/src/sap/ui/base/ExpressionParser.js

@@ -332,7 +332,7 @@ sap.ui.define([
 	 * @returns {any} the binding value
 	 */
 	function BINDING(i, aParts) {
-		return aParts[i];
+		return clean(aParts[i]);
 	}
 
 	/**
@@ -374,7 +374,7 @@ sap.ui.define([
 		if (oReference) {
 			oReference.base = oParent;
 		}
-		return vChild;
+		return clean(vChild);
 	}
 
 	/**
@@ -388,10 +388,10 @@ sap.ui.define([
 		var oReference = {};
 
 		// evaluate function expression and call it
-		return fnLeft(aParts, oReference).apply(oReference.base,
+		return clean(fnLeft(aParts, oReference).apply(oReference.base,
 			aArguments.map(function (fnArgument) {
 				return fnArgument(aParts); // evaluate argument
-			}));
+			})));
 	}
 
 	/**
@@ -443,7 +443,7 @@ sap.ui.define([
 		if (oReference) {
 			oReference.base = oParent;
 		}
-		return vChild;
+		return clean(vChild);
 	}
 
 	/**
@@ -485,6 +485,16 @@ sap.ui.define([
 		return mSymbols[sId];
 	}
 
+	/**
+	 * Cleans the given <code>vValue</code>.
+	 *
+	 * @param {any} vValue - the value to be cleaned
+	 * @returns {any} the cleaned value
+	 */
+	function clean(vValue) {
+		return vValue === Function ? undefined : vValue;
+	}
+
 	/**
 	 * Throws a SyntaxError with the given <code>sMessage</code> as <code>message</code>, its
 	 * <code>at</code> property set to <code>iAt</code> and its <code>text</code> property to

package/src/sap/ui/base/Interface.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/base/Object'], function(BaseObject) {
 	 * no internals of the class can be accessed.
 	 *
 	 * @author Malte Wedel, Daniel Brinkmann
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @param {sap.ui.base.Object} oObject
 	 *   Object for which a facade should be created
 	 * @param {string[]} aMethods

package/src/sap/ui/base/ManagedObject.js

@@ -45,6 +45,8 @@ sap.ui.define([
 	// Binding info factory symbol
 	var BINDING_INFO_FACTORY_SYMBOL = Symbol("bindingInfoFactory");
 
+	var Object_hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
+
 	/**
 	 * Constructs and initializes a managed object with the given <code>sId</code> and settings.
 	 *
@@ -251,7 +253,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @public
 	 * @alias sap.ui.base.ManagedObject
 	 */
@@ -1587,7 +1589,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	ManagedObject.prototype.isPropertyInitial = function(sPropertyName) {
-		return !Object.prototype.hasOwnProperty.call(this.mProperties, sPropertyName) && !this.isBound(sPropertyName);
+		return !Object_hasOwn(this.mProperties, sPropertyName) && !this.isBound(sPropertyName);
 	};
 
 	/**

package/src/sap/ui/base/ManagedObjectMetadata.js

@@ -8,9 +8,10 @@
 sap.ui.define([
 	'./DataType',
 	'./Metadata',
+	'./Object',
 	'sap/base/Log',
 	'sap/base/assert',
-	'sap/base/util/ObjectPath',
+	'sap/base/strings/capitalize',
 	'sap/base/strings/escapeRegExp',
 	'sap/base/util/merge',
 	'sap/base/util/isPlainObject',
@@ -19,9 +20,10 @@ sap.ui.define([
 function(
 	DataType,
 	Metadata,
+	BaseObject,
 	Log,
 	assert,
-	ObjectPath,
+	capitalize,
 	escapeRegExp,
 	merge,
 	isPlainObject,
@@ -75,7 +77,7 @@ function(
 	 *
 	 *
 	 * @author Frank Weigel
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 0.8.6
 	 * @alias sap.ui.base.ManagedObjectMetadata
 	 * @extends sap.ui.base.Metadata
@@ -92,11 +94,7 @@ function(
 	ManagedObjectMetadata.prototype = Object.create(Metadata.prototype);
 	ManagedObjectMetadata.prototype.constructor = ManagedObjectMetadata;
 
-	var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-	function capitalize(sName) {
-		return sName.charAt(0).toUpperCase() + sName.slice(1);
-	}
+	var Object_hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
 
 	var rPlural = /(children|ies|ves|oes|ses|ches|shes|xes|s)$/i;
 	var mSingular = {'children' : -3, 'ies' : 'y', 'ves' : 'f', 'oes' : -2, 'ses' : -2, 'ches' : -2, 'shes' : -2, 'xes' : -2, 's' : -1 };
@@ -119,7 +117,7 @@ function(
 		var result = null;
 
 		for (var n in info) {
-			if ( hasOwnProperty.call(info, n) && typeof obj[n] === 'undefined' ) {
+			if ( Object_hasOwn(info, n) && typeof obj[n] === 'undefined' ) {
 				result = result || {};
 				result[n] = info[n];
 			}
@@ -837,7 +835,7 @@ function(
 
 			if ( mInfoMap ) {
 				for (sName in mInfoMap) {
-					if ( hasOwnProperty.call(mInfoMap, sName) ) {
+					if ( Object_hasOwn(mInfoMap, sName) ) {
 						mResult[sName] = new FNClass(that, sName, mInfoMap[sName]);
 					}
 				}
@@ -1747,7 +1745,7 @@ function(
 			sName;
 
 		for ( sName in mSettings ) {
-			if ( hasOwnProperty.call(mValidKeys, sName) ) {
+			if ( Object_hasOwn(mValidKeys, sName) ) {
 				mResult[sName] = mSettings[sName];
 			}
 		}
@@ -1867,7 +1865,7 @@ function(
 	 */
 	function loadInstanceDesignTime(oInstance) {
 		var sInstanceSpecificModule =
-			oInstance instanceof ObjectPath.get('sap.ui.base.ManagedObject')
+			BaseObject.isA(oInstance, "sap.ui.base.ManagedObject")
 			&& typeof oInstance.data === "function"
 			&& oInstance.data("sap-ui-custom-settings")
 			&& oInstance.data("sap-ui-custom-settings")["sap.ui.dt"]

package/src/sap/ui/base/Metadata.js

@@ -14,6 +14,9 @@ sap.ui.define([
 	function(ObjectPath, assert, Log, uniqueSort) {
 	"use strict";
 
+	function isFunction(obj) {
+		return typeof obj === "function";
+	}
 
 	/**
 	 * Creates a new metadata object from the given static infos.
@@ -26,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @class Metadata for a class.
 	 * @author Frank Weigel
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 0.8.6
 	 * @public
 	 * @alias sap.ui.base.Metadata
@@ -46,7 +49,7 @@ sap.ui.define([
 			oClassInfo.metadata.__version = 1.0;
 		}
 		oClassInfo.metadata.__version = oClassInfo.metadata.__version || 2.0;
-		if ( typeof oClassInfo.constructor !== "function" ) {
+		if ( !isFunction(oClassInfo.constructor) ) {
 			throw Error("constructor for class " + sClassName + " must have been declared before creating metadata for it");
 		}
 
@@ -76,17 +79,25 @@ sap.ui.define([
 			oPrototype;
 
 		if ( oStaticInfo.baseType ) {
-			// lookup base class by its name - same reasoning as above
-			var oParentClass = ObjectPath.get(oStaticInfo.baseType);
-			if ( typeof oParentClass !== "function" ) {
-				Log.fatal("base class '" + oStaticInfo.baseType + "' does not exist");
+			var oParentClass;
+			if ( isFunction(oStaticInfo.baseType) ) {
+				oParentClass = oStaticInfo.baseType;
+				if ( !isFunction(oParentClass.getMetadata) ) {
+					throw new TypeError("baseType must be a UI5 class with a static getMetadata function");
+				}
+			} else {
+				// lookup base class by its name - same reasoning as above
+				oParentClass = ObjectPath.get(oStaticInfo.baseType);
+				if ( !isFunction(oParentClass) ) {
+					Log.fatal("base class '" + oStaticInfo.baseType + "' does not exist");
+				}
 			}
 			// link metadata with base metadata
 			if ( oParentClass.getMetadata ) {
 				this._oParent = oParentClass.getMetadata();
 				assert(oParentClass === oParentClass.getMetadata().getClass(), "Metadata: oParentClass must match the class in the parent metadata");
 			} else {
-				// fallback, if base class has no metadata
+				// fallback, if base class has no metadata - can only happen if baseType is a string
 				this._oParent = new Metadata(oStaticInfo.baseType, {});
 			}
 		} else {
@@ -417,14 +428,14 @@ sap.ui.define([
 			fnBaseClass = null;
 		}
 
-		assert(!fnBaseClass || typeof fnBaseClass === "function");
+		assert(!fnBaseClass || isFunction(fnBaseClass));
 		assert(typeof sClassName === "string" && !!sClassName);
 		assert(!oClassInfo || typeof oClassInfo === "object");
-		assert(!FNMetaImpl || typeof FNMetaImpl === "function");
+		assert(!FNMetaImpl || isFunction(FNMetaImpl));
 
 		// allow metadata class to preprocess
 		FNMetaImpl = FNMetaImpl || Metadata;
-		if ( typeof FNMetaImpl.preprocessClassInfo === "function" ) {
+		if ( isFunction(FNMetaImpl.preprocessClassInfo) ) {
 			oClassInfo = FNMetaImpl.preprocessClassInfo(oClassInfo);
 		}
 
@@ -436,7 +447,7 @@ sap.ui.define([
 		}
 
 		var fnClass = oClassInfo.constructor;
-		assert(!fnClass || typeof fnClass === "function");
+		assert(!fnClass || isFunction(fnClass));
 
 		// ensure defaults
 		if ( fnBaseClass ) {
@@ -459,7 +470,7 @@ sap.ui.define([
 			fnClass.prototype = Object.create(fnBaseClass.prototype);
 			fnClass.prototype.constructor = fnClass;
 			// enforce correct baseType
-			oClassInfo.metadata.baseType = fnBaseClass.getMetadata().getName();
+			oClassInfo.metadata.baseType = fnBaseClass;
 		} else {
 			// default constructor does nothing
 			fnClass = fnClass || function() { };

package/src/sap/ui/base/Object.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Metadata', "sap/base/Log"],
 	 * @class Base class for all SAPUI5 Objects.
 	 * @abstract
 	 * @author Malte Wedel
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @public
 	 * @alias sap.ui.base.Object
 	 * @throws {Error} When an instance of the class or its subclasses is created without the <code>new</code> operator.

package/src/sap/ui/base/ObjectPool.js

@@ -59,7 +59,7 @@ sap.ui.define(['./Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @alias sap.ui.base.ObjectPool
 	 * @public
 	 */

package/src/sap/ui/core/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (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.112.0</version>
+  <version>1.113.0</version>
 
   <documentation>The SAPUI5 Core Runtime.
 

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * Provides methods to show or hide a waiting animation covering the whole
 	 * page and blocking user interaction.
 	 * @namespace
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @public
 	 * @alias sap.ui.core.BusyIndicator
 	 */

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

@@ -225,7 +225,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -2022,9 +2022,12 @@ sap.ui.define([
 		for (var sModelName in mModelConfigurations) {
 			var oModelConfig = mModelConfigurations[sModelName];
 
-			// The tests for the Model creation make use of a constructor stub,
-			// and this only works from the global namespace export.
-			var fnModelClass = ObjectPath.get(oModelConfig.type);
+			// TODO The tests for the Model creation make use of a constructor stub,
+			// and this only works from the global namespace export, not via probing require.
+			// To keep those tests working, the global name is checked first. Only in a context
+			// where global names don't exist or when the model is unknown, the fallback will be used.
+			var fnModelClass = ObjectPath.get(oModelConfig.type)
+				|| sap.ui.require(oModelConfig.type.replace(/\./g, "/"));
 
 			// create arguments array with leading "null" value so that it can be passed to the apply function
 			var aArgs = [null].concat(oModelConfig.settings || []);
@@ -3053,7 +3056,7 @@ sap.ui.define([
 
 				try {
 					sPreloadName = sController + '-preload'; // Module name
-					sap.ui.requireSync(sPreloadName.replace(/\./g, "/"));
+					sap.ui.requireSync(sPreloadName.replace(/\./g, "/")); // legacy-relevant: Sync path
 				} catch (e) {
 					errorLogging(sPreloadName, false)(e);
 				}

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * See also {@link module:sap/ui/core/ComponentSupport}.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 1.9.2
 	 * @alias sap.ui.core.ComponentMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @public
 	 * @since 1.58.0
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"./format/TimezoneUtil",
 	'sap/ui/thirdparty/URI',
 	"sap/ui/core/_ConfigurationProvider",
+	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/base/util/UriParameters",
 	"sap/base/util/deepEqual",
 	"sap/base/util/Version",
@@ -30,6 +31,7 @@ sap.ui.define([
 		TimezoneUtil,
 		URI,
 		_ConfigurationProvider,
+		CalendarWeekNumbering,
 		UriParameters,
 		deepEqual,
 		Version,
@@ -44,9 +46,11 @@ sap.ui.define([
 	// Singleton instance for configuration
 	var oConfiguration;
 	var M_SETTINGS;
-	var VERSION = "1.112.0";
+	var VERSION = "1.113.0";
 
 	// Helper Functions
+	var Object_hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
+
 	function detectLanguage() {
 
 		function navigatorLanguage() {
@@ -210,6 +214,7 @@ sap.ui.define([
 		"timezone"              : { type : "string",   defaultValue : TimezoneUtil.getLocalTimezone() },
 		"formatLocale"          : { type : "Locale",   defaultValue : null },
 		"calendarType"          : { type : "string",   defaultValue : null },
+		"calendarWeekNumbering" : { type : CalendarWeekNumbering, defaultValue : CalendarWeekNumbering.Default},
 		"trailingCurrencyCode"  : { type : "boolean",  defaultValue : true },
 		"accessibility"         : { type : "boolean",  defaultValue : true },
 		"autoAriaBodyRole"      : { type : "boolean",  defaultValue : false,     noUrl:true }, //whether the framework automatically adds the ARIA role 'application' to the html body
@@ -342,7 +347,7 @@ sap.ui.define([
 		init: function() {
 			this.bInitialized = true;
 
-			this.oFormatSettings = new Configuration.FormatSettings(this);
+			this.oFormatSettings = new FormatSettings(this);
 
 			/* Object that carries the real configuration data */
 			var config = this; // eslint-disable-line consistent-this
@@ -385,10 +390,12 @@ sap.ui.define([
 				this._compatversion[n] = _getCVers(n);
 			}
 
+			var oUriParams;
+
 			// apply the settings from the url (only if not blocked by app configuration)
 			if ( !config.ignoreUrlParams ) {
 				var sUrlPrefix = "sap-ui-";
-				var oUriParams = UriParameters.fromQuery(window.location.search);
+				oUriParams = UriParameters.fromQuery(window.location.search);
 
 				// first map SAP parameters, can be overwritten by "sap-ui-*" parameters
 				if ( oUriParams.has('sap-language') ) {
@@ -1075,6 +1082,46 @@ sap.ui.define([
 			return this;
 		},
 
+		/**
+		 * Returns the calendar week numbering algorithm used to determine the first day of the week
+		 * and the first calendar week of the year, see {@link sap.ui.core.date.CalendarWeekNumbering}.
+		 *
+		 * @returns {sap.ui.core.date.CalendarWeekNumbering} The calendar week numbering algorithm
+		 *
+		 * @public
+		 * @since 1.113.0
+		 */
+		getCalendarWeekNumbering: function() {
+			return this.getValue("calendarWeekNumbering");
+		},
+
+		/**
+		 * Sets the calendar week numbering algorithm which is used to determine the first day of the week
+		 * and the first calendar week of the year, see {@link sap.ui.core.date.CalendarWeekNumbering}.
+		 *
+		 * @param {sap.ui.core.date.CalendarWeekNumbering} sCalendarWeekNumbering
+		 *   The calendar week numbering algorithm
+		 * @returns {this}
+		 *   <code>this</code> to allow method chaining
+		 * @throws {Error}
+		 *   If <code>sCalendarWeekNumbering</code> is not a valid calendar week numbering algorithm,
+		 *   defined in {@link sap.ui.core.date.CalendarWeekNumbering}
+		 *
+		 * @public
+		 * @since 1.113.0
+		 */
+		setCalendarWeekNumbering: function(sCalendarWeekNumbering) {
+			checkEnum(CalendarWeekNumbering, sCalendarWeekNumbering, "calendarWeekNumbering");
+
+			if (this.calendarWeekNumbering !== sCalendarWeekNumbering) {
+				var mChanges = this._collect();
+				this.calendarWeekNumbering = mChanges.calendarWeekNumbering = sCalendarWeekNumbering;
+				this._endCollect();
+			}
+
+			return this;
+		},
+
 		/**
 		 * Returns the format locale string with language and region code. Falls back to
 		 * language configuration, in case it has not been explicitly defined.
@@ -1882,7 +1929,7 @@ sap.ui.define([
 		 */
 		getValue: function(sName) {
 			var vValue;
-			if (typeof sName !== "string" || !Object.prototype.hasOwnProperty.call(M_SETTINGS, sName)) {
+			if (typeof sName !== "string" || !Object_hasOwn(M_SETTINGS, sName)) {
 				throw new TypeError(
 					"Parameter 'sName' must be the name of a valid configuration option (one of "
 					+ Object.keys(M_SETTINGS).map(function(key) {
@@ -2036,11 +2083,11 @@ sap.ui.define([
 	 * the modifications. To be on the safe side, applications should do any modifications
 	 * early in their lifecycle or recreate any model/UI that is locale dependent.
 	 *
-	 * @name sap.ui.core.Configuration.FormatSettings
+	 * @alias sap.ui.core.Configuration.FormatSettings
 	 * @extends sap.ui.base.Object
 	 * @public
 	 */
-	BaseObject.extend("sap.ui.core.Configuration.FormatSettings", /** @lends sap.ui.core.Configuration.FormatSettings.prototype */ {
+	var FormatSettings = BaseObject.extend("sap.ui.core.Configuration.FormatSettings", /** @lends sap.ui.core.Configuration.FormatSettings.prototype */ {
 		constructor : function(oConfiguration) {
 			this.oConfiguration = oConfiguration;
 			this.mSettings = {};
@@ -2064,10 +2111,11 @@ sap.ui.define([
 		 * @public
 		 */
 		getFormatLocale : function() {
-			function fallback(that) {
-				var oLocale = that.oConfiguration.getValue("language");
+			function fallback(oFormatSettings) {
+				var oLocale = oFormatSettings.oConfiguration.getValue("language");
 				// if any user settings have been defined, add the private use subtag "sapufmt"
-				if ( !isEmptyObject(that.mSettings) ) {
+				if (!isEmptyObject(oFormatSettings.mSettings)
+						|| oFormatSettings.oConfiguration.getCalendarWeekNumbering() !== CalendarWeekNumbering.Default) {
 					// TODO move to Locale/LocaleData
 					var l = oLocale.toString();
 					if ( l.indexOf("-x-") < 0 ) {
@@ -2436,6 +2484,7 @@ sap.ui.define([
 		 * @param {int} iValue must be an integer value between 0 and 6
 		 * @returns {this} Returns <code>this</code> to allow method chaining
 		 * @public
+		 * @deprecated Since 1.113.0. Use {@link sap.ui.core.Configuration#setCalendarWeekNumbering} instead.
 		 */
 		setFirstDayOfWeek : function(iValue) {
 			check(typeof iValue == "number" && iValue >= 0 && iValue <= 6, "iValue must be an integer value between 0 and 6");

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

@@ -79,7 +79,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @alias sap.ui.core.Control
 	 */
 	var Control = Element.extend("sap.ui.core.Control", /** @lends sap.ui.core.Control.prototype */ {
@@ -306,6 +306,22 @@ sap.ui.define([
 		return document.getElementById(this.sId) != null;
 	};
 
+	/**
+	 * Determines whether the control is in rendering phase.
+	 *
+	 * @returns {boolean}
+	 * @private
+	 */
+	function isInRenderingPhase(oControl) {
+		if (!oControl || !oControl.isA) {
+			return false;
+		}
+		if (oControl.isA("sap.ui.core.Control")) {
+			return oControl._bRenderingPhase;
+		}
+		return isInRenderingPhase(oControl.getParent());
+	}
+
 	/**
 	 * Marks this control and its children for a re-rendering, usually because its state has changed and now differs
 	 * from the rendered DOM.
@@ -327,8 +343,8 @@ sap.ui.define([
 	Control.prototype.invalidate = function(oOrigin) {
 		var oUIArea;
 
-		// invalidations that happen in the onBeforeRendering hook of controls can be ignored
-		// since the rendering of the control has not yet been started
+		// Invalidations that happen in the onBeforeRendering hook of controls can be ignored
+		// since the rendering of the control is about to start.
 		if ( this._bOnBeforeRenderingPhase ) {
 			return;
 		}
@@ -339,8 +355,10 @@ sap.ui.define([
 		// This will be cleared by the RenderManager when the control is rendered completely.
 		this._bNeedsRendering = true;
 
-		if ( this.bOutput && (oUIArea = this.getUIArea()) ) {
+		var oParent = this.getParent();
+		if ( (this.bOutput || isInRenderingPhase(oParent)) && (oUIArea = this.getUIArea()) ) {
 			// if this control has been rendered before (bOutput)
+			// or if the invalidation happens while parent rendering (isInRenderingPhase(oParent))
 			// and if it is contained in a UIArea (!!oUIArea)
 			// then control re-rendering can be used (see UIArea.rerender() for details)
 			//
@@ -358,7 +376,6 @@ sap.ui.define([
 			}
 		} else {
 			// else we bubble up the hierarchy
-			var oParent = this.getParent();
 			if (oParent && (
 					this.bOutput /* && !this.getUIArea() */ ||
 					/* !this.bOutput && */ !(this.getVisible && this.getVisible() === false))) {

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

@@ -170,7 +170,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * in the documentation.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.CustomData

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

@@ -40,8 +40,11 @@ sap.ui.define(['./Element', "sap/base/assert", "sap/base/Log"],
 	 * }, true);
 	 * </pre>
 	 *
-	 * Furthermore, the function <code>oRenderManager.writeClasses(oElement);</code> ({@link sap.ui.core.RenderManager#writeClasses}) must be called within
-	 * the renderer of the control to which the element belongs, when writing the root tag of the element. This ensures the classes are written to the HTML.
+	 * The classes are written to the HTML automatically when using the {@link sap.ui.core.RenderManager
+	 * Semantic Rendering API}. To ensure that the classes are written to the HTML with the traditional
+	 * string-based rendering, when writing the root tag of the element you must call the function
+	 * <code>oRenderManager.writeClasses(oElement);</code> ({@link sap.ui.core.RenderManager#writeClasses})
+	 * within the renderer of the control to which the element belongs.
 	 *
 	 * This function adds the following functions to the elements prototype:
 	 * <ul>

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Static class for enabling declarative UI support.
 	 *
 	 * @author Peter Muessig, Tino Butz
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 1.7.0
 	 * @public
 	 * @alias sap.ui.core.DeclarativeSupport

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

@@ -130,7 +130,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @public
 	 * @alias sap.ui.core.Element
 	 */