@openui5/sap.ui.core 1.107.0 → 1.108.0

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

@@ -20,25 +20,25 @@ sap.ui.define([
 	'./ElementMetadata',
 	'./Rendering',
 	'./RenderManager',
-	'./ThemeCheck',
 	'./UIArea',
 	'./message/MessageManager',
-	"sap/ui/util/ActivityDetection",
 	"sap/base/i18n/ResourceBundle",
 	"sap/base/Log",
 	"sap/ui/performance/Measurement",
 	"sap/ui/security/FrameOptions",
 	"sap/base/assert",
-	"sap/ui/dom/includeStylesheet",
 	"sap/base/util/ObjectPath",
 	"sap/base/util/Version",
 	"sap/base/util/array/uniqueSort",
 	'sap/ui/performance/trace/initTraces',
 	'sap/base/util/LoaderExtensions',
 	'sap/base/util/isEmptyObject',
+	'sap/base/util/deepExtend',
 	'sap/base/util/each',
 	'sap/base/util/mixedFetch',
+	'./_UrlResolver',
 	'sap/ui/VersionInfo',
+	'sap/ui/thirdparty/URI',
 	'sap/ui/events/jquery/EventSimulation'
 ],
 	function(
@@ -56,25 +56,25 @@ sap.ui.define([
 		ElementMetadata,
 		Rendering,
 		RenderManager,
-		ThemeCheck,
 		UIArea,
 		MessageManager,
-		ActivityDetection,
 		ResourceBundle,
 		Log,
 		Measurement,
 		FrameOptions,
 		assert,
-		includeStylesheet,
 		ObjectPath,
 		Version,
 		uniqueSort,
 		initTraces,
 		LoaderExtensions,
 		isEmptyObject,
+		deepExtend,
 		each,
 		mixedFetch,
-		VersionInfo
+		_UrlResolver,
+		VersionInfo,
+		URI
 		/* ,EventSimulation */
 	) {
 
@@ -90,6 +90,11 @@ sap.ui.define([
 	 */
 	var FocusHandler;
 
+	/**
+	 * ThemeManager module reference, lazily retrieved via private "_getThemeManager" API.
+	 */
+	var ThemeManager;
+
 	// Initialize SAP Passport or FESR
 	initTraces();
 
@@ -101,6 +106,25 @@ sap.ui.define([
 	 */
 	var mLoadedLibraries = {};
 
+	/**
+	 * Bookkeeping for the guessing of library names.
+	 *
+	 * Set of bundleUrls from which a library name has been derived or not, see #getLibraryNameForBundle
+	 * If no library name can be derived, the result will also be tracked with 'false' as value.
+	 *
+	 * Example:
+	 *   mGuessedLibraries = {
+	 *     "my/simple/library/i18n/i18n.properties": "my.simple.library",
+	 *     "no/library/i18n/i18n.properties": false
+	 *   }
+	 */
+	var mGuessedLibraries = {};
+
+	/**
+	 * Sequence of libraries which require CSS.
+	 */
+	var aAllLibrariesRequiringCss = [];
+
 	/**
 	 * Bookkeeping for the preloading of libraries.
 	 *
@@ -202,7 +226,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.108.0
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor
@@ -372,9 +396,11 @@ sap.ui.define([
 				}
 			});
 
-			Log.info("Declared modules: " + aModules, METHOD);
+			// adding the following classList is done here for compatibility reasons
+			document.documentElement.classList.add("sapUiTheme-" + Configuration.getTheme());
+			Log.info("Declared theme " + Configuration.getTheme(), null, METHOD);
 
-			this._setupThemes();
+			Log.info("Declared modules: " + aModules, METHOD);
 
 			this._setupContentDirection();
 
@@ -597,6 +623,7 @@ sap.ui.define([
 				"applyTheme","setThemeRoot","attachThemeChanged","detachThemeChanged",
 				"isThemeApplied",
 				"notifyContentDensityChanged",
+				"getAllLibrariesRequiringCss",
 				//  - Control & App dev.
 				"getCurrentFocusedControlId",
 				"isMobile",
@@ -675,38 +702,6 @@ sap.ui.define([
 		};
 	};
 
-	/**
-	 * Initializes the window "sap-ui-config" property, sets theme roots, initializes sTheme, sets theme CSS classes
-	 * @private
-	 */
-	Core.prototype._setupThemes = function() {
-		var METHOD = "sap.ui.core.Core";
-
-		// read themeRoots configuration
-		var themeRoots = Configuration.getValue("themeRoots");
-		if (themeRoots) {
-			for (var themeName in themeRoots) {
-				var themeRoot = themeRoots[themeName];
-				if (typeof themeRoot === "string") {
-					this.setThemeRoot(themeName, themeRoot);
-				} else {
-					for (var lib in themeRoot) {
-						if (lib.length > 0) {
-							this.setThemeRoot(themeName, [lib], themeRoot[lib]);
-						} else {
-							this.setThemeRoot(themeName, themeRoot[lib]);
-						}
-					}
-				}
-			}
-		}
-
-		// set CSS class for the theme name
-		this.sTheme = Configuration.getTheme();
-		document.documentElement.classList.add("sapUiTheme-" + this.sTheme);
-		Log.info("Declared theme " + this.sTheme,null,METHOD);
-	};
-
 	/**
 	 * Set the document's dir property
 	 * @private
@@ -829,13 +824,6 @@ sap.ui.define([
 	 * @private
 	 */
 	Core.prototype._boot = function(bAsync, fnCallback) {
-
-		// if a list of preloaded library CSS is configured, request a merged CSS (if application did not already do it)
-		var aCSSLibs = Configuration.getValue("preloadLibCss");
-		if (aCSSLibs && aCSSLibs.length > 0 && !Configuration.getCssAppManaged()) {
-			this.includeLibraryTheme("sap-ui-merged", undefined, "?l=" + aCSSLibs.join(","));
-		}
-
 		// add CalendarClass to list of modules
 		this.aModules.push("sap/ui/core/date/" + Configuration.getCalendarType());
 
@@ -921,137 +909,18 @@ sap.ui.define([
 
 		sThemeName = Configuration.normalizeTheme(sThemeName, sThemeBaseUrl);
 
-		if (sThemeBaseUrl) {
-			this.setThemeRoot(sThemeName, sThemeBaseUrl);
-		}
-
-		// only apply the theme if it is different from the active one
-		if (sThemeName && this.sTheme != sThemeName) {
-			var sCurrentTheme = this.sTheme;
-			var html = document.documentElement;
-			this._updateThemeUrls(sThemeName, /* bSuppressFOUC */ true);
-			this.sTheme = sThemeName;
+		// Configuration needs to be updated synchronously but only
+		// applyTheme in case theme changed
+		// Check is duplicated in applyTheme in ThemeManager
+		// be aware to keep both in sync
+		if ((sThemeName && Configuration.getTheme() != sThemeName)) {
 			Configuration.setTheme(sThemeName);
-
-			// modify the <html> tag's CSS class with the theme name
-			html.classList.remove("sapUiTheme-" + sCurrentTheme);
-			html.classList.add("sapUiTheme-" + sThemeName);
-
-			// notify the listeners
-			if ( this.oThemeCheck ) {
-				this.oThemeCheck.fireThemeChangedEvent(false);
-			}
-		}
-	};
-
-	// this function is also used by "sap.ui.core.ThemeCheck" to load a fallback theme for a single library
-	Core.prototype._updateThemeUrl = function(oLink, sThemeName, bSuppressFOUC) {
-		var sLibName,
-		    iQueryIndex = oLink.href.search(/[?#]/),
-		    sLibFileName,
-		    sQuery,
-		    sStandardLibFilePrefix = "library",
-		    sRTL = Configuration.getRTL() ? "-RTL" : "",
-		    sHref,
-		    pos;
-
-		// derive lib name from id via regex
-		var mLinkId = /^sap-ui-theme(?:skeleton)?-(.*)$/i.exec(oLink.id);
-		if (Array.isArray(mLinkId)) {
-			sLibName = mLinkId[1];
-		} else {
-			// fallback to legacy logic
-			sLibName = oLink.id.slice(13); // length of "sap-ui-theme-"
-		}
-
-		if (iQueryIndex > -1) {
-			// Split href on query and/or fragment to check for the standard lib file prefix
-			sLibFileName = oLink.href.substring(0, iQueryIndex);
-			sQuery = oLink.href.substring(iQueryIndex);
-		} else {
-			sLibFileName = oLink.href;
-			sQuery = "";
-		}
-
-		// Get basename of stylesheet (e.g. "library.css")
-		sLibFileName = sLibFileName.substring(sLibFileName.lastIndexOf("/") + 1);
-
-		// handle 'variants'
-		if ((pos = sLibName.indexOf("-[")) > 0) { // assumes that "-[" does not occur as part of a library name
-			sStandardLibFilePrefix += sLibName.slice(pos + 2, -1); // 2=length of "-]"
-			sLibName = sLibName.slice(0, pos);
-		}
-
-		// try to distinguish "our" library css from custom css included with the ':' notation in includeLibraryTheme
-		if ( sLibFileName === (sStandardLibFilePrefix + ".css") || sLibFileName === (sStandardLibFilePrefix + "-RTL.css") ) {
-			sLibFileName = sStandardLibFilePrefix + sRTL + ".css";
-		}
-
-		sHref = this._getThemePath(sLibName, sThemeName) + sLibFileName + sQuery;
-		if ( sHref != oLink.href ) {
-			// sap/ui/dom/includeStylesheet has a special FOUC handling
-			// which is activated once the attribute data-sap-ui-foucmarker is
-			// present on the link to be replaced (usage of the Promise
-			// API is not sufficient as it will change the sync behavior)
-			if (bSuppressFOUC) {
-				oLink.dataset.sapUiFoucmarker =  oLink.id;
-			}
-			// Replace the current <link> tag with a new one.
-			// Changing "oLink.href" would also trigger loading the new stylesheet but
-			// the load/error handlers would not get called which causes issues with the ThemeCheck
-			// as the "data-sap-ui-ready" attribute won't be set.
-			includeStylesheet(sHref, oLink.id);
-		}
-	};
-
-	// modify style sheet URLs to point to the given theme, using the current RTL mode
-	Core.prototype._updateThemeUrls = function(sThemeName, bSuppressFOUC) {
-		// select "our" stylesheets
-		var oQueryResult = document.querySelectorAll("link[id^=sap-ui-theme-],link[id^=sap-ui-themeskeleton-]");
-
-		Array.prototype.forEach.call(oQueryResult, function(oHTMLElement) {
-			this._updateThemeUrl(oHTMLElement, sThemeName, bSuppressFOUC);
-		}.bind(this));
-
-	};
-
-	/**
-	 * Makes sure to register the correct module path for the given library and theme
-	 * in case a themeRoot has been defined.
-	 *
-	 * @param {string} sLibName Library name (dot separated)
-	 * @param {string} sThemeName Theme name
-	 * @private
-	 */
-	Core.prototype._ensureThemeRoot = function(sLibName, sThemeName) {
-		if (this._mThemeRoots) {
-			var path =  this._mThemeRoots[sThemeName + " " + sLibName] || this._mThemeRoots[sThemeName];
-			// check whether for this combination (theme+lib) a URL is registered or for this theme a default location is registered
-			if (path) {
-				path = path + sLibName.replace(/\./g, "/") + "/themes/" + sThemeName + "/";
-				registerModulePath(sLibName + ".themes." + sThemeName, path);
-			}
+			this._getThemeManager().then(function(ThemeManager) {
+				ThemeManager.applyTheme(sThemeName, sThemeBaseUrl, /* bForce = */ true);
+			});
 		}
 	};
 
-	/**
-	 * Returns the URL of the folder in which the CSS file for the given theme and the given library is located.
-	 *
-	 * @param {string} sLibName Library name (dot separated)
-	 * @param {string} sThemeName Theme name
-	 * @returns {string} module path URL (ends with a slash)
-	 * @private
-	 */
-	Core.prototype._getThemePath = function(sLibName, sThemeName) {
-
-		// make sure to register correct theme module path in case themeRoots are defined
-		this._ensureThemeRoot(sLibName, sThemeName);
-
-		// use the library location as theme location
-		return getModulePath(sLibName + ".themes." + sThemeName, "/");
-	};
-
-
 	/**
 	 * Defines the root directory from below which UI5 should load the theme with the given name.
 	 * Optionally allows restricting the setting to parts of a theme covering specific control libraries.
@@ -1101,38 +970,9 @@ sap.ui.define([
 	 * @public
 	 */
 	Core.prototype.setThemeRoot = function(sThemeName, aLibraryNames, sThemeBaseUrl, bForceUpdate) {
-		assert(typeof sThemeName === "string", "sThemeName must be a string");
-		assert((Array.isArray(aLibraryNames) && typeof sThemeBaseUrl === "string") || (typeof aLibraryNames === "string" && sThemeBaseUrl === undefined), "either the second parameter must be a string (and the third is undefined), or it must be an array and the third parameter is a string");
-
-		if (!this._mThemeRoots) {
-			this._mThemeRoots = {};
-		}
-
-		// normalize parameters
-		if (typeof aLibraryNames === "string") {
-			bForceUpdate = sThemeBaseUrl;
-			sThemeBaseUrl = aLibraryNames;
-			aLibraryNames = undefined;
-		}
-		sThemeBaseUrl = sThemeBaseUrl + (sThemeBaseUrl.slice( -1) == "/" ? "" : "/");
-
-		if (aLibraryNames) {
-			// registration of URL for several libraries
-			for (var i = 0; i < aLibraryNames.length; i++) {
-				var lib = aLibraryNames[i];
-				this._mThemeRoots[sThemeName + " " + lib] = sThemeBaseUrl;
-			}
-
-		} else {
-			// registration of theme default base URL
-			this._mThemeRoots[sThemeName] = sThemeBaseUrl;
-		}
-
-		// Update theme urls when theme roots of currently loaded theme have changed
-		if (bForceUpdate && sThemeName === this.sTheme) {
-			this._updateThemeUrls(this.sTheme);
-		}
-
+		this._getThemeManager().then(function(ThemeManager) {
+			ThemeManager.setThemeRoot(sThemeName, aLibraryNames, sThemeBaseUrl, bForceUpdate);
+		});
 		return this;
 	};
 
@@ -1154,44 +994,34 @@ sap.ui.define([
 
 		Log.info("Initializing",null,METHOD);
 
-		this.oThemeCheck = new ThemeCheck(this);
-
-		Log.info("Initialized",null,METHOD);
 		Measurement.end("coreInit");
 
-		// start the plugins
-		Log.info("Starting Plugins",null,METHOD);
-		this.startPlugins();
-		Log.info("Plugins started",null,METHOD);
-
 		this._setBodyAccessibilityRole();
 
-		this.oThemeCheck.fireThemeChangedEvent(true);
+		var sWaitForTheme = Configuration.getValue('xx-waitForTheme');
 
-		var sWaitForTheme = Configuration.getValue("xx-waitForTheme");
-		if ( this.isThemeApplied() || !sWaitForTheme ) {
+		// If there is no waitForTheme or ThemeManager is already available and theme is loaded render directly sync
+		if (this.isThemeApplied() || !sWaitForTheme) {
 			this._executeInitialization();
 			Rendering.renderPendingUIUpdates("during Core init"); // directly render without setTimeout, so rendering is guaranteed to be finished when init() ends
-			Measurement.end("coreComplete");
-
-		} else if (sWaitForTheme === "rendering") {
-			Rendering.notifyInteractionStep();
-			this._executeInitialization();
-			Rendering.getLogger().debug("delay initial rendering until theme has been loaded");
-			_oEventProvider.attachEventOnce(Core.M_EVENTS.ThemeChanged, function() {
-				Rendering.renderPendingUIUpdates("after theme has been loaded", 0);
-			}, this);
-			Measurement.end("coreComplete");
-
-		} else if (sWaitForTheme === "init") {
-			Rendering.getLogger().debug("delay init event and initial rendering until theme has been loaded");
-			Rendering.notifyInteractionStep();
-			_oEventProvider.attachEventOnce(Core.M_EVENTS.ThemeChanged, function() {
+		} else {
+			if (sWaitForTheme === "rendering") {
+				Rendering.notifyInteractionStep();
 				this._executeInitialization();
-				Rendering.renderPendingUIUpdates("after theme has been loaded", 0);
-				Measurement.end("coreComplete");
-			}, this);
-
+				Rendering.getLogger().debug("delay initial rendering until theme has been loaded");
+				_oEventProvider.attachEventOnce(Core.M_EVENTS.ThemeChanged, function() {
+					Rendering.renderPendingUIUpdates("after theme has been loaded", 0);
+				}, this);
+			} else if (sWaitForTheme === "init") {
+				Rendering.getLogger().debug("delay init event and initial rendering until theme has been loaded");
+				Rendering.notifyInteractionStep();
+				_oEventProvider.attachEventOnce(Core.M_EVENTS.ThemeChanged, function() {
+					this._executeInitialization();
+					Rendering.renderPendingUIUpdates("after theme has been loaded", 0);
+				}, this);
+			}
+			// Require ThemeManager if not already done to ensure ThemeManager is available and ThemeChanged event will be fired
+			this._getThemeManager();
 		}
 	};
 
@@ -1320,10 +1150,19 @@ sap.ui.define([
 	};
 
 	Core.prototype._executeInitialization = function() {
+		var METHOD = "sap.ui.core.Core.init()"; // Because it's only used from init
 		if (this.bInitialized) {
 			return;
 		}
 		this.bInitialized = true;
+
+		Log.info("Initialized",null,METHOD);
+
+		// start the plugins
+		Log.info("Starting Plugins",null,METHOD);
+		this.startPlugins();
+		Log.info("Plugins started",null,METHOD);
+
 		this._executeOnInit();
 		this._setupRootComponent(); // @legacy-relevant: private API for 2 deprecated concepts "rootComponent" & "sap.ui.app.Application"
 		this._executeInitListeners();
@@ -1351,7 +1190,35 @@ sap.ui.define([
 	 * @public
 	 */
 	Core.prototype.isThemeApplied = function () {
-		return ThemeCheck.themeLoaded;
+		ThemeManager = ThemeManager || sap.ui.require("sap/ui/core/theming/ThemeManager");
+		return ThemeManager ? ThemeManager.themeLoaded : false;
+	};
+
+	Core.prototype._getThemeManager = function (bClear) {
+		ThemeManager = ThemeManager || sap.ui.require("sap/ui/core/theming/ThemeManager");
+		if (!this.pThemeManager) {
+			if (!ThemeManager) {
+				this.pThemeManager = new Promise(function (resolve, reject) {
+					sap.ui.require(["sap/ui/core/theming/ThemeManager"], function (ThemeManager) {
+						resolve(ThemeManager);
+					}, reject);
+				});
+			} else {
+				this.pThemeManager = Promise.resolve(ThemeManager);
+			}
+			this.pThemeManager = this.pThemeManager.then(function(ThemeManager) {
+				ThemeManager.attachEvent("ThemeChanged", function(oEvent) {
+					this.fireThemeChanged(oEvent.getParameters());
+				}.bind(this));
+				return ThemeManager;
+			}.bind(this));
+		}
+		// This is only used within initLibrary to reset flag themeLoaded synchronously in case
+		// a theme for a new library will be loaded
+		if (ThemeManager && bClear) {
+			ThemeManager.reset();
+		}
+		return this.pThemeManager;
 	};
 
 	/**
@@ -2355,25 +2222,14 @@ sap.ui.define([
 
 		// include the library theme, but only if it has not been suppressed in library metadata or by configuration
 		if ( !oLibInfo.noLibraryCSS) {
-
-			// ensure to register correct library theme module path even when "preloadLibCss" prevents
-			// including the library theme as controls might use it to calculate theme-specific URLs
-			this._ensureThemeRoot(sLibName, this.sTheme);
-
-			// also ensure correct theme root for the library's base theme which might be relevant in some cases
-			// (e.g. IconPool which includes font files from sap.ui.core base theme)
-			this._ensureThemeRoot(sLibName, "base");
-
-			if (!Configuration.getValue("preloadLibCss").includes(sLibName)) {
-				// check for configured query parameters and use them
-				var sQuery = this._getLibraryCssQueryParams(oLibInfo);
-
-				this.includeLibraryTheme(sLibName, undefined, sQuery);
-
-				if (this.oThemeCheck && this.isInitialized()) {
-					this.oThemeCheck.fireThemeChangedEvent(false);
-				}
-			}
+			var oLibThemingInfo = {
+				name: oLibInfo.name,
+				version: oLibInfo.version
+			};
+			aAllLibrariesRequiringCss.push(oLibThemingInfo);
+			this._getThemeManager(true).then(function(ThemeManager) {
+				ThemeManager._includeLibraryThemeAndEnsureThemeRoot(oLibThemingInfo);
+			});
 		}
 
 		// expose some legacy names
@@ -2385,14 +2241,6 @@ sap.ui.define([
 		return oLib;
 	};
 
-	// helper to add the FOUC marker to the CSS for the given id
-	function fnAddFoucmarker(sLinkId) {
-		var oLink = document.getElementById(sLinkId);
-		if (oLink) {
-			oLink.dataset.sapUiFoucmarker = sLinkId;
-		}
-	}
-
 	/**
 	 * Includes a library theme into the current page (if a variant is specified it
 	 * will include the variant library theme)
@@ -2402,87 +2250,15 @@ sap.ui.define([
 	 * @public
 	 */
 	Core.prototype.includeLibraryTheme = function(sLibName, sVariant, sQuery) {
-		assert(typeof sLibName === "string", "sLibName must be a string");
-		assert(sVariant === undefined || typeof sVariant === "string", "sVariant must be a string or undefined");
-
-		/*
-		 * by specifying a library name containing a colon (":") you can specify
-		 * the file name of the CSS file to include (ignoring RTL)
-		 */
-
-		// include the stylesheet for the library (except for "classic" and "legacy" lib)
-		if ((sLibName != "sap.ui.legacy") && (sLibName != "sap.ui.classic")) {
-
-			// no variant?
-			if (!sVariant) {
-				sVariant = "";
-			}
-
-			// determine CSS Variables / RTL
-			var sCssVars = (/^(true|x)$/i.test(Configuration.getValue("xx-cssVariables")) ? "_skeleton" : "");
-			var sRtl = (Configuration.getRTL() ? "-RTL" : "");
-
-			// create the library file name
-			var sLibFileName,
-				sLibId = sLibName + (sVariant.length > 0 ? "-[" + sVariant + "]" : sVariant);
-			if (sLibName && sLibName.indexOf(":") == -1) {
-				sLibFileName = "library" + sVariant + sCssVars + sRtl;
-			} else {
-				sLibFileName = sLibName.substring(sLibName.indexOf(":") + 1) + sVariant;
-				sLibName = sLibName.substring(0, sLibName.indexOf(":"));
-			}
-
-			// use the special FOUC handling for initially existing stylesheets
-			// to ensure that they are not just replaced when using the
-			// includeStyleSheet API and to be removed later
-			var sLinkId = "sap-ui-theme-" + sLibId;
-			fnAddFoucmarker(sLinkId);
-
-			// include the css variables
-			var cssPathAndName;
-			if (/^(true|x|additional)$/i.test(Configuration.getValue("xx-cssVariables"))) {
-				cssPathAndName = this._getThemePath(sLibName, this.sTheme) + "css_variables.css" + (sQuery ? sQuery : "");
-				Log.info("Including " + cssPathAndName + " -  sap.ui.core.Core.includeLibraryTheme()");
-				includeStylesheet(cssPathAndName, sLinkId);
-				// include the skeleton css next to the css variables
-				sLinkId = "sap-ui-themeskeleton-" + sLibId;
-				fnAddFoucmarker(sLinkId);
-			}
-
-			// log and include
-			cssPathAndName = this._getThemePath(sLibName, this.sTheme) + sLibFileName + ".css" + (sQuery ? sQuery : "");
-			Log.info("Including " + cssPathAndName + " -  sap.ui.core.Core.includeLibraryTheme()");
-			includeStylesheet(cssPathAndName, sLinkId);
-
-			// if parameters have been used, update them with the new style sheet
-			var Parameters = sap.ui.require("sap/ui/core/theming/Parameters");
-			if (Parameters) {
-				Parameters._addLibraryTheme(sLibId);
-			}
-		}
-
-	};
-
-	/**
-	 * Returns a string containing query parameters for theme specific files.
-	 *
-	 * Used in Core#initLibrary and ThemeCheck#checkStyle.
-	 *
-	 * @param {object} oLibInfo Library info object (containing a "version" property)
-	 * @returns {string|undefined} query parameters or undefined if "versionedLibCss" config is "false"
-	 * @private
-	 */
-	Core.prototype._getLibraryCssQueryParams = function(oLibInfo) {
-		var sQuery;
-		if (Configuration.getValue("versionedLibCss") && oLibInfo) {
-			sQuery = "?version=" + oLibInfo.version;
-
-			// distribution version may not be available (will be loaded in Core constructor syncpoint2)
-			if (Global.versioninfo) {
-				sQuery += "&sap-ui-dist-version=" + Global.versioninfo.version;
-			}
-		}
-		return sQuery;
+		var oLibInfo = this.getLoadedLibraries()[sLibName];
+		aAllLibrariesRequiringCss.push({
+			name: sLibName,
+			version: oLibInfo && oLibInfo.version,
+			variant: sVariant
+		});
+		this._getThemeManager().then(function(ThemeManager) {
+			ThemeManager.includeLibraryTheme(sLibName, sVariant, sQuery);
+		});
 	};
 
 	/**
@@ -2506,6 +2282,63 @@ sap.ui.define([
 		return Object.assign({}, this.mLibraries);
 	};
 
+	/**
+	 * Returns an array containing all libraries which require loading of CSS
+	 *
+	 * @returns {Array} Array containing all libraries which require loading of CSS
+	 * @private
+	 * @ui5-restricted sap.ui.core.theming.Parameters
+	 */
+	Core.prototype.getAllLibrariesRequiringCss = function() {
+		return aAllLibrariesRequiringCss.slice();
+	};
+
+	/**
+	 *
+	 * @param {any} vInfo bundle information. Can be:
+	 * <ul>
+	 *     <li>false - library has no resource bundle</li>
+	 *     <li>true|null|undefined - use default settings: bundle is 'messageBundle.properties',
+	 *       fallback and supported locales are not defined (defaulted by ResourceBundle)</li>
+	 *     <li>typeof string - string is the url of the bundle,
+	 *       fallback and supported locales are not defined (defaulted by ResourceBundle)</li>
+	 *     <li>typeof object - object can contain bundleUrl, supportedLocales, fallbackLocale</li>
+	 * </ul>
+	 * @returns {Object|undefined} either normalized bundle information or undefined;
+	 *                             The normalized bundle information is either the object defined in the library manifest.json,
+	 *                             or an object with a 'bundleUrl' property holding the default bundle url.
+	 *                             If undefined is returned, the library does not no have resource bundle (vInfo == false).
+	 */
+	function normalizeBundleInfo(vInfo) {
+		if ( vInfo == null || vInfo === true ) {
+			return {
+				bundleUrl: "messagebundle.properties"
+			};
+		}
+		if ( typeof vInfo === "string" ) {
+			return {
+				bundleUrl: vInfo
+			};
+		}
+		if ( typeof vInfo === "object" ) {
+			return deepExtend({}, vInfo);
+		}
+		// return undefined
+	}
+
+	function getLibraryI18n(sLibrary) {
+		var vI18n;
+		var oManifest = getManifest(sLibrary);
+
+		if (oManifest && Version(oManifest._version).compareTo("1.9.0") >= 0) {
+			vI18n = oManifest["sap.ui5"] && oManifest["sap.ui5"].library && oManifest["sap.ui5"].library.i18n;
+		} // else vI18n = undefined
+
+		vI18n = normalizeBundleInfo(vI18n);
+
+		return vI18n;
+	}
+
 	/**
 	 * Retrieves a resource bundle for the given library and locale.
 	 *
@@ -2550,10 +2383,10 @@ sap.ui.define([
 	 * @public
 	 */
 	Core.prototype.getLibraryResourceBundle = function(sLibraryName, sLocale, bAsync) {
-		var oManifest,
-			sKey,
+		var sKey,
 			vResult,
-			vI18n;
+			vI18n,
+			bLibraryManifestIsAvailable;
 
 		if (typeof sLibraryName === "boolean") {
 			bAsync = sLibraryName;
@@ -2566,36 +2399,6 @@ sap.ui.define([
 			sLocale = undefined;
 		}
 
-		/**
-		 *
-		 * @param {Object} vInfo bundle information. Can be:
-		 * <ul>
-		 *     <li>false - library has no resource bundle</li>
-		 *     <li>true|null|undefined - use default settings: bundle is 'messageBundle.properties',
-		 *       fallback and supported locales are not defined (defaulted by ResourceBundle)</li>
-		 *     <li>typeof string - string is the url of the bundle,
-		 *       fallback and supported locales are not defined (defaulted by ResourceBundle)</li>
-		 *     <li>typeof object - object can contain bundleUrl, supportedLocales, fallbackLocale</li>
-		 * </ul>
-		 * @returns {Object} bundle information
-		 */
-		function normalizeBundleInfo(vInfo) {
-			if ( vInfo == null || vInfo === true ) {
-				return {
-					bundleUrl: "messagebundle.properties"
-				};
-			}
-			if ( typeof vInfo === "string" ) {
-				return {
-					bundleUrl: vInfo
-				};
-			}
-			if ( typeof vInfo === "object" ) {
-				return vInfo;
-			}
-			// return undefined
-		}
-
 		assert((sLibraryName === undefined && sLocale === undefined) || typeof sLibraryName === "string", "sLibraryName must be a string or there is no argument given at all");
 		assert(sLocale === undefined || typeof sLocale === "string", "sLocale must be a string or omitted");
 
@@ -2603,21 +2406,39 @@ sap.ui.define([
 		sLocale = sLocale || this.getConfiguration().getLanguage();
 		sKey = sLibraryName + "/" + sLocale;
 
+		// A library ResourceBundle can be requested before its owning library is preloaded.
+		// In this case we do not have the library's manifest yet and the default bundle (messagebundle.properties) is requested.
+		// We still cache this default bundle for as long as the library remains "not-preloaded".
+		// When the library is preloaded later on, a new ResourceBundle needs to be requested, since we need to take the
+		// "sap.ui5/library/i18n" section of the library's manifest into account.
+		bLibraryManifestIsAvailable = mLibraryManifests.has(sLibraryName);
+		var sNotLoadedCacheKey = sKey + "/manifest-not-available";
+
+		// If the library was loaded in the meantime (or the first time around), we can delete the old ResourceBundle
+		if (bLibraryManifestIsAvailable) {
+			delete this.mResourceBundles[sNotLoadedCacheKey];
+		} else {
+			// otherwise we use the temporary cache-key
+			sKey = sNotLoadedCacheKey;
+		}
+
 		vResult = this.mResourceBundles[sKey];
 		if (!vResult || (!bAsync && vResult instanceof Promise)) {
-			oManifest = getManifest(sLibraryName);
-			if ( oManifest && Version(oManifest._version).compareTo("1.9.0") >= 0 ) {
-				vI18n = oManifest["sap.ui5"] && oManifest["sap.ui5"].library && oManifest["sap.ui5"].library.i18n;
-			} // else vI18n = undefined
-			vI18n = normalizeBundleInfo(vI18n);
+			vI18n = getLibraryI18n(sLibraryName);
 
 			if (vI18n) {
+				var sBundleUrl = getModulePath(sLibraryName + "/", vI18n.bundleUrl);
+
+				// add known library name to cache to avoid later guessing
+				mGuessedLibraries[sBundleUrl] = sLibraryName;
+
 				vResult = ResourceBundle.create({
-					url : getModulePath(sLibraryName + "/", vI18n.bundleUrl),
+					bundleUrl: sBundleUrl,
 					supportedLocales: vI18n.supportedLocales,
 					fallbackLocale: vI18n.fallbackLocale,
-					locale : sLocale,
-					async: bAsync
+					locale: sLocale,
+					async: bAsync,
+					activeTerminologies: this.getConfiguration().getActiveTerminologies()
 				});
 
 				if (vResult instanceof Promise) {
@@ -2649,6 +2470,56 @@ sap.ui.define([
 		}
 	}
 
+	/**
+	 * Implementation of the ResourceBundle._enrichBundleConfig hook.
+	 * Guesses if the given bundleUrl is pointing to a library's ResourceBundle and adapts the given bundle definition accordingly
+	 * based on the infered library's manifest.
+	 *
+	 * @param {module:sap/base/i18n/ResourceBundle.Configuration} mParams Map containing the arguments of the sap.base.i18n.ResourceBundle.create call
+	 * @returns {module:sap/base/i18n/ResourceBundle.Configuration} mParams The enriched config object
+	 * @private
+	 */
+	ResourceBundle._enrichBundleConfig = function (mParams) {
+		if (!mParams.terminologies || !mParams.enhanceWith) {
+
+			var sLibraryName;
+			if (mGuessedLibraries.hasOwnProperty(mParams.url)) {
+				sLibraryName = mGuessedLibraries[mParams.url];
+			} else {
+				sLibraryName = getLibraryNameForBundle(mParams.url);
+			}
+
+			if (sLibraryName) {
+				// look up i18n information in library manifest
+				// (can be undefined if the lib defines "sap.ui5/library/i18n" with <false>)
+				var vI18n = getLibraryI18n(sLibraryName);
+
+				// enrich i18n information
+				if (vI18n) {
+					// resolve bundleUrls relative to library path
+					var sLibraryPath = sLibraryName.replace(/\./g, "/");
+					sLibraryPath = sLibraryPath.endsWith("/") ? sLibraryPath : sLibraryPath + "/"; // add trailing slash if missing
+					sLibraryPath = sap.ui.require.toUrl(sLibraryPath);
+
+					_UrlResolver._processResourceConfiguration(vI18n, {
+						alreadyResolvedOnRoot: true,
+						relativeTo: sLibraryPath
+					});
+
+					// basic i18n information
+					mParams.fallbackLocale = mParams.fallbackLocale || vI18n.fallbackLocale;
+					mParams.supportedLocales = mParams.supportedLocales || vI18n.supportedLocales;
+
+					// text verticalization information
+					mParams.terminologies = mParams.terminologies || vI18n.terminologies;
+					mParams.enhanceWith = mParams.enhanceWith || vI18n.enhanceWith;
+					mParams.activeTerminologies = mParams.activeTerminologies || Configuration.getActiveTerminologies();
+				}
+			}
+		}
+		return mParams;
+	};
+
 	/**
 	 * Implicitly creates a new <code>UIArea</code> (or reuses an exiting one) for the given DOM reference and
 	 * adds the given control reference to the UIAreas content (existing content will be removed).
@@ -2680,7 +2551,7 @@ sap.ui.define([
 	 * @public
 	 * @param {string|Element} o DOM element or ID of the UIArea
 	 * @return {sap.ui.core.UIArea|null|undefined} UIArea with the given ID or DOM element or <code>null</code> or <code>undefined</code>.
-	 * @deprecated As of version 1.107, use {@link sap.ui.core.UIArea.registry#get UIArea.registry#get} instead!
+	 * @deprecated As of version 1.107, use {@link sap.ui.core.UIArea.registry#get UIArea.registry#get} instead, but note that <code>UIArea.registry.get</code> only accepts the ID of the UIArea as argument.
 	 */
 	Core.prototype.getUIArea = function(o) {
 		assert(typeof o === "string" || typeof o === "object", "o must be a string or object");
@@ -2742,7 +2613,9 @@ sap.ui.define([
 	 * @public
 	 */
 	Core.prototype.notifyContentDensityChanged = function() {
-		this.fireThemeChanged();
+		this._getThemeManager().then(function (ThemeManager) {
+			ThemeManager.notifyContentDensityChanged();
+		});
 	};
 
 	/**
@@ -2807,28 +2680,7 @@ sap.ui.define([
 	 * @param {string} [oParameters.theme] Theme name (default is <code>sap.ui.getCore().getConfiguration().getTheme()</code>)
 	 */
 	Core.prototype.fireThemeChanged = function(oParameters) {
-		// special hook for resetting theming parameters before the controls get
-		// notified (lightweight coupling to static Parameters module)
-		var ThemeParameters = sap.ui.require("sap/ui/core/theming/Parameters");
-		if (ThemeParameters) {
-			ThemeParameters.reset(/* bOnlyWhenNecessary= */ true);
-		}
-
-		oParameters = oParameters || {};
-		// set the current theme name as default if omitted
-		if (!oParameters.theme) {
-			oParameters.theme = this.getConfiguration().getTheme();
-		}
-
-		// notify all elements/controls via a pseudo browser event
 		var sEventId = Core.M_EVENTS.ThemeChanged;
-		var oEvent = jQuery.Event(sEventId);
-		oEvent.theme = oParameters.theme;
-		Element.registry.forEach(function(oElement) {
-			oElement._handleEvent(oEvent);
-		});
-
-		ActivityDetection.refresh();
 
 		// notify the listeners via a control event
 		_oEventProvider.fireEvent(sEventId, oParameters);
@@ -2939,7 +2791,6 @@ sap.ui.define([
 			}
 		});
 
-
 		/*
 		 * Notify all UIAreas, Components, Elements to first update their models (phase 1)
 		 * and then to update their bindings and corresponding data types (phase 2)
@@ -2964,7 +2815,10 @@ sap.ui.define([
 			// update the dir attribute of the document
 			document.documentElement.setAttribute("dir", mChanges.rtl ? "rtl" : "ltr");
 			// modify style sheet URLs
-			this._updateThemeUrls(this.sTheme);
+			this._getThemeManager().then(function (ThemeManager) {
+				ThemeManager._updateThemeUrls(Configuration.getTheme());
+			});
+
 			// invalidate all UIAreas
 			UIArea.registry.forEach(function(oUIArea) {
 				oUIArea.invalidate();
@@ -3987,6 +3841,50 @@ sap.ui.define([
 		BaseObject.prototype.destroy.call(this);
 	};
 
+	/**
+	 * Tries to derive a library name from a bundle URL by guessing the resource name first,
+	 * then trying to match with the (known) loaded libraries.
+	 *
+	 * @param {string} sBundleUrl The bundleURL from which the library name needs to be derived.
+	 * @returns {string|undefined} Returns the corresponding library name if found or 'undefined'.
+	 */
+	function getLibraryNameForBundle(sBundleUrl) {
+		if (sBundleUrl) {
+			// [1] Guess ResourceName
+			var sBundleName = sap.ui.loader._.guessResourceName(sBundleUrl);
+			if (sBundleName) {
+
+				// [2] Guess library name
+				for (var sLibrary in mLoadedLibraries) {
+					var sLibraryName = sLibrary.replace(/\./g, "/");
+					if (sLibraryName !== "" && sBundleName.startsWith(sLibraryName + "/")) {
+						var sBundlePath = sBundleName.replace(sLibraryName + "/", "");
+
+						// [3] Retrieve i18n from manifest for looking up the base bundle
+						//     (can be undefined if the lib defines "sap.ui5/library/i18n" with <false>)
+						var vI18n = getLibraryI18n(sLibraryName);
+
+						if (vI18n) {
+							// Resolve bundle paths relative to library before comparing
+							var sManifestBaseBundlePath = getModulePath(sLibraryName, "/" + vI18n.bundleUrl);
+								sBundlePath = getModulePath(sLibraryName, "/" + sBundlePath);
+
+							// the input bundle-path and the derived library bundle-path must match,
+							// otherwise we would enhance the wrong bundle with terminologies etc.
+							if (sBundlePath === sManifestBaseBundlePath) {
+								// [4.1] Cache matching result
+								mGuessedLibraries[sBundleUrl] = sLibrary;
+								return sLibrary;
+							}
+							// [4.2] Cache none-matching result
+							mGuessedLibraries[sBundleUrl] = false;
+						}
+					}
+				}
+			}
+		}
+	}
+
 	/**
 	 * @name sap.ui.core.CorePlugin
 	 * @interface Contract for plugins that want to extend the core runtime