@openui5/sap.ui.core 1.120.31 → 1.120.32

package/src/sap/ui/core/dnd/DragDropInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/core/Element", "./DragInfo", "./DropInfo", "sap/base/Log"
 	 * @extends sap.ui.core.dnd.DropInfo
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/dnd/DropInfo.js

@@ -21,7 +21,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/format/TimezoneUtil.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	 * Static collection of utility functions to handle time zone related conversions
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @namespace
 	 * @name module:sap/ui/core/format/TimezoneUtils
 	 * @private

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

@@ -16,7 +16,7 @@ sap.ui.define([
 
 	const BASE_CVERS = Version("1.14");
 
-	const VERSION = "1.120.31";
+	const VERSION = "1.120.32";
 
 	var M_COMPAT_FEATURES = {
 		"xx-test"               : "1.15", //for testing purposes only

package/src/sap/ui/core/hyphenation/Hyphenation.js

@@ -400,7 +400,7 @@ sap.ui.define([
 	 * @see {@link topic:6322164936f047de941ec522b95d7b70 Hyphenation for Text Controls}
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @hideconstructor
 	 * @public
 	 * @since 1.60

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

@@ -26,13 +26,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.core
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @since 0.8
 	 * @public
 	 */
 	 var thisLib = Library.init({
 		 name: "sap.ui.core",
-		 version: "1.120.31",
+		 version: "1.120.32",
 		 designtime: "sap/ui/core/designtime/library.designtime",
 		 // "apiVersion" is still WIP and in 1.120 restricted to the sap.ui.core library only!
 		 // TODO: Remove spread operator once UI5 Tooling can validate this new property
@@ -1630,7 +1630,7 @@ sap.ui.define([
 	/**
 	 * Sort order of a column.
 	 *
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @enum {string}
 	 * @public
 	 * @since 1.61.0

package/src/sap/ui/core/message/ControlMessageProcessor.js

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/message/MessageProcessor'],
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.ControlMessageProcessor

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @param {object} [mParameters] a map which contains the following parameter properties:
 	 * @param {string} [mParameters.id] The message id: will be generated if no id is set

package/src/sap/ui/core/message/MessageManager.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageManager

package/src/sap/ui/core/message/MessageParser.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/Log"],
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @public
 	 * @abstract
 	 * @alias sap.ui.core.message.MessageParser

package/src/sap/ui/core/message/MessageProcessor.js

@@ -27,7 +27,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/util/uid"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.message.MessageProcessor

package/src/sap/ui/core/mvc/HTMLView.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.mvc.View
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.9.2

package/src/sap/ui/core/mvc/JSONView.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @class
 	 * A View defined using JSON.
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.JSONView

package/src/sap/ui/core/mvc/JSView.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @deprecated Since 1.90. Instead use {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed Views}
 	 * by defining the view class with {@link sap.ui.core.mvc.View.extend View.extend} and
 	 * creating the view instances with {@link sap.ui.core.mvc.View.create View.create}.

package/src/sap/ui/core/mvc/TemplateView.js

@@ -29,7 +29,7 @@ function(View, TemplateViewRenderer, ViewType, Log) {
 	 * @extends sap.ui.core.mvc.View
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @deprecated Since version 1.56.0, use {@link sap.ui.core.mvc.XMLView} in combination with

package/src/sap/ui/core/mvc/View.js

@@ -142,7 +142,7 @@ sap.ui.define([
 	 * The default implementation of this method returns <code>false</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.View

package/src/sap/ui/core/mvc/XMLView.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * bound content aggregation. An error will be thrown when the above combination is detected.
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.XMLView

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @see sap.ui.core.DeclarativeSupport
 	 * @public
 	 * @since 1.7.0
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.plugin.DeclarativeSupport
 	 * @deprecated since 1.120
 	 */

package/src/sap/ui/core/plugin/LessSupport.js

@@ -44,7 +44,7 @@
 			 *        feature - DO NOT USE IN PRODUCTIVE SCENARIOS!!
 			 *
 			 * @author Peter Muessig
-			 * @version 1.120.31
+			 * @version 1.120.32
 			 * @private
 			 * @alias sap.ui.core.plugin.LessSupport
 			 */

package/src/sap/ui/core/plugin/TemplatingSupport.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @public
 	 * @since 1.15.0
 	 * @deprecated since 1.56, use an {@link sap.ui.core.mvc.XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.plugin.TemplatingSupport
 	 */
 	var TemplatingSupport = function() {

package/src/sap/ui/core/postmessage/Bus.js

@@ -36,7 +36,7 @@ function (
 	 * @alias sap.ui.core.postmessage.Bus
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @private
 	 * @ui5-restricted sap.ui.core.support, sap.ui.support, sap.ui.rta
 	 */

package/src/sap/ui/core/postmessage/confirmationDialog.js

@@ -13,7 +13,7 @@ sap.ui.define(function () {
 	 *
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @function
 	 * @param {string} sMessage - Dialog message

package/src/sap/ui/core/search/OpenSearchProvider.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * A SearchProvider which uses the OpenSearch protocol (either JSON or XML).
 	 * @extends sap.ui.core.search.SearchProvider
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @deprecated as of version 1.120. There is no API replacement.
 	 *
 	 * @public

package/src/sap/ui/core/search/SearchProvider.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log", 'sap/ui/core/library'],
 	 *
 	 * Do not create instances of this class, but use a concrete subclass instead.
 	 * @extends sap.ui.core.Element
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @deprecated since 1.120. There is no API replacement.
 	 *
 	 * @public

package/src/sap/ui/core/service/Service.js

@@ -69,7 +69,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert", "sap/base/Log"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.service.Service
 	 * @abstract
 	 * @private

package/src/sap/ui/core/service/ServiceFactory.js

@@ -83,7 +83,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/service/Service', "sap/base/as
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.service.ServiceFactory
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/service/ServiceFactoryRegistry.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ServiceFactory', "sap/base/assert"],
 	 * The service factory registry.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.service.ServiceFactoryRegistry
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/support/Plugin.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @abstract
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @private
 	 * @ui5-restricted
 	 * @alias sap.ui.core.support.Plugin

package/src/sap/ui/core/support/Support.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class This class provides the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 	 *
 	 * @extends sap.ui.base.EventProvider
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @private
 	 * @alias sap.ui.core.support.Support
 	 */

package/src/sap/ui/core/support/plugins/ControlTree.js

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @class This class represents the ControlTree plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.ControlTree
 		 */

package/src/sap/ui/core/support/plugins/Interaction.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Interaction
 		 */

package/src/sap/ui/core/support/plugins/LocalStorage.js

@@ -15,7 +15,7 @@ sap.ui.define(['sap/ui/core/support/Plugin', "sap/base/Log"],
 		 * @class This class represents the LocalStorage plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.LocalStorage
 		 */

package/src/sap/ui/core/support/plugins/Performance.js

@@ -56,7 +56,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Performance
 		 */

package/src/sap/ui/core/support/plugins/Selector.js

@@ -22,7 +22,7 @@ sap.ui.define([
 		 * @class This class represents the selector plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Selector
 		 */

package/src/sap/ui/core/support/plugins/TechInfo.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @class This class represents the technical info plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.TechInfo
 		 */

package/src/sap/ui/core/support/plugins/Trace.js

@@ -20,7 +20,7 @@ sap.ui.define([
 		 * @class This class represents the trace plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Trace
 		 */

package/src/sap/ui/core/support/plugins/ViewInfo.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * Creates an instance of sap.ui.core.support.plugins.ViewInfo.
 		 * @class This class represents the ViewInfo plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.120.31
+		 * @version 1.120.32
 		 * @private
 		 * @deprecated As of version 1.118
 		 * @alias sap.ui.core.support.plugins.ViewInfo

package/src/sap/ui/core/theming/ThemeManager.js

@@ -7,9 +7,9 @@
 // Provides class sap.ui.core.theming.ThemeManager
 sap.ui.define([
 	"sap/base/assert",
+	"sap/base/config",
 	"sap/base/Eventing",
 	"sap/base/Log",
-	"sap/base/config",
 	"sap/base/i18n/Localization",
 	"sap/base/util/each",
 	"sap/base/util/LoaderExtensions",
@@ -21,9 +21,9 @@ sap.ui.define([
 	"sap/ui/dom/includeStylesheet"
 ], function(
 	assert,
+	BaseConfig,
 	Eventing,
 	Log,
-	BaseConfig,
 	Localization,
 	each,
 	LoaderExtensions,
@@ -37,17 +37,55 @@ sap.ui.define([
 	"use strict";
 
 	const oEventing = new Eventing();
-	var maxThemeCheckCycles = 150;
-	var mAllLoadedLibraries = {};
-	var CUSTOMCSSCHECK = /\.sapUiThemeDesignerCustomCss/i;
-
-	var _iCount = 0; // Prevent endless loop
-	var _CUSTOMID = "sap-ui-core-customcss";
-	var _customCSSAdded = false;
-	var _themeCheckedForCustom = null;
-	var _sFallbackTheme = null;
-	var _mThemeFallback = {};
-	var _sThemeCheckId;
+	const maxThemeCheckCycles = 150;
+	const mAllLoadedLibraries = {};
+	const CUSTOMCSSCHECK = /\.sapUiThemeDesignerCustomCss/i;
+	const _CUSTOMID = "sap-ui-core-customcss";
+	const _THEME_PREFIX = "sap-ui-theme-";
+	let bAllPreloadedCssReady = true;
+
+	// Collect all UI5 relevant CSS files which have been added upfront
+	// and add them to UI5 theming lifecycle
+	document.querySelectorAll(`link[id^=${_THEME_PREFIX}]`).forEach(function(linkNode) {
+		let bPreloadedCssReady = true;
+		const sLibId = linkNode.getAttribute("id").replace(_THEME_PREFIX, "");
+
+		mAllLoadedLibraries[sLibId] = {};
+		linkNode.removeAttribute("data-sap-ui-ready");
+
+		Log.info(`ThemeManager: Preloaded CSS for library ${sLibId} detected: ${linkNode.href}`, undefined, "sap.ui.core.theming.ThemeManager");
+
+		try {
+			bPreloadedCssReady = !!(linkNode.sheet?.href === linkNode.href && linkNode.sheet?.cssRules);
+
+			if (!bPreloadedCssReady) {
+				bAllPreloadedCssReady = bPreloadedCssReady;
+				linkNode.addEventListener("load", (oEvent) => {
+					const bError = oEvent.type === "error";
+					linkNode.setAttribute("data-sap-ui-ready", !bError);
+				});
+			} else {
+				linkNode.setAttribute("data-sap-ui-ready", linkNode.sheet.cssRules.length > 0);
+			}
+		} catch (e) {
+			// If the stylesheet is cross-origin and throws a security error, we can't verify directly
+			Log.info("Could not detect ready state of preloaded CSS. Request stylesheet again to verify the response status", undefined, "sap.ui.core.theming.ThemeManager");
+
+			bAllPreloadedCssReady = false;
+
+			includeStylesheet({
+				url: linkNode.href,
+				id: linkNode.getAttribute("id")
+			});
+		}
+	});
+
+	let _iCount = 0; // Prevent endless loop
+	let _customCSSAdded = false;
+	let _themeCheckedForCustom = null;
+	let _sFallbackTheme = null;
+	let _mThemeFallback = {};
+	let _sThemeCheckId;
 
 	/**
 	 * Helper class used by the UI5 Core to check whether the themes are applied correctly.
@@ -67,7 +105,7 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.core
 		 */
-		themeLoaded: true,
+		themeLoaded: bAllPreloadedCssReady,
 
 		/**
 		 * Trigger ThemeManager
@@ -117,7 +155,10 @@ sap.ui.define([
 			// (e.g. IconPool which includes font files from sap.ui.core base theme)
 			_ensureThemeRoot(sLibName, "base");
 
-			mAllLoadedLibraries[sLibName] = oLibThemingInfo;
+			// Assume CSS is preloaded in case we detect a link tag with corresponding ID
+			const sLinkId = `${sLibName}${oLibThemingInfo.variant ? "-[" + oLibThemingInfo.variant + "]" : ""}`;
+			oLibThemingInfo.preloadedCss = oLibThemingInfo.preloadedCss || !!mAllLoadedLibraries[sLinkId];
+			mAllLoadedLibraries[sLinkId] = oLibThemingInfo;
 			if (!oLibThemingInfo.preloadedCss) {
 				ThemeManager.includeLibraryTheme(sLibName, oLibThemingInfo.variant, oLibThemingInfo);
 			}
@@ -173,7 +214,7 @@ sap.ui.define([
 					sLibName = sLibName.substring(0, sLibName.indexOf(":"));
 				}
 
-				var sLinkId = "sap-ui-theme-" + sLibId;
+				var sLinkId = `${_THEME_PREFIX}${sLibId}`;
 				var sSkeletonLinkId = "sap-ui-themeskeleton-" + sLibId;
 				var bCssVariables = /^(true|x|additional)$/i.test(sCssVariablesParam);
 				if (!document.querySelector("LINK[id='" + sLinkId + "']") || (bCssVariables && !document.querySelector("LINK[id='" + sSkeletonLinkId + "']"))) {
@@ -245,7 +286,7 @@ sap.ui.define([
 		 */
 		_updateThemeUrls: function(sThemeName, bSuppressFOUC) {
 			// select "our" stylesheets
-			var oQueryResult = document.querySelectorAll("link[id^=sap-ui-theme-],link[id^=sap-ui-themeskeleton-]");
+			var oQueryResult = document.querySelectorAll(`link[id^=${_THEME_PREFIX}],link[id^=sap-ui-themeskeleton-]`);
 
 			Array.prototype.forEach.call(oQueryResult, function(oHTMLElement) {
 				updateThemeUrl(oHTMLElement, sThemeName, bSuppressFOUC);
@@ -308,8 +349,7 @@ sap.ui.define([
 		}
 
 		function checkLib(lib) {
-			var sStyleId = "sap-ui-theme-" + lib;
-			var currentRes = ThemeHelper.checkAndRemoveStyle({ prefix: "sap-ui-theme-", id: lib });
+			var currentRes = ThemeHelper.checkAndRemoveStyle({ prefix: _THEME_PREFIX, id: lib });
 			if (currentRes && document.getElementById("sap-ui-themeskeleton-" + lib)) {
 				// remove also the skeleton if present in the DOM
 				currentRes = ThemeHelper.checkAndRemoveStyle({ prefix: "sap-ui-themeskeleton-", id: lib });
@@ -357,7 +397,7 @@ sap.ui.define([
 			// Collect all libs that failed to load and no fallback has been applied, yet.
 			// The fallback relies on custom theme metadata, so it is not done for standard themes
 			if (!bIsStandardTheme && currentRes && !_mThemeFallback[lib]) {
-				var oStyle = document.getElementById(sStyleId);
+				var oStyle = document.getElementById(`${_THEME_PREFIX}${lib}`);
 				// Check for error marker (data-sap-ui-ready=false) and that there are no rules
 				// to be sure the stylesheet couldn't be loaded at all.
 				// E.g. in case an @import within the stylesheet fails, the error marker will
@@ -389,8 +429,7 @@ sap.ui.define([
 
 			if (_sFallbackTheme) {
 				aFailedLibs.forEach(function(lib) {
-					var sStyleId = "sap-ui-theme-" + lib;
-					var oStyle = document.getElementById(sStyleId);
+					const oStyle = document.getElementById(`${_THEME_PREFIX}${lib}`);
 
 					Log.warning(
 						"ThemeManager: Custom theme '" + sThemeName + "' could not be loaded for library '" + lib + "'. " +
@@ -426,7 +465,7 @@ sap.ui.define([
 	 */
 	function checkCustom(lib) {
 
-		var cssFile = window.document.getElementById("sap-ui-theme-" + lib);
+		var cssFile = window.document.getElementById(`${_THEME_PREFIX}${lib}`);
 
 		if (!cssFile) {
 			return false;
@@ -593,13 +632,13 @@ sap.ui.define([
 	// this function is also used by "sap.ui.core.theming.ThemeManager" to load a fallback theme for a single library
 	function updateThemeUrl(oLink, sThemeName, bSuppressFOUC) {
 		var sLibName,
-		    iQueryIndex = oLink.href.search(/[?#]/),
-		    sLibFileName,
-		    sQuery,
-		    sStandardLibFilePrefix = "library",
-		    sRTL = Localization.getRTL() ? "-RTL" : "",
-		    sHref,
-		    pos;
+			iQueryIndex = oLink.href.search(/[?#]/),
+			sLibFileName,
+			sQuery,
+			sStandardLibFilePrefix = "library",
+			sRTL = Localization.getRTL() ? "-RTL" : "",
+			sHref,
+			pos;
 
 		// derive lib name from id via regex
 		var mLinkId = /^sap-ui-theme(?:skeleton)?-(.*)$/i.exec(oLink.id);
@@ -607,7 +646,7 @@ sap.ui.define([
 			sLibName = mLinkId[1];
 		} else {
 			// fallback to legacy logic
-			sLibName = oLink.id.slice(13); // length of "sap-ui-theme-"
+			sLibName = oLink.id.slice(_THEME_PREFIX.length);
 		}
 
 		mAllLoadedLibraries[sLibName] = mAllLoadedLibraries[sLibName] || {};
@@ -692,5 +731,10 @@ sap.ui.define([
 
 	Theming.registerThemeManager(ThemeManager);
 
+	// Start polling in case preloaded CSS have been detected
+	if (!ThemeManager.themeLoaded) {
+		ThemeManager.checkThemeApplied();
+	}
+
 	return ThemeManager;
 });

package/src/sap/ui/core/tmpl/DOMAttribute.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/library'],
 	 * @class
 	 * Represents a DOM attribute of a DOM element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/DOMElement.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * Represents a DOM element. It allows to use databinding for the properties and nested DOM attributes.
 	 * @extends sap.ui.core.Control
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/HandlebarsTemplate.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.tmpl.Template
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.tmpl.HandlebarsTemplate
 	 * @since 1.15
 	 * @deprecated as of version 1.56. Use an {@link sap.ui.core.mvc.XMLView XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead.

package/src/sap/ui/core/tmpl/Template.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.31
+	 * @version 1.120.32
 	 * @alias sap.ui.core.tmpl.Template
 	 * @since 1.15
 	 * @deprecated since 1.56, use an {@link sap.ui.core.mvc.XMLView XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead.