@openui5/sap.ui.core 1.143.1 → 1.144.0

package/src/sap/ui/core/support/controls/ObjectViewer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -154,7 +154,7 @@ function(ManagedObject, encodeXML) {
 		};
 		this.addWithParam = function(s, o) {
 			for (var n in o) {
-				var reg = new RegExp("\{" + n + "\}","g");
+				var reg = new RegExp("\\{" + n + "\\}","g");
 				s = s.replace(reg,o[n]);
 			}
 			that.add(s);

package/src/sap/ui/core/support/controls/TimelineOverview.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -52,6 +52,9 @@ sap.ui.define([
 				interactions = this.interactions;
 
 			if (!interactions || !interactions.length) {
+				rm.close("ol");
+				rm.close("div");
+
 				return;
 			}
 

package/src/sap/ui/core/support/controls/TreeViewer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -205,7 +205,7 @@ function(jQuery,
 		};
 		this.addWithParam = function(s, o) {
 			for (var n in o) {
-				var reg = new RegExp("\{" + n + "\}","g");
+				var reg = new RegExp("\\{" + n + "\\}","g");
 				s = s.replace(reg,o[n]);
 			}
 			that.add(s);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -276,7 +276,7 @@ sap.ui.define(['sap/ui/Device', "sap/ui/core/Element", 'sap/ui/core/ElementMetad
 			function findDeclaredClasses() {
 
 				var aClasses = [];
-				var aModules = LoaderExtensions.getAllRequiredModules();
+				var aModules = LoaderExtensions.getAllRequiredModules(/* omitDeprecated */ true);
 
 				for (var i = 0; i < aModules.length; i++) {
 					if (aClasses.indexOf(aModules[i]) > -1) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -59,7 +59,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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.ControlTree
 		 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -44,7 +44,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Interaction
 		 */
@@ -193,17 +193,18 @@ sap.ui.define([
 		}
 
 		function initInApps(oSupportStub) {
-			var _bFesrActive = BaseConfig.get({
+			const bFESRActive = BaseConfig.get({
 				name: "sapUiFesr",
-				type: BaseConfig.Type.Boolean,
+				type: BaseConfig.Type.String,
 				external: true,
 				freeze: true
-			});
+			}) != "false";
+
 			var _bODATA_Stats_On = Supportability.isStatisticsEnabled();
 
 			this._oStub.sendEvent(this.getId() + "SetQueryString", {
 				"queryString": {
-					bFesrActive: _bFesrActive,
+					bFesrActive: bFESRActive,
 					bODATA_Stats_On: _bODATA_Stats_On
 				}
 			});

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.LocalStorage
 		 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -56,7 +56,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Performance
 		 */
@@ -550,6 +550,9 @@ sap.ui.define([
 			//filtered and modified data
 			var data = _applyFilters(_rawdata, filterOptions);
 
+			barRm.openStart("ol").openEnd();
+			barInfoRm.openStart("ol").openEnd();
+
 			//no data bar
 			if (data.length === 0) {
 				barRm.openStart("li")

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Selector
 		 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.TechInfo
 		 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -21,7 +21,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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Trace
 		 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -36,7 +36,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.143.1
+		 * @version 1.144.0
 		 * @private
 		 * @deprecated As of version 1.118
 		 * @alias sap.ui.core.support.plugins.ViewInfo

package/src/sap/ui/core/support/techinfo/TechnicalInfo.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -180,7 +180,7 @@ sap.ui.define([
 
 		/**
 		 * Enables/Disables debug mode globally with a confirmation dialog
-		 * @param {sap.ui.base.event} oEvent The checkbox select event
+		 * @param {sap.ui.base.Event} oEvent The checkbox select event
 		 */
 		onDebugSources: function (oEvent) {
 			var bSelected = oEvent.getParameter("selected");
@@ -419,7 +419,7 @@ sap.ui.define([
 
 		/**
 		 * Writes the option for opening in new window to local storage
-		 * @param {sap.ui.base.event} oEvent The checkbox select event
+		 * @param {sap.ui.base.Event} oEvent The checkbox select event
 		 */
 		onChangeOpenInNewWindow: function (oEvent) {
 			var bSelected = oEvent.getParameter("selected");
@@ -637,10 +637,18 @@ sap.ui.define([
 			this._oDialog.setModel(oI18nModel, "i18n");
 			this._oDialog.setModel(this._createViewModel(), "view");
 
+			this._oDialog.attachAfterClose(this._onDialogAfterClose, this);
+
 			// set compact/cozy style class
 			this._oDialog.addStyleClass(this._getContentDensityClass());
 		},
 
+		_onDialogAfterClose: function () {
+			if (!this._bIsBeingClosed) {
+				this.close();
+			}
+		},
+
 		_loadVersionInfo: function() {
 			return VersionInfo.load().catch(function(err) {
 				Log.error("failed to load global version info", err);

package/src/sap/ui/core/support/techinfo/moduleTreeHelper.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/support/trace/E2eTraceLib.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/core/support/trace/EppLib.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/support/usage/EventBroadcaster.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(['sap/ui/thirdparty/jquery', 'sap/ui/base/Object', 'sap/base/assert'], function(jQuery, BaseObject, assert) {

package/src/sap/ui/core/themes/base/DragAndDrop.less

@@ -20,7 +20,6 @@
 .sapUiDnDIndicator {
 	position: absolute;
 	pointer-events: none;
-	z-index: 99;
 
 	&[data-drop-position='Between'] {
 		background: var(--sapContent_DragAndDropActiveColor);

package/src/sap/ui/core/themes/base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/themes/sap_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -141,9 +141,14 @@ sap.ui.define([
 		//  * no theme-root is given (themes from a different endpoint (i.e. theming-service) are excluded) and
 		//  * the given theme is a standard SAP theme ('sap_' prefix)
 		//  * not supported in this version
-		if (sThemeRoot == null && sTheme.startsWith("sap_") && aKnownThemes.indexOf(sTheme) == -1) {
-			// extract the theme variant if given: "_hcb", "_hcw", "_dark"
-			const sVariant = sTheme.match(rThemeVariantPattern)?.[0] || "";
+		if (sThemeRoot == null && (!sTheme || (sTheme.startsWith("sap_") && aKnownThemes.indexOf(sTheme) == -1))) {
+			let sVariant;
+			if (sTheme) {
+				// extract the theme variant if given: "_hcb", "_hcw", "_dark"
+				sVariant = sTheme.match(rThemeVariantPattern)?.[0] || "";
+			} else {
+				sVariant = bDarkMode ? "_dark" : "";
+			}
 
 			sNewTheme = `${DEFAULT_THEME}${sVariant}`;
 
@@ -168,7 +173,7 @@ sap.ui.define([
 	 * @param {string} sTheme Name of the theme to check
 	 * @returns {boolean} true if the theme is a standard theme, false otherwise
 	 * @private
-	 * @ui5-restricted sap.ui.core.Theming, sap.ui.core.theming.ThemeManager
+	 * @ui5-restricted sap/ui/core/Theming, sap.ui.core.theming.ThemeManager
 	 * @since 1.135
 	 */
 	ThemeHelper.isStandardTheme = function(sTheme) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -47,10 +47,10 @@ sap.ui.define([
 	let pAllCssRequests = Promise.resolve();
 	let _customCSSAdded = false;
 	let _themeCheckedForCustom = null;
-	let _sFallbackThemeFromMetadata = null;
-	let _sFallbackThemeFromThemeRoot = null;
+	let sFallbackTheme = null;
 	let sUi5Version;
 	let mAllDistLibraries;
+	const aFailedLibs = [];
 
 	function isVersionInfoNeeded() {
 		const theme = Theming.getTheme();
@@ -145,7 +145,8 @@ sap.ui.define([
 						 */
 						if (mAllDistLibraries && !mAllDistLibraries.has(this.libName) &&
 							!ThemeHelper.isStandardTheme(sTheme) && Theming.getThemeRoot(sTheme, this.libName)) {
-							sTheme = _sFallbackThemeFromMetadata || _sFallbackThemeFromThemeRoot;
+							sTheme = sFallbackTheme;	// We don't want to use the UI5 default theme yet,
+														// since there could be a better option after from the metadata of the first request
 							if (!sTheme) {
 								return undefined;
 							}
@@ -269,11 +270,6 @@ sap.ui.define([
 	 *                                 Use the old URL to prevent unnecessary requests.
 	 */
 	function updateThemeUrl({libInfo, theme, suppressFOUC, force}) {
-		if (suppressFOUC) {
-			pAllCssRequests = Promise.resolve();
-			ThemeManager.themeLoaded = false;
-			Log.debug(`Register theme change for library ${libInfo.id}`, undefined, MODULE_NAME);
-		}
 		if (!sUi5Version && isVersionInfoNeeded()) {
 			Log.error("UI5 theming lifecycle requires valid version information when a theming service is active. Please check why the version info could not be loaded in this system.", undefined, MODULE_NAME);
 		}
@@ -282,8 +278,12 @@ sap.ui.define([
 		const sOldUrlWoVersion = sOldUrl?.replace(/\?.*/, "");
 		const sUrl = libInfo.getUrl(theme).baseUrl;
 		if (!sUrl || sOldUrlWoVersion !== sUrl || force) {
+			if (suppressFOUC) {
+				pAllCssRequests = Promise.resolve();
+				ThemeManager.themeLoaded = false;
+				Log.debug(`Register theme change for library ${libInfo.id}`, undefined, MODULE_NAME);
+			}
 			libInfo.finishedLoading = false;
-			libInfo.failed = false;
 			if (suppressFOUC) {
 				// Only add stylesheet in case there is no existing stylesheet or the href is different
 				// use the special FOUC handling for initially existing stylesheets
@@ -368,7 +368,7 @@ sap.ui.define([
 				handleThemeFinished(libInfo.id);
 				pAllCssRequests = Promise.allSettled([...mAllLoadedLibraries.values()].map((libInfo) => libInfo.cssLoaded));
 				pAllCssRequests.finally(function() {
-					if (this === pAllCssRequests) {
+					if (this === pAllCssRequests && !applyFallbackTheme()) {
 						Log.debug("Theme change finished", undefined, MODULE_NAME);
 						// Even if suppressFOUC is not set, we must fire the event if themeLoaded was previously set to false,
 						// because this indicates that at least one theme change was caused by a theming-relevant trigger.
@@ -411,7 +411,6 @@ sap.ui.define([
 	 */
 	function handleThemeFinished(libId) {
 		const sThemeName = Theming.getTheme();
-		const oLibThemingInfo = mAllLoadedLibraries.get(libId);
 		ThemeHelper.reset();
 
 		if (!_customCSSAdded || _themeCheckedForCustom != sThemeName) {
@@ -437,38 +436,12 @@ sap.ui.define([
 		}
 
 		// Only retrieve the fallback theme once per ThemeManager cycle
-		if (!_sFallbackThemeFromThemeRoot) {
+		if (!sFallbackTheme) {
 			const sThemeRoot = Theming.getThemeRoot(sThemeName, libId);
 			if (sThemeRoot) {
 				const rBaseTheme = /~v=[^\/]+\(([a-zA-Z0-9_]+)\)/;
 				// base theme should be matched in the first capturing group
-				_sFallbackThemeFromThemeRoot = rBaseTheme.exec(sThemeRoot)?.[1];
-
-				// pass derived fallback theme through our default theme handling
-				// in case the fallback theme is not supported anymore, we fall up to the latest default theme
-				if (_sFallbackThemeFromThemeRoot) {
-					_sFallbackThemeFromThemeRoot = ThemeHelper.validateAndFallbackTheme(_sFallbackThemeFromThemeRoot);
-				}
-			}
-		}
-
-		const sFallbackTheme = _sFallbackThemeFromMetadata || _sFallbackThemeFromThemeRoot;
-		if (sFallbackTheme) {
-			for (const [sLibId, oLib] of mAllLoadedLibraries) {
-				if (oLib.failed) {
-					Log.warning(`Custom theme '${sThemeName}' could not be loaded for library '${sLibId}'. Falling back to its base theme '${sFallbackTheme}'.`, undefined, MODULE_NAME);
-
-					// Change the URL to load the fallback theme
-					updateThemeUrl({
-						libInfo: oLib,
-						theme: sFallbackTheme,
-						suppressFOUC: true
-					});
-
-					// remember the lib to prevent doing the fallback multiple times
-					// (if the fallback also can't be loaded)
-					oLibThemingInfo.themeFallback = true;
-				}
+				sFallbackTheme = rBaseTheme.exec(sThemeRoot)?.[1];
 			}
 		}
 	}
@@ -482,10 +455,10 @@ sap.ui.define([
 	 * @param {string} libId - The ID of the library whose CSS request has successfully finished.
 	 */
 	function handleThemeSucceeded(libId) {
-		if (!_sFallbackThemeFromMetadata) {
+		if (!sFallbackTheme) {
 			const oThemeMetaData = ThemeHelper.getMetadata(libId);
 			if (oThemeMetaData && oThemeMetaData.Extends && oThemeMetaData.Extends[0]) {
-				_sFallbackThemeFromMetadata = oThemeMetaData.Extends[0];
+				sFallbackTheme = oThemeMetaData.Extends[0];
 			}
 		}
 	}
@@ -508,11 +481,52 @@ sap.ui.define([
 			// E.g. in case an @import within the stylesheet fails, the error marker will
 			// also be set, but in this case no fallback should be done as there is a (broken) theme
 			if (oLibThemingInfo.cssLinkElement && !(oLibThemingInfo.cssLinkElement.sheet && hasSheetCssRules(oLibThemingInfo.cssLinkElement.sheet))) {
-				oLibThemingInfo.failed = true;
+				aFailedLibs.push(oLibThemingInfo);
 			}
 		}
 	}
 
+	/**
+	 * Applies the fallback theme for libraries whose CSS failed to load.
+	 *
+	 * This function processes all libraries in the failed library queue and attempts to load
+	 * their CSS resources using a fallback theme. The fallback theme is validated and may be
+	 * adjusted to the latest default theme if it is no longer supported.
+	 *
+	 * For each failed library, the function:
+	 * - Logs a warning about the failed custom theme
+	 * - Updates the theme URL to point to the fallback theme resources
+	 * - Marks the library with a fallback flag to prevent repeated fallback attempts
+	 *
+	 * @returns {boolean} Returns true if new CSS requests were triggered for one or more libraries,
+	 *                    false if no new CSS was requested (i.e., no libraries required fallback).
+	 */
+	function applyFallbackTheme() {
+		const pOldAllCssRequests = pAllCssRequests;
+		// pass derived fallback theme through our default theme handling
+		// in case the fallback theme is not supported anymore, we fall up to the latest default theme
+		sFallbackTheme = ThemeHelper.validateAndFallbackTheme(sFallbackTheme);
+
+		while (aFailedLibs.length) {
+			const oLib = aFailedLibs.shift();
+
+			Log.warning(`Custom theme '${Theming.getTheme()}' could not be loaded for library '${oLib.id}'. Falling back to its base theme '${sFallbackTheme}'.`, undefined, MODULE_NAME);
+
+			// Change the URL to load the fallback theme
+			updateThemeUrl({
+				libInfo: oLib,
+				theme: sFallbackTheme,
+				suppressFOUC: true
+			});
+
+			// remember the lib to prevent doing the fallback multiple times
+			// (if the fallback also can't be loaded)
+			oLib.themeFallback = true;
+		}
+		// Check whether fallback CSS requests have been triggered or not
+		return pOldAllCssRequests !== pAllCssRequests;
+	}
+
 	/**
 	 * checks if a particular class is available
 	 *
@@ -614,7 +628,7 @@ sap.ui.define([
 		for (const [, oLibInfo] of mAllLoadedLibraries) {
 			delete oLibInfo.themeFallback;
 		}
-		_sFallbackThemeFromMetadata = _sFallbackThemeFromThemeRoot = null;
+		sFallbackTheme = null;
 
 		Log.debug(`ThemeManager: Theme changed from ${oTheme.old} to ${sTheme}`, undefined, MODULE_NAME);
 		updateThemeUrls(sTheme, /* bSuppressFOUC */ true);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.143.1
+	 * @version 1.144.0
 	 *
 	 * @public
 	 * @since 1.15

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.143.1
+	 * @version 1.144.0
 	 *
 	 * @public
 	 * @since 1.15

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */