@openui5/sap.ui.core 1.138.0 → 1.139.1

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

@@ -16,8 +16,8 @@ sap.ui.define([
 	'sap/base/util/extend',
 	'sap/base/util/deepExtend',
 	'sap/base/util/merge',
-	'sap/ui/base/_runWithOwner',
 	'sap/ui/base/ManagedObject',
+	'sap/ui/base/OwnStatics',
 	'sap/ui/core/Lib',
 	'sap/ui/core/ResizeHandler',
 	'sap/ui/thirdparty/URI',
@@ -46,8 +46,8 @@ sap.ui.define([
 	extend,
 	deepExtend,
 	merge,
-	_runWithOwner,
 	ManagedObject,
+	OwnStatics,
 	Library,
 	ResizeHandler,
 	URI,
@@ -70,6 +70,8 @@ sap.ui.define([
 
 	/* global Promise */
 
+	const { runWithOwner, getCurrentOwnerId } = OwnStatics.get(ManagedObject);
+
 	var ServiceStartupOptions = {
 		lazy: "lazy",
 		eager: "eager",
@@ -290,7 +292,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -835,7 +837,7 @@ sap.ui.define([
 			throw new Error("Execute 'runAsOwner' on an inactive owner component is not supported. Component: '" +
 				this.getMetadata().getName() + "' with id '" + this.getId() + "'.");
 		}
-		return _runWithOwner(fn, this.getId());
+		return runWithOwner(fn, this.getId());
 	};
 
 	// ---- ----
@@ -2211,10 +2213,10 @@ sap.ui.define([
 					model: oModel,
 					modelId: sModelName
 				};
-				const oOwnerComponent = Component.getComponentById(_runWithOwner.getCurrentOwnerId());
+				const oOwnerComponent = Component.getComponentById(getCurrentOwnerId());
 				if (oOwnerComponent) {
 					oInfo.owner = {
-						id: _runWithOwner.getCurrentOwnerId(),
+						id: getCurrentOwnerId(),
 						config: oOwnerComponent._componentConfig
 					};
 				}
@@ -2619,7 +2621,7 @@ sap.ui.define([
 	 * Part of the old sap.ui.component implementation than can be re-used by the new factory
 	 */
 	function componentFactory(vConfig, bLegacy) {
-		var oOwnerComponent = Component.getComponentById(_runWithOwner.getCurrentOwnerId());
+		var oOwnerComponent = Component.getComponentById(getCurrentOwnerId());
 
 		if (Array.isArray(vConfig.activeTerminologies) && vConfig.activeTerminologies.length &&
 			Array.isArray(Localization.getActiveTerminologies()) && Localization.getActiveTerminologies().length) {
@@ -2731,7 +2733,7 @@ sap.ui.define([
 		if ( vConfig.async ) {
 			// async: instantiate component after Promise has been fulfilled with component
 			//        constructor and delegate the current owner id for the instance creation
-			var sCurrentOwnerId = _runWithOwner.getCurrentOwnerId();
+			var sCurrentOwnerId = getCurrentOwnerId();
 			return vClassOrPromise.then(function(oClass) {
 				// [Compatibility]: We sequentialize the dependency loading for the inheritance chain of the component.
 				// This keeps the order of the dependency execution stable (e.g. thirdparty script includes).
@@ -2788,7 +2790,7 @@ sap.ui.define([
 					// load all classes in parallel
 					await Promise.all([...aModuleLoadingPromises, pModelClassLoading]);
 
-					return _runWithOwner(function() {
+					return runWithOwner(function() {
 						return createInstance(oClass);
 					}, sCurrentOwnerId);
 				});

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * See also {@link module:sap/ui/core/ComponentSupport}.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer
@@ -526,8 +526,18 @@ sap.ui.define([
 	 */
 	ComponentContainer.prototype.propagateProperties = function (vName) {
 		var oComponent = this.getComponentInstance();
-		if (oComponent && this.getPropagateModel()) {
-			this._propagateProperties(vName, oComponent);
+		if (oComponent) {
+			if (this.getPropagateModel()) {
+				this._propagateProperties(vName, oComponent);
+			} else if (oComponent.getParent() == null) {
+				const { aPropagationListeners } = this._getPropertiesToPropagate();
+				const oProperties = {
+					oModels: {},
+					oBindingContexts: {},
+					aPropagationListeners
+				};
+				this._propagateProperties(false, oComponent, oProperties, false, vName, true);
+			}
 		}
 		Control.prototype.propagateProperties.apply(this, arguments);
 	};

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @since 1.9.2
 	 * @alias sap.ui.core.ComponentMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @public
 	 * @since 1.58.0
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

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

@@ -41,7 +41,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oVersion = new Version("1.138.0");
+	var oVersion = new Version("1.139.1");
 	var oFormatSettings;
 
 	// Lazy dependency to core

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

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @alias sap.ui.core.Control
 	 */
 	var Control = Element.extend("sap.ui.core.Control", /** @lends sap.ui.core.Control.prototype */ {

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

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.ui.core, sap.ui.test
 	 */
-	const sVersion = "1.138.0";
+	const sVersion = "1.139.1";
 
 	/**
 	 * The buildinfo.
@@ -443,7 +443,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * in the documentation.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.CustomData

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class Static class for enabling declarative UI support.
 	 *
 	 * @author Peter Muessig, Tino Butz
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @since 1.7.0
 	 * @public
 	 * @alias sap.ui.core.DeclarativeSupport

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

@@ -142,7 +142,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @public
 	 * @alias sap.ui.core.Element
 	 */
@@ -639,8 +639,13 @@ sap.ui.define([
 				oParent = oParent?.getParent();
 				oParentDomRef = oParent?.getDomRef?.();
 			} else {
-				// If the lost focus element is outside the parent, look for the parent's first focusable element
-				oFocusTarget = oParentDomRef && jQuery(oParentDomRef).firstFocusableDomRef();
+				// If the lost focus element is outside the parent, look for the parent's first focusable element (including the parent itself)
+				if (jQuery(oParentDomRef).is(":sapFocusable")) {
+					// If the parent is focusable, we can focus it
+					oFocusTarget = oParentDomRef;
+				} else {
+					oFocusTarget = oParentDomRef && jQuery(oParentDomRef).firstFocusableDomRef();
+				}
 				break;
 			}
 		} while ((!oRes || oRes.startOver) && oDomRef);
@@ -1383,7 +1388,8 @@ sap.ui.define([
 			// should not fire 'FocusFail' even when the oFocusDomRef isn't
 			// focusable because not all controls defines the 'getFocusDomRef'
 			// method properly
-			if (oDomRef && !oDomRef.contains(document.activeElement) ) {
+			if ((document.activeElement?.closest(".sapUiSkipFocusFail"))
+					|| (oDomRef && !oDomRef.contains(document.activeElement))) {
 				Element.fireFocusFail.call(this, FocusMode.DEFAULT);
 			}
 		}

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @since 0.8.6
 	 * @alias sap.ui.core.ElementMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -43,7 +43,7 @@ sap.ui.define(["./FocusMode"], function(FocusMode) {
 	 *
 	 * @param {boolean} [bDefault=true] Value that should be used as default value for the enhancement of the control.
 	 * @param {boolean} [bLegacy=false] Whether the introduced property should use the old name <code>Enabled</code>.
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @public
 	 * @class
 	 * @alias sap.ui.core.EnabledPropagator

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @public
 	 * @since 1.8.0
 	 * @alias sap.ui.core.EventBus

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

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	'../base/_runWithOwner',
 	'../base/ManagedObject',
+	'../base/OwnStatics',
 	'./Element',
 	'./DeclarativeSupport',
 	'./XMLTemplateProcessor',
@@ -19,8 +19,8 @@ sap.ui.define([
 	'sap/ui/core/mvc/XMLProcessingMode'
 ],
 function(
-	_runWithOwner,
 	ManagedObject,
+	OwnStatics,
 	Element,
 	DeclarativeSupport,
 	XMLTemplateProcessor,
@@ -38,6 +38,8 @@ function(
 	var mRegistry = {}, // the Fragment registry
 	mTypes = {}; // the Fragment types registry, holding their implementations
 
+	const { getCurrentOwnerId, runWithPreprocessors } = OwnStatics.get(ManagedObject);
+
 	/**
 	 * @classdesc Fragments support the definition of light-weight stand-alone UI control trees.
 	 * This class acts as factory which returns the UI control tree defined inside the Fragments. When used within declarative Views,
@@ -101,7 +103,7 @@ function(
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @public
 	 * @alias sap.ui.core.Fragment
 	 */
@@ -219,7 +221,7 @@ function(
 		// remember the name of this Fragment
 		this._sFragmentName = mSettings.fragmentName;
 
-		// if the containing view (or fragment) has a scoped runWithOnwer function we need to propagate this to the nested Fragment (only for async case)
+		// if the containing view (or fragment) has a scoped runWithOwner function we need to propagate this to the nested Fragment (only for async case)
 		this.fnScopedRunWithOwner = mSettings.containingView && mSettings.containingView.fnScopedRunWithOwner;
 
 		if (!this.fnScopedRunWithOwner && this._sOwnerId) {
@@ -595,7 +597,7 @@ function(
 		mParameters.fragmentName = mParameters.fragmentName || mParameters.name;
 		mParameters.fragmentContent = mParameters.fragmentContent || mParameters.definition;
 		mParameters.oController = mParameters.controller;
-		mParameters.sOwnerId = _runWithOwner.getCurrentOwnerId();
+		mParameters.sOwnerId = getCurrentOwnerId();
 		delete mParameters.name;
 		delete mParameters.definition;
 		delete mParameters.controller;
@@ -871,7 +873,7 @@ function(
 			// similar to the XMLView we need to have a scoped runWithPreprocessors function
 			var oParseConfig = {
 				fnRunWithPreprocessor: function(fn) {
-					return ManagedObject.runWithPreprocessors(fn, {
+					return runWithPreprocessors(fn, {
 						settings: fnSettingsPreprocessor
 					});
 				}
@@ -959,7 +961,7 @@ function(
 			this._oContainingView = mSettings.containingView || this;
 
 			// unset any preprocessors (e.g. from an enclosing JSON view)
-			return ManagedObject.runWithPreprocessors(function() {
+			return runWithPreprocessors(function() {
 				var vContent;
 				if (this.fnScopedRunWithOwner) {
 					this.fnScopedRunWithOwner(function () {
@@ -1097,7 +1099,7 @@ function(
 				}
 
 				// unset any preprocessors (e.g. from an enclosing HTML view)
-				return ManagedObject.runWithPreprocessors(function() {
+				return runWithPreprocessors(function() {
 					if (this.fnScopedRunWithOwner) {
 						this.fnScopedRunWithOwner(function () {
 							DeclarativeSupport.compile(this._oTemplate, this);

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/util/Storage"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

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

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @since 1.11.1

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

@@ -16,7 +16,7 @@ sap.ui.define(['./library', 'sap/ui/core/Lib'],
 		 * Helper functionality for indication color support.
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.139.1
 		 * @public
 		 * @namespace sap.ui.core.IndicationColorSupport
 		 * @since 1.66

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

@@ -23,7 +23,7 @@ sap.ui.define(['../base/Object', './EventBus', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.139.1
 		 * @public
 		 * @since 1.11.0
 		 * @alias sap.ui.core.IntervalTrigger

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

@@ -35,7 +35,7 @@ sap.ui.define(["./library", "./Core", "sap/ui/base/ManagedObject", "sap/base/Log
 		 * @extends sap.ui.base.ManagedObject
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.139.1
 		 * @hideconstructor
 		 * @public
 		 * @since 1.78

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

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 * Provides the default renderer for the controls that have set their <code>visible</code> property to <code>false</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @alias module:sap/ui/core/InvisibleRenderer
 	 * @since 1.66.0
 	 * @protected

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @since 1.27.0

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

@@ -24,7 +24,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.Item

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

@@ -192,7 +192,7 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 	 * @see sap.ui.core.LabelEnablement#enrich
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @protected
 	 * @alias sap.ui.core.LabelEnablement
 	 * @namespace

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

@@ -23,7 +23,7 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData

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

@@ -65,17 +65,31 @@ sap.ui.define([
 	/**
 	 * 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.
+	 * Set of bundleUrls from which a library name has been derived, see #_getByBundleUrl
 	 *
 	 * Example:
 	 *   mGuessedLibraries = {
-	 *     "my/simple/library/i18n/i18n.properties": "my.simple.library",
-	 *     "no/library/i18n/i18n.properties": false
+	 *     "my/simple/library/i18n/i18n.properties": "my.simple.library"
 	 *   }
 	 */
 	var mGuessedLibraries = {};
 
+	/**
+	 * Negative result bookkeeping for the guessing of library names.
+	 *
+	 * Set of bundleUrls from which a library name could not be derived, see #_getByBundleUrl
+	 *
+	 * Note: This cache is maintained separately from the positive cache to ease clearing it
+	 * when a new library instance is created (see #_get). This prevents that a negative result
+	 * is cached for a library that has been created/loaded in the meantime.
+	 *
+	 * Example:
+	 *   mGuessedLibrariesNegative = {
+	 *     "no/library/i18n/i18n.properties": undefined
+	 *   }
+	 */
+	var mGuessedLibrariesNegative = {};
+
 	/**
 	 * Set of libraries that provide a bundle info file (library-preload-lazy.js).
 	 *
@@ -303,6 +317,7 @@ sap.ui.define([
 			}
 
 			this.name = mSettings.name;
+			this.namespace = mSettings.name.replace(/\./g, '/');
 
 			var aPropsWithDefaults = ["dependencies", "types", "interfaces", "controls", "elements"];
 
@@ -520,8 +535,7 @@ sap.ui.define([
 			mOptions = mOptions || {};
 
 			var sFileType = this._getFileType(mOptions.json),
-				sLibPackage = this.name.replace(/\./g, '/'),
-				bEntryModuleExists = !!sap.ui.loader._.getModuleState(sLibPackage + '/library.js'),
+				bEntryModuleExists = !!sap.ui.loader._.getModuleState(this.namespace + '/library.js'),
 				bHttp2 = Library.isDepCacheEnabled();
 
 			if (sFileType === 'none') {
@@ -571,15 +585,15 @@ sap.ui.define([
 				/** @deprecated */
 				if (mOptions.sync) {
 					try {
-						sap.ui.requireSync(sLibPackage + '/library-preload-lazy'); // legacy-relevant: Sync path
+						sap.ui.requireSync(this.namespace + '/library-preload-lazy'); // legacy-relevant: Sync path
 					} catch (e) {
-						Log.error("failed to load '" + sLibPackage + "/library-preload-lazy.js" + "' synchronously (" + (e && e.message || e) + ")");
+						Log.error("failed to load '" + this.namespace + "/library-preload-lazy.js" + "' synchronously (" + (e && e.message || e) + ")");
 					}
 					return this;
 				}
 
 				return sap.ui.loader._.loadJSResourceAsync(
-					sLibPackage + '/library-preload-lazy.js', /* ignoreErrors = */ true);
+					this.namespace + '/library-preload-lazy.js', /* ignoreErrors = */ true);
 			}
 
 			// otherwise mark as pending
@@ -663,7 +677,7 @@ sap.ui.define([
 			mOptions = mOptions || {};
 
 			var that = this;
-			var sPreloadModule = this.name.replace(/\./g, '/')
+			var sPreloadModule = this.namespace
 				+ (mOptions.http2 ? '/library-h2-preload' : '/library-preload')
 				+ (mOptions.sync ? '' : '.js');
 			var pResult;
@@ -765,7 +779,7 @@ sap.ui.define([
 		 */
 		getManifest: function(bSync) {
 			if (!this.oManifest) {
-				var manifestModule = this.name.replace(/\./g, '/') + '/manifest.json';
+				var manifestModule = this.namespace + '/manifest.json';
 
 				if (sap.ui.loader._.getModuleState(manifestModule) || (bSync && !this._manifestFailed)) {
 					try {
@@ -1077,6 +1091,7 @@ sap.ui.define([
 				name: sName,
 				_key: oConstructorKey
 			});
+			mGuessedLibrariesNegative = {}; // Reset negative cache to enforce re-evaluation
 		}
 
 		return oLibrary;
@@ -1095,6 +1110,9 @@ sap.ui.define([
 			if (mGuessedLibraries[sBundleUrl]) {
 				return mGuessedLibraries[sBundleUrl];
 			}
+			if (sBundleUrl in mGuessedLibrariesNegative) {
+				return undefined;
+			}
 
 			// [1] Guess ResourceName
 			var sBundleName = sap.ui.loader._.guessResourceName(sBundleUrl);
@@ -1102,14 +1120,13 @@ sap.ui.define([
 
 				// [2] Guess library name
 				for (var sLibrary in mLibraries) {
-					if (!mLibraries[sLibrary].isSettingsEnhanced()) {
+					var oLib = mLibraries[sLibrary];
+					if (!oLib.isSettingsEnhanced()) {
 						// ignore libraries that haven't been initialized
 						continue;
 					}
-					var sLibraryName = sLibrary.replace(/\./g, "/");
-					var oLib = mLibraries[sLibrary];
-					if (sLibraryName !== "" && sBundleName.startsWith(sLibraryName + "/")) {
-						var sBundlePath = sBundleName.replace(sLibraryName + "/", "");
+					if (oLib.namespace !== "" && sBundleName.startsWith(oLib.namespace + "/")) {
+						var sBundlePath = sBundleName.replace(oLib.namespace + "/", "");
 
 						// [3] Retrieve i18n from manifest for looking up the base bundle
 						//     (can be undefined if the lib defines "sap.ui5/library/i18n" with <false>)
@@ -1117,8 +1134,8 @@ sap.ui.define([
 
 						if (vI18n) {
 							// Resolve bundle paths relative to library before comparing
-							var sManifestBaseBundlePath = getModulePath(sLibraryName, "/" + vI18n.bundleUrl);
-								sBundlePath = getModulePath(sLibraryName, "/" + sBundlePath);
+							var sManifestBaseBundlePath = getModulePath(oLib.namespace, "/" + vI18n.bundleUrl);
+								sBundlePath = getModulePath(oLib.namespace, "/" + sBundlePath);
 
 							// the input bundle-path and the derived library bundle-path must match,
 							// otherwise we would enhance the wrong bundle with terminologies etc.
@@ -1128,7 +1145,7 @@ sap.ui.define([
 								return oLib;
 							}
 							// [4.2] Cache none-matching result
-							mGuessedLibraries[sBundleUrl] = false;
+							mGuessedLibrariesNegative[sBundleUrl] = undefined;
 						}
 					}
 				}
@@ -1455,7 +1472,7 @@ sap.ui.define([
 					sTypeName.replace(/\./g, "/") + ".js",
 					() => (
 						`Importing the pseudo module '${sTypeName.replace(/\./g, "/")}' is deprecated.`
-						+ ` To access the type '${sTypeName}', please import '${oLib.name.replace(/\./g, "/")}/library'`
+						+ ` To access the type '${sTypeName}', please import '${oLib.namespace}/library'`
 						+ createHintForType(sTypeName)
 						+ ` For more information, see documentation under 'Best Practices for Loading Modules'.`
 					)
@@ -1511,7 +1528,7 @@ sap.ui.define([
 
 	function getLibraryModuleNames(aLibs) {
 		return aLibs.map(function(oLib) {
-			return oLib.name.replace(/\./g, "/") + "/library";
+			return oLib.namespace + "/library";
 		});
 	}
 
@@ -1884,9 +1901,7 @@ sap.ui.define([
 				// enrich i18n information
 				if (vI18n) {
 					// resolve bundleUrls relative to library path
-					var sLibraryPath = oLib.name.replace(/\./g, "/");
-					sLibraryPath = sLibraryPath.endsWith("/") ? sLibraryPath : sLibraryPath + "/"; // add trailing slash if missing
-					sLibraryPath = sap.ui.require.toUrl(sLibraryPath);
+					var sLibraryPath = sap.ui.require.toUrl(oLib.namespace + "/");
 
 					_UrlResolver._processResourceConfiguration(vI18n, {
 						alreadyResolvedOnRoot: true,

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

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 *
 	 * @public
 	 * @since 1.11.0

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

@@ -20,7 +20,7 @@ sap.ui.define(['sap/base/assert', 'sap/ui/base/Object', "sap/base/i18n/Localizat
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.1
 	 * @public
 	 * @alias sap.ui.core.Locale
 	 */