@openui5/sap.ui.core 1.93.3 → 1.96.2

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @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

@@ -13,9 +13,9 @@ sap.ui.define([
 	'./UIComponentMetadata',
 	'./mvc/Controller',
 	'./mvc/View',
-	"sap/base/util/ObjectPath",
-	"sap/base/Log",
-	"sap/ui/core/Core" // to ensure correct behaviour of sap.ui.getCore()
+	'sap/base/util/ObjectPath',
+	'sap/base/Log',
+	'sap/ui/core/Core' // to ensure correct behaviour of sap.ui.getCore()
 ],
 	function(
 		ManagedObject,
@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @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();
 			}
 		}
 
@@ -359,18 +359,39 @@ sap.ui.define([
 
 		// create the router for the component instance
 		if (vRoutes) {
-			var Router = sap.ui.requireSync("sap/ui/core/routing/Router");
-			var fnRouterConstructor = getConstructorFunctionFor(this._getRouterClassName() || Router);
+			var fnRouterConstructor;
+			var sRouterClassName = this._getRouterClassName();
+
+			// if a classname is configured, the Router class MUST be loaded
+			if (sRouterClassName) {
+				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"); // legacy-relevant: Sync path
+			}
 			this._oRouter = new fnRouterConstructor(vRoutes, oRoutingConfig, this, oRoutingManifestEntry.targets, this._oRouterHashChanger);
 			this._oTargets = this._oRouter.getTargets();
 			this._oViews = this._oRouter.getViews();
 		} else if (oRoutingManifestEntry.targets) {
-			var Targets = sap.ui.requireSync("sap/ui/core/routing/Targets");
-			var Views = sap.ui.requireSync("sap/ui/core/routing/Views");
+			// 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"); // legacy-relevant: Sync path
+
 			this._oViews = new Views({
 				component: this
 			});
-			var fnTargetsConstructor = getConstructorFunctionFor(oRoutingConfig.targetsClass || Targets);
+			var fnTargetsConstructor;
+
+			// if a targets classname is configured, the Targets class MUST be loaded
+			if (oRoutingConfig.targetsClass) {
+				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"); // legacy-relevant: Sync path
+			}
 			this._oTargets = new fnTargetsConstructor({
 				targets: oRoutingManifestEntry.targets,
 				config: oRoutingConfig,
@@ -644,7 +665,7 @@ sap.ui.define([
 	 *
 	 * A <code>sap.ui.core.UIComponent</code> subclass can additionally implement the {@link sap.ui.core.IAsyncContentCreation} interface.
 	 * When implementing this interface the loading and processing of an asynchronous <code>rootView</code> will be chained into
-	 * the result Promise of the {@link sap.ui.core.Component.create Component.create} factory.
+	 * the result Promise of the {@link sap.ui.core.Component.create Component.create} factory. An additional async flag can be omitted.
 	 * See Sample 1 below.
 	 *
 	 * Samples 2 and 3 show how subclasses can overwrite the <code>createContent</code> function
@@ -659,8 +680,7 @@ sap.ui.define([
 	 *             rootView: {
 	 *                 viewName: "my.sample.views.Main",
 	 *                 type: "XML",
-	 *                 id: "sampleMainView",
-	 *                 async: true
+	 *                 id: "sampleMainView"
 	 *             },
 	 *             interfaces: ["sap.ui.core.IAsyncContentCreation"]
 	 *         }
@@ -715,6 +735,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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+		 * @version 1.96.2
 		 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+		 * @version 1.96.2
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}
@@ -519,7 +519,7 @@ sap.ui.define([
 			var sFragment = oFragmentContent ? (new XMLSerializer()).serializeToString(oFragmentContent) : undefined;
 			this.bUsesI18n = sFragment ? (sFragment.indexOf("$" + this.alias + ".i18n") != -1) : true;
 
-			this._setCompositeAggregation(sap.ui.xmlfragment({
+			this._setCompositeAggregation(sap.ui.xmlfragment({ // legacy-relevant: can lead to follow-up sync XHRs for controls
 				sId: this.getId(),
 				fragmentContent: oFragmentContent,
 				oController: this

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.93.3
+	 * @version 1.96.2
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata
@@ -170,7 +170,7 @@ sap.ui.define([
 	XMLCompositeMetadata.prototype._loadFragment = function (sFragmentName, sExtension) {
 		var sFragmentKey = sExtension + "$" + sFragmentName;
 		if (!mFragmentCache[sFragmentKey]) {
-			mFragmentCache[sFragmentKey] = XMLTemplateProcessor.loadTemplate(sFragmentName, sExtension);
+			mFragmentCache[sFragmentKey] = XMLTemplateProcessor.loadTemplate(sFragmentName, sExtension); // legacy-relevant: sync loading of XML resource
 		}
 
 		return mFragmentCache[sFragmentKey];

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

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/*global HTMLTemplateElement, DocumentFragment, Promise*/
+/*global HTMLTemplateElement, Promise */
 
 sap.ui.define([
 	'sap/ui/thirdparty/jquery',
@@ -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) {
@@ -168,6 +168,12 @@ function(
 	 */
 	var PREPROCESSOR_NAMESPACE_PREFIX = "http://schemas.sap.com/sapui5/preprocessorextension/";
 
+	/**
+	 * Pattern that matches the names of all HTML void tags.
+	 * @private
+	 */
+	var rVoidTags = /^(?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)$/;
+
 	/**
 	 * Creates a function based on the passed mode and callback which applies a callback to each child of a node.
 	 * @param {boolean} bAsync The strategy to choose
@@ -355,7 +361,7 @@ function(
 				// TODO: might be refactored into resolveResultPromises()?
 				if (Array.isArray(args[0])) {
 					 args[0] = args[0].filter(function(e) {
-						return !e._isExtensionPoint;
+						return e == null || !e._isExtensionPoint;
 					 });
 				 }
 				return args[0];
@@ -452,7 +458,7 @@ function(
 					});
 				} else {
 					Object.keys(oRequireContext).forEach(function(sKey) {
-						oModules[sKey] = sap.ui.requireSync(oRequireContext[sKey]);
+						oModules[sKey] = sap.ui.requireSync(oRequireContext[sKey]); // legacy-relevant: Sync path
 					});
 
 					return SyncPromise.resolve(oModules);
@@ -542,10 +548,42 @@ function(
 		// later this intermediate state with promises gets resolved to a flat array containing only strings and controls
 		var aResult = [],
 			sInternalPrefix = findNamespacePrefix(xmlNode, UI5_INTERNAL_NAMESPACE, "__ui5"),
-			pResultChain = parseAndLoadRequireContext(xmlNode, bAsync) || SyncPromise.resolve();
-
-		// define internal namespace on root node
-		xmlNode.setAttributeNS(XMLNS_NAMESPACE, "xmlns:" + sInternalPrefix, UI5_INTERNAL_NAMESPACE);
+			pResultChain = parseAndLoadRequireContext(xmlNode, bAsync) || SyncPromise.resolve(),
+			rm = {
+				openStart: function(tagName, sId) {
+					aResult.push(["openStart", [tagName, sId]]);
+				},
+				voidStart: function(tagName, sId) {
+					aResult.push(["voidStart", [tagName, sId]]);
+				},
+				style: function(name, value) {
+					aResult.push(["style", [name, value]]);
+				},
+				"class": function(clazz) {
+					aResult.push(["class", [clazz]]);
+				},
+				attr: function(name, value) {
+					aResult.push(["attr", [name, value]]);
+				},
+				openEnd: function() {
+					aResult.push(["openEnd"]);
+				},
+				voidEnd: function() {
+					aResult.push(["voidEnd"]);
+				},
+				text: function(str) {
+					aResult.push(["text", [str]]);
+				},
+				unsafeHtml: function(str) {
+					aResult.push(["unsafeHtml", [str]]);
+				},
+				close: function(tagName) {
+					aResult.push(["close", [tagName]]);
+				},
+				renderControl: function(content) {
+					aResult.push(pResultChain);
+				}
+			};
 
 		bAsync = bAsync && !!oView._sProcessingMode;
 		Log.debug("XML processing mode is " + (oView._sProcessingMode || "default") + ".", "", "XMLTemplateProcessor");
@@ -578,6 +616,10 @@ function(
 				// it's not <core:View>, it's <mvc:View> !!!
 				Log.warning("XMLView root node must have the 'sap.ui.core.mvc' namespace, not '" + xmlNode.namespaceURI + "'" + (sCurrentName ? " (View name: " + sCurrentName + ")" : ""));
 			}
+
+			// define internal namespace on root node
+			xmlNode.setAttributeNS(XMLNS_NAMESPACE, "xmlns:" + sInternalPrefix, UI5_INTERNAL_NAMESPACE);
+
 			parseChildren(xmlNode, false, false, pResultChain);
 		}
 
@@ -638,39 +680,79 @@ function(
 			if ( xmlNode.nodeType === 1 /* ELEMENT_NODE */ ) {
 
 				var sLocalName = localName(xmlNode);
-				if (xmlNode.namespaceURI === XHTML_NAMESPACE || xmlNode.namespaceURI === SVG_NAMESPACE) {
+				var bXHTML = xmlNode.namespaceURI === XHTML_NAMESPACE;
+				if (bXHTML || xmlNode.namespaceURI === SVG_NAMESPACE) {
+					// determine ID
+					var sId = xmlNode.getAttribute("id");
+					if ( sId == null ) {
+						sId = bRoot === true ? oView.getId() : undefined;
+					} else {
+						sId = getId(oView, xmlNode);
+					}
+					if ( sLocalName === "style" ) {
+						// We need to remove the namespace prefix from style nodes
+						// otherwise the style element's content will be output as text and not evaluated as CSS
+						// We do this by manually 'cloning' the style without the NS prefix
+
+						// original node values
+						var aAttributes = xmlNode.attributes; // array-like 'NamedNodeMap'
+						var sTextContent = xmlNode.textContent;
+
+						// 'clone'
+						xmlNode = document.createElement(sLocalName);
+						xmlNode.textContent = sTextContent;
+
+						// copy all non-prefixed attributes
+						//    -> prefixed attributes are invalid HTML
+						for (var j = 0; j < aAttributes.length; j++) {
+							var oAttr = aAttributes[j];
+							if (!oAttr.prefix) {
+								xmlNode.setAttribute(oAttr.name, oAttr.value);
+							}
+						}
+						// avoid encoding of style content by writing the whole tag as unsafeHtml
+						// for compatibility reasons, apply the same ID rewriting as for other tags
+						if ( sId != null ) {
+							xmlNode.setAttribute("id", sId);
+						}
+						if ( bRoot === true ) {
+							xmlNode.setAttribute("data-sap-ui-preserve", oView.getId());
+						}
+						rm.unsafeHtml(xmlNode.outerHTML);
+						return;
+					}
 					// write opening tag
-					aResult.push("<" + sLocalName + " ");
+					var bVoid = rVoidTags.test(sLocalName);
+					if ( bVoid ) {
+						rm.voidStart(sLocalName, sId);
+					} else {
+						rm.openStart(sLocalName, sId);
+					}
 					// write attributes
-					var bHasId = false;
 					for (var i = 0; i < xmlNode.attributes.length; i++) {
 						var attr = xmlNode.attributes[i];
-						var value = attr.value;
-						if (attr.name === "id") {
-							bHasId = true;
-							value = getId(oView, xmlNode);
+						if ( attr.name !== "id" ) {
+							rm.attr(bXHTML ? attr.name.toLowerCase() : attr.name, attr.value);
 						}
-						aResult.push(attr.name + "=\"" + encodeXML(value) + "\" ");
 					}
 					if ( bRoot === true ) {
-						aResult.push("data-sap-ui-preserve" + "=\"" + oView.getId() + "\" ");
-						if (!bHasId) {
-							aResult.push("id" + "=\"" + oView.getId() + "\" ");
-						}
+						rm.attr("data-sap-ui-preserve", oView.getId());
 					}
-					aResult.push(">");
+					if ( bVoid ) {
+						rm.voidEnd();
+						if ( xmlNode.firstChild ) {
+							Log.error("Content of void HTML element '" + sLocalName + "' will be ignored");
+						}
+					} else {
+						rm.openEnd();
 
-					// write children
-					var oContent = xmlNode;
-					if (window.HTMLTemplateElement && xmlNode instanceof HTMLTemplateElement && xmlNode.content instanceof DocumentFragment) {
-						// <template> support (HTMLTemplateElement has no childNodes, but a content node which contains the childNodes)
-						oContent = xmlNode.content;
+						// write children
+						// For HTMLTemplateElement nodes, skip the associated DocumentFragment node
+						var oContent = xmlNode instanceof HTMLTemplateElement ? xmlNode.content : xmlNode;
+						parseChildren(oContent, false, false, pRequireContext);
+						rm.close(sLocalName);
 					}
 
-					parseChildren(oContent, false, false, pRequireContext);
-					aResult.push("</" + sLocalName + ">");
-
-
 				} else if (sLocalName === "FragmentDefinition" && xmlNode.namespaceURI === CORE_NAMESPACE) {
 					// a Fragment element - which is not turned into a control itself. Only its content is parsed.
 					parseChildren(xmlNode, false, true, pRequireContext);
@@ -720,20 +802,13 @@ function(
 							return aChildControls;
 						});
 					});
-					aResult.push(pResultChain);
+					rm.renderControl(pResultChain);
 
 				}
 
 			} else if (xmlNode.nodeType === 3 /* TEXT_NODE */ && !bIgnoreTopLevelTextNodes) {
 
-				var text = xmlNode.textContent || xmlNode.text,
-					parentName = localName(xmlNode.parentNode);
-				if (text) {
-					if (parentName != "style") {
-						text = encodeXML(text);
-					}
-					aResult.push(text);
-				}
+				rm.text(xmlNode.textContent);
 
 			}
 		}
@@ -798,7 +873,7 @@ function(
 						}, reject);
 					});
 				} else {
-					oClassObject = sap.ui.requireSync(sResourceName);
+					oClassObject = sap.ui.requireSync(sResourceName); // legacy-relevant: Sync path
 					oClassObject = getObjectFallback(oClassObject);
 				}
 			}
@@ -852,7 +927,7 @@ function(
 							}, reject);
 						});
 					} else {
-						var XMLView = sap.ui.requireSync("sap/ui/core/mvc/XMLView");
+						var XMLView = sap.ui.requireSync("sap/ui/core/mvc/XMLView"); // legacy-relevant: Sync path
 						return SyncPromise.resolve([fnCreateView(XMLView)]);
 					}
 				}