@openui5/sap.ui.core 1.107.1 → 1.108.1

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

@@ -23,6 +23,7 @@ sap.ui.define([
 	'sap/base/util/UriParameters',
 	'sap/base/util/isPlainObject',
 	'sap/base/util/LoaderExtensions',
+	'sap/ui/core/_UrlResolver',
 	'sap/ui/VersionInfo',
 	'sap/ui/core/mvc/ViewType',
 	'sap/ui/core/Configuration'
@@ -44,6 +45,7 @@ sap.ui.define([
 	UriParameters,
 	isPlainObject,
 	LoaderExtensions,
+	_UrlResolver,
 	VersionInfo,
 	ViewType,
 	Configuration
@@ -246,7 +248,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -1761,7 +1763,7 @@ sap.ui.define([
 
 							// resolve relative to component, ui5:// URLs are already resolved upfront
 							var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
-							var sAnnotationUri = oAnnotationSourceManifest._resolveUri(oAnnotationUri).toString();
+							var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
 
 							// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
 							oModelConfig.settings = oModelConfig.settings || {};
@@ -1807,7 +1809,7 @@ sap.ui.define([
 
 				// resolve URI relative to component which defined it
 				var oUriSourceManifest = (bIsDataSourceUri ? mConfig.origin.dataSources[oModelConfig.dataSource] : mConfig.origin.models[sModelName]) || oManifest;
-				oUri = oUriSourceManifest._resolveUri(oUri);
+				oUri = new URI(oUriSourceManifest.resolveUri(oModelConfig.uri));
 
 				// inherit sap-specific parameters from document (only if "sap.app/dataSources" reference is defined)
 				if (oModelConfig.dataSource) {
@@ -1941,7 +1943,13 @@ sap.ui.define([
 				if (aActiveTerminologies) {
 					oModelConfig.settings.activeTerminologies = aActiveTerminologies;
 				}
-				oManifest._processResourceConfiguration(oModelConfig.settings, /*bundleUrlRelativeTo=*/undefined, /*alreadyResolvedOnRoot=*/true);
+
+				_UrlResolver._processResourceConfiguration(oModelConfig.settings, {
+					alreadyResolvedOnRoot: true,
+					baseURI: oManifest._oBaseUri,
+					manifestBaseURI: oManifest._oManifestBaseUri,
+					relativeTo: undefined
+				});
 			}
 
 			// normalize settings object to array
@@ -2460,6 +2468,15 @@ sap.ui.define([
 	 */
 	function componentFactory(vConfig, bLegacy) {
 		var oOwnerComponent = Component.get(ManagedObject._sOwnerId);
+
+		if (Array.isArray(vConfig.activeTerminologies) && vConfig.activeTerminologies.length &&
+			Array.isArray(Configuration.getActiveTerminologies()) && Configuration.getActiveTerminologies().length) {
+			if (JSON.stringify(vConfig.activeTerminologies) !== JSON.stringify(Configuration.getActiveTerminologies())) {
+				Log.warning(bLegacy ? "sap.ui.component: " : "Component.create: " +
+					"The 'activeTerminolgies' passed to the component factory differ from the ones defined on the global 'sap.ui.core.Configuration#getActiveTerminologies';" +
+					"This might lead to inconsistencies; ResourceModels that are not defined in the manifest and created by the component will use the globally configured terminologies.");
+			}
+		}
 		// get terminologies information: API -> Owner Component -> Configuration
 		var aActiveTerminologies = vConfig.activeTerminologies || (oOwnerComponent && oOwnerComponent.getActiveTerminologies()) || Configuration.getActiveTerminologies();
 

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.107.1
+	 * @version 1.108.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer
@@ -256,6 +256,10 @@ sap.ui.define([
 
 	// Delegate registered by the ComponentContainer#showPlaceholder function
 	var oPlaceholderDelegate = {
+		/**
+		 * @this {sap.ui.core.ComponentContainer}
+		 * @private
+		 */
 		"onAfterRendering": function() {
 			// check whether the placeholder is still active. If yes, show the placeholder again
 			if (this._placeholder) {

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 * @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.107.1
+	 * @version 1.108.1
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	// Singleton instance for configuration
 	var oConfiguration;
 	var M_SETTINGS;
-	var VERSION = "1.107.1";
+	var VERSION = "1.108.1";
 
 	// Helper Functions
 	function detectLanguage() {
@@ -575,8 +575,7 @@ sap.ui.define([
 			var aCSSLibs = config['preloadLibCss'];
 			if ( aCSSLibs.length > 0 ) {
 				// a leading "!" denotes that the application has loaded the file already
-				config.cssAppManaged = aCSSLibs[0].slice(0,1) === "!";
-				if ( config.cssAppManaged ) {
+				if ( aCSSLibs[0].startsWith("!") ) {
 					aCSSLibs[0] = aCSSLibs[0].slice(1); // also affect same array in "config"!
 				}
 				if ( aCSSLibs[0] === "*" ) {
@@ -1777,18 +1776,6 @@ sap.ui.define([
 			this.securityTokenHandlers = aSecurityTokenHandlers.slice();
 		},
 
-		/**
-		 * Returns whether preload lib CSS is app managed or not
-		 *
-		 * @returns {boolean} whether preload lib CSS is app managed or not
-		 * @private
-		 * @ui5-restricted sap.ui.core.Core
-		 * @since 1.106.0
-		 */
-		getCssAppManaged: function () {
-			return !!this.cssAppManaged;
-		},
-
 		/**
 		 * Applies multiple changes to the configuration at once.
 		 *

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.107.1
+	 * @version 1.108.1
 	 * @alias sap.ui.core.Control
 	 */
 	var Control = Element.extend("sap.ui.core.Control", /** @lends sap.ui.core.Control.prototype */ {
@@ -181,7 +181,7 @@ sap.ui.define([
 
 			Element.apply(this,arguments);
 			this.bOutput = this.getDomRef() != null; // whether this control has already produced output
-
+			this._bOnBeforeRenderingPhase = false; // whether the control is in the onBeforeRendering phase
 		},
 
 		renderer : null // Control has no renderer
@@ -326,6 +326,13 @@ 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
+		if ( this._bOnBeforeRenderingPhase ) {
+			return;
+		}
+
 		if ( this.bOutput && (oUIArea = this.getUIArea()) ) {
 			// if this control has been rendered before (bOutput)
 			// and if it is contained in a UIArea (!!oUIArea)
@@ -785,10 +792,18 @@ sap.ui.define([
 
 	// ---- local busy indicator handling ---------------------------------------------------------------------------------------
 	var oRenderingDelegate = {
+		/**
+		 * @this {sap.ui.core.Control}
+		 * @private
+		 */
 		onBeforeRendering: function() {
 			// remove all block-layers to prevent leftover DOM elements and eventhandlers
 			fnRemoveAllBlockLayers.call(this);
 		},
+		/**
+		 * @this {sap.ui.core.Control}
+		 * @private
+		 */
 		onAfterRendering: function () {
 			if (this.getBlocked() && this.getDomRef() && !this.getDomRef("blockedLayer")) {
 				this._oBlockState = BlockLayerUtils.block(this, this.getId() + "-blockedLayer", this._sBlockSection);
@@ -1199,6 +1214,9 @@ sap.ui.define([
 	 *                            // <code>null</code> can be provided.
 	 *      editable: true,       // Boolean which describes whether the control is editable. If not relevant it must not be set or
 	 *                            // <code>null</code> can be provided.
+	 *      required: true,       // Boolean which describes whether the control is mandatory. If not relevant it must not be set or
+	 *                            // <code>null</code> can be provided. The required state might also be handled as part of the description. In this
+	 *                            // case this flag should not be used.
 	 *      children: []          // Aggregations of the given control (e.g. when the control is a layout). Primitive aggregations will be ignored.
 	 *                            // Note: Children should only be provided when it is helpful to understand the accessibility context
 	 *                            //       (e.g. a form control must not provide details of its internals (fields, labels, ...) but a