@openui5/sap.ui.core 1.141.2 → 1.143.0

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

@@ -6,14 +6,15 @@
 
 // Provides base class sap.ui.core.Component for all components
 sap.ui.define([
+	"sap/base/assert",
 	"sap/base/i18n/Localization",
 	'sap/ui/base/Object',
-	'sap/ui/thirdparty/URI',
 	'sap/ui/VersionInfo',
 	'sap/base/util/Version',
 	'sap/base/future',
 	'sap/base/Log',
 	'sap/ui/dom/includeStylesheet',
+	'sap/ui/util/_URL',
 	'sap/base/i18n/ResourceBundle',
 	'sap/base/util/uid',
 	'sap/base/util/merge',
@@ -24,14 +25,15 @@ sap.ui.define([
 	'sap/ui/core/Lib',
 	'./_UrlResolver'
 ], function(
+	assert,
 	Localization,
 	BaseObject,
-	URI,
 	VersionInfo,
 	Version,
 	future,
 	Log,
 	includeStylesheet,
+	_URL,
 	ResourceBundle,
 	uid,
 	merge,
@@ -165,7 +167,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */
@@ -201,13 +203,14 @@ sap.ui.define([
 			var sComponentName = this.getComponentName(),
 				sBaseUrl = mOptions && mOptions.baseUrl || sComponentName && sap.ui.require.toUrl(sComponentName.replace(/\./g, "/")) + "/";
 			if (sBaseUrl) {
-				this._oBaseUri = new URI(sBaseUrl).absoluteTo(new URI(document.baseURI).search(""));
+				this._oBaseUri = new _URL(sBaseUrl, document.baseURI);
 			}
 
 			// determine the base URL of the manifest or use the component base
 			// as by default the manifest is next to the component controller
 			if (mOptions && typeof mOptions.url === "string") {
-				this._oManifestBaseUri = new URI(mOptions.url).absoluteTo(new URI(document.baseURI).search("")).search("");
+				this._oManifestBaseUri = new _URL(mOptions.url, document.baseURI);
+				this._oManifestBaseUri.search = "";
 			} else {
 				this._oManifestBaseUri = this._oBaseUri;
 			}
@@ -281,18 +284,15 @@ sap.ui.define([
 		_loadI18n: function(bAsync) {
 			// extract the i18n URI from the manifest
 			var oManifest = this._oRawManifest,
-				oI18nURI,
 				// a bundle url given in the "sap.app.i18n" section is by default always resolved relative to the manifest
 				// when using the object syntax for the "sap.app.i18n" section a "bundleRelativeTo" property can be given to change the default
 				sBaseBundleUrlRelativeTo = "manifest",
 				vI18n = (oManifest["sap.app"] && oManifest["sap.app"]["i18n"]) || "i18n/i18n.properties";
 
 			if (typeof vI18n === "string") {
-				oI18nURI = new URI(vI18n);
-
 				// load the ResourceBundle relative to the manifest
 				return ResourceBundle.create({
-					url: this.resolveUri(oI18nURI, sBaseBundleUrlRelativeTo),
+					url: this.resolveUri(vI18n, sBaseBundleUrlRelativeTo),
 					async: bAsync
 				});
 
@@ -646,8 +646,8 @@ sap.ui.define([
 			if (mResourceRoots) {
 				for (var sResourceRoot in mResourceRoots) {
 					var sResourceRootPath = mResourceRoots[sResourceRoot];
-					var oResourceRootURI = new URI(sResourceRootPath);
-					if (oResourceRootURI.is("absolute") || (oResourceRootURI.path() && oResourceRootURI.path()[0] === "/")) {
+					var oResourceRootURI = new _URL(sResourceRootPath);
+					if (oResourceRootURI.isAbsolute() || oResourceRootURI.plainUrl?.[0] === "/") {
 						future.errorThrows(`${this.getComponentName()}: Resource root for "${sResourceRoot}" is absolute and therefore won't be registered! "${sResourceRootPath}"`);
 						continue;
 					}
@@ -686,9 +686,10 @@ sap.ui.define([
 		 * @since 1.60.1
 		 */
 		resolveUri: function(sUri, sRelativeTo) {
+			assert(sUri !== undefined && typeof sUri === "string", "'sUri' must be of type 'string'");
 			var oRelativeToBaseUri = sRelativeTo === "manifest" ? this._oManifestBaseUri : this._oBaseUri;
 			var oResultUri = _UrlResolver._resolveUri(sUri, oRelativeToBaseUri);
-			return oResultUri && oResultUri.toString();
+			return oResultUri && oResultUri.sourceUrl;
 		},
 
 		/**
@@ -829,20 +830,20 @@ sap.ui.define([
 		// or needs to be loaded from a specific client.
 		// If the language or the client is already provided it won't be overridden
 		// as this is expected to be only done by intension.
-		var oManifestUrl = new URI(sManifestUrl);
-		if (!oManifestUrl.hasQuery("sap-language")) {
-			var sValue = Localization.getSAPLogonLanguage();
+		var oManifestUrl = new _URL(sManifestUrl);
+		if (!oManifestUrl.searchParams.has("sap-language")) {
+			const sValue = Localization.getSAPLogonLanguage();
 			if (sValue) {
-				oManifestUrl.addQuery("sap-language", sValue);
+				oManifestUrl.searchParams.set("sap-language", sValue);
 			}
 		}
-		if (!oManifestUrl.hasQuery("sap-client")) {
-			var sValue = BaseConfig.get({name: "sapClient", type:BaseConfig.Type.String, external: true});
+		if (!oManifestUrl.searchParams.has("sap-client")) {
+			const sValue = BaseConfig.get({name: "sapClient", type:BaseConfig.Type.String, external: true});
 			if (sValue) {
-				oManifestUrl.addQuery("sap-client", sValue);
+				oManifestUrl.searchParams.set("sap-client", sValue);
 			}
 		}
-		sManifestUrl = oManifestUrl.toString();
+		sManifestUrl = oManifestUrl.sourceUrl;
 
 		Log.info("Loading manifest via URL: " + sManifestUrl);
 		if (!bAsync) {

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

@@ -26,7 +26,7 @@ sap.ui.define(['./Element', './library', "./Theming", "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message

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

@@ -635,7 +635,7 @@ sap.ui.define([
 	 *
 	 * If the Popup's OpenState is different from "CLOSED" (i.e. if the Popup is already open, opening or closing), the call is ignored.
 	 *
-	 * @param {int} [iDuration=jQuery.fx.speed.fast] animation duration in milliseconds. For <code>iDuration</code> == 0 the opening happens synchronously without animation.
+	 * @param {int} [iDuration=200] animation duration in milliseconds. For <code>iDuration</code> == 0 the opening happens synchronously without animation.
 	 * @param {sap.ui.core.Popup.Dock} [my=sap.ui.core.Popup.Dock.CenterCenter] the popup content's reference position for docking
 	 * @param {sap.ui.core.Popup.Dock} [at=sap.ui.core.Popup.Dock.CenterCenter] the "of" element's reference point for docking to
 	 * @param {string | sap.ui.core.Element | Element | jQuery | jQuery.Event} [of=document] specifies the reference element to which the given content should dock to
@@ -1013,8 +1013,15 @@ sap.ui.define([
 		if (type == "focus") {
 			var oDomRef = this._$().get(0);
 			if (oDomRef) {
-				const oTarget = oEvent.target.shadowRoot ? oEvent.target.shadowRoot.activeElement : oEvent.target;
-				bContains = this._contains(oTarget);
+				bContains = this._contains(oEvent.target);
+
+				let oTarget = oEvent.target;
+
+				// also check the shadow dom active element in case the event target has a shadow dom attached
+				while (!bContains && oTarget.shadowRoot && oTarget.shadowRoot.activeElement) {
+					bContains = this._contains(oTarget.shadowRoot.activeElement);
+					oTarget = oTarget.shadowRoot.activeElement;
+				}
 
 				Log.debug("focus event on " + oEvent.target.id + ", contains: " + bContains);
 
@@ -1111,7 +1118,7 @@ sap.ui.define([
 	 * If the Popup is in the process of being opened and closed with an animation duration, the animation will be chained, but this functionality is dangerous,
 	 * may lead to inconsistent behavior and is thus not recommended and may even be removed.
 	 *
-	 * @param {int} [iDuration=jQuery.fx.speed.fast] Animation duration in milliseconds. For <code>iDuration</code> == 0 the closing happens synchronously without animation.
+	 * @param {int} [iDuration=200] Animation duration in milliseconds. For <code>iDuration</code> == 0 the closing happens synchronously without animation.
 	 * @public
 	 */
 	Popup.prototype.close = function(iDuration) {
@@ -2021,8 +2028,8 @@ sap.ui.define([
 	 * Null values and values < 0 are ignored.
 	 * A duration of 0 means no animation.
 	 *
-	 * @param {int} [iOpenDuration=jQuery.fx.speed.fast] in milliseconds
-	 * @param {int} [iCloseDuration=jQuery.fx.speed.fast] in milliseconds
+	 * @param {int} [iOpenDuration=200] in milliseconds
+	 * @param {int} [iCloseDuration=200] in milliseconds
 	 * @return {this} <code>this</code> to allow method chaining
 	 * @public
 	 */

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

@@ -46,6 +46,8 @@ sap.ui.define([
 	"use strict";
 	/*global SVGElement*/
 
+	const mOwnerInfo = new Map();
+
 	var Element;
 
 	var aCommonMethods = ["renderControl", "cleanupControlWithoutRendering", "accessibilityState", "icon"];
@@ -241,7 +243,7 @@ sap.ui.define([
 	 *
 	 * @extends Object
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @alias sap.ui.core.RenderManager
 	 * @hideconstructor
 	 * @public
@@ -1139,6 +1141,13 @@ sap.ui.define([
 				return this;
 			}
 
+			if (oControl._sOwnerId && !mOwnerInfo.get(oControl._sOwnerId)) {
+				mOwnerInfo.set(oControl._sOwnerId, Interaction.createOwnerComponentInfo(oControl)?.id);
+			}
+			const sAppComponentId = mOwnerInfo.get(oControl._sOwnerId);
+
+			const fnDone = Interaction.notifyControlRendering?.(sAppComponentId);
+
 			var oDomRef, oRenderer;
 			var bTriggerBeforeRendering = true;
 
@@ -1230,6 +1239,8 @@ sap.ui.define([
 				}
 			}
 
+			fnDone?.();
+
 			return this;
 		};
 
@@ -1568,7 +1579,7 @@ sap.ui.define([
 					}
 
 				}
-			}, fnDone, oTargetDomNode);
+			}, () => {fnDone(); mOwnerInfo.clear();}, oTargetDomNode);
 		};
 
 		/**

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @classdesc Base Class for a Renderer.
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @namespace
 	 * @public
 	 * @alias sap.ui.core.Renderer

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @alias sap.ui.core.ResizeHandler
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @public
 	 */
 

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * The ScrollBar control can be used for virtual scrolling of a certain area.
 	 * This means: to simulate a very large scrollable area when technically the area is small and the control takes care of displaying the respective part only. E.g. a Table control can take care of only rendering the currently visible rows and use this ScrollBar control to make the user think he actually scrolls through a long list.
 	 * @extends sap.ui.core.Control
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @deprecated As of version 1.56, the concept has been discarded.

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

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

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

@@ -25,7 +25,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @since 1.16.0

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class
 	 * Abstract class that can be extended in order to implement any extended tooltip. For example, RichTooltip Control is based on it. It provides the opening/closing behavior and the main "text" property.
 	 * @extends sap.ui.core.Control
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.TooltipBase

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

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @param {object} [oRootNode] reference to the DOM element that should be 'hosting' the UI Area.
 	 * @public
 	 * @alias sap.ui.core.UIArea

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

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @alias sap.ui.core.UIComponent
 	 * @since 1.9.2
 	 */

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

@@ -17,7 +17,7 @@ sap.ui.define(['./ComponentMetadata', 'sap/ui/core/mvc/ViewType'],
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @since 1.15.1
 	 * @alias sap.ui.core.UIComponentMetadata
 	 * @extends sap.ui.core.ComponentMetadata

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

@@ -16,7 +16,7 @@ sap.ui.define(['./Element', './library', './Lib', "sap/base/assert"],
 		 * Helper functionality for value state support.
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 * @public
 		 * @namespace sap.ui.core.ValueStateSupport
 		 */

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

@@ -20,7 +20,7 @@ sap.ui.define(['./LayoutData', './library'],
 	 * @class
 	 * Allows to add multiple LayoutData to one control in case that an easy switch of layouts (e.g. in a Form) is needed.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @since 1.9.2

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

@@ -148,7 +148,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @param {object} oClassInfo static info to construct the metadata from
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/thirdparty/URI"
-], function(URI) {
+	"sap/ui/util/_URL"
+], function(_URL) {
 	"use strict";
 
 	/**
@@ -35,8 +35,8 @@ sap.ui.define([
 	 * @param {object} mBundleConfig Map with bundle config settings
 	 * @param {object} mSettings Map with settings for processing the resource configuration
 	 * @param {boolean} [mSettings.alreadyResolvedOnRoot=false] Whether the bundleUrl was already resolved (usually by the sap.ui.core.Component)
-	 * @param {URI} mSettings.baseURI The base URI of the Component (usually provided by the sap.ui.core.Component or sap.ui.core.Manifest)
-	 * @param {URI} mSettings.manifestBaseURI The base URI of the manifest (usually provided by the sap.ui.core.Component or sap.ui.core.Manifest)
+	 * @param {module:sap/ui/util/_URL} mSettings.baseURI The base URI of the Component (usually provided by the sap.ui.core.Component or sap.ui.core.Manifest)
+	 * @param {module:sap/ui/util/_URL} mSettings.manifestBaseURI The base URI of the manifest (usually provided by the sap.ui.core.Component or sap.ui.core.Manifest)
 	 * @param {string} [mSettings.relativeTo="component"] Either "component", "manifest" or a "library path" to which the bundleUrl should be resolved
 	 * @private
 	 * @ui5-restricted sap.ui.core
@@ -61,7 +61,7 @@ sap.ui.define([
 			if (sKey === "bundleUrl" && !bAlreadyResolvedOnRoot) {
 				var sBundleUrl = mBundleConfig[sKey];
 				var oResolvedUri = _UrlResolver._resolveUri(sBundleUrl, vRelativeToURI);
-				mBundleConfig[sKey] = oResolvedUri && oResolvedUri.toString();
+				mBundleConfig[sKey] = oResolvedUri && oResolvedUri.sourceUrl;
 			}
 			if (sKey === "terminologies") {
 				var mTerminologies = mBundleConfig[sKey];
@@ -87,17 +87,14 @@ sap.ui.define([
 	};
 
 	/**
-	 * Makes sure that we can safely deal with URI instances.
+	 * Makes sure that we can safely deal with URL instances.
 	 * See return value.
 	 *
-	 * @param {URI|string|undefined} v either a URI instance, a string value or undefined
-	 * @returns {URI} a URI instance created from the given argument, or the given argument if it is already a URI instance
+	 * @param {module:sap/ui/util/_URL|string|undefined} v either a URL instance, a string value or undefined
+	 * @returns {module:sap/ui/util/_URL} a URL instance created from the given argument, or the given argument if it is already a URL instance
 	 */
-	function normalizeToUri(v) {
-		if (v && v instanceof URI) {
-			return v;
-		}
-		return new URI(v);
+	function normalizeToUrl(v) {
+		return (v instanceof _URL) ? v : new _URL(v);
 	}
 
 	/**
@@ -106,34 +103,39 @@ sap.ui.define([
 	 * or relative to URL path when passing an URL string as seceond
 	 * parameter.
 	 *
-	 * @param {URI|string} vUri URI to resolve
-	 * @param {URI|string} [vRelativeToURI] defines to which base URI the given URI will be resolved to.
+	 * @param {module:sap/ui/util/_URL|string} vUrl URI to resolve
+	 * @param {module:sap/ui/util/_URL|string} [vRelativeToURL] defines to which base URI the given URI will be resolved to.
 	 *                                      Either a string or a URI instance.
 	 *                                      Can be a component base URI, a manifest base URI or a library path.
-	 * @return {URI} resolved URI
+	 * @return {module:sap/ui/util/_URL} resolved URI
 	 * @private
 	 */
-	_UrlResolver._resolveUri = function (vUri, vRelativeToURI) {
-		return _UrlResolver._resolveUriRelativeTo(normalizeToUri(vUri), normalizeToUri(vRelativeToURI));
+	_UrlResolver._resolveUri = function (vUrl, vRelativeToURL) {
+		return _UrlResolver._resolveUriRelativeTo(normalizeToUrl(vUrl), normalizeToUrl(vRelativeToURL));
 	};
 
 	/**
-	 * Resolves the given URI relative to the given base URI.
+	 * Resolves the given URL relative to the given base URL.
 	 *
-	 * @param {URI} oUri URI to resolve
-	 * @param {URI} oBase Base URI
-	 * @return {URI} resolved URI
+	 * @param {module:sap/ui/util/_URL} oUrl URL to resolve
+	 * @param {module:sap/ui/util/_URL} oBase Base URL
+	 * @return {module:sap/ui/util/_URL} resolved URL
 	 * @static
 	 * @private
 	 */
-	_UrlResolver._resolveUriRelativeTo = function(oUri, oBase) {
-		if (oUri.is("absolute") || (oUri.path() && oUri.path()[0] === "/")) {
-			return oUri;
+	_UrlResolver._resolveUriRelativeTo = function(oUrl, oBase) {
+		if (oUrl.isAbsolute() || oUrl.plainUrl?.[0] === "/") {
+			return oUrl;
 		}
-		var oPageBase = new URI(document.baseURI).search("");
-		oBase = oBase.absoluteTo(oPageBase);
-		return oUri.absoluteTo(oBase).relativeTo(oPageBase);
+		const oPageBase = new _URL(document.baseURI);
+
+		// Step 1: Resolve oUrl absolute to oBase
+		const absoluteUrl = new _URL(oUrl.sourceUrl, oBase.href);
+
+		// Step 2: Resolve path relative to oPageBase
+		const relativePath = absoluteUrl.relativeTo(oPageBase);
+		return new _URL(relativePath);
 	};
 
 	return _UrlResolver;
-});
+});

package/src/sap/ui/core/date/UI5Date.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.111.0
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 */
 	function UI5Date(vDateParts, sTimezoneID) {
 		var oDateInstance = UI5Date._createDateInstance(vDateParts);

package/src/sap/ui/core/delegate/ItemNavigation.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @param {Element[]} aItemDomRefs Array of DOM references representing the items for the navigation
 	 * @param {boolean} [bNotInTabChain=false] Whether the selected element should be in the tab chain or not
 	 *
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @alias sap.ui.core.delegate.ItemNavigation
 	 * @public
 	 */

package/src/sap/ui/core/delegate/ScrollEnablement.js

@@ -61,7 +61,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 * @alias sap.ui.core.delegate.ScrollEnablement
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 * @author SAP SE
 		 */
 		var ScrollEnablement = BaseObject.extend("sap.ui.core.delegate.ScrollEnablement", /** @lends sap.ui.core.delegate.ScrollEnablement.prototype */ {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @since 1.52

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.141.2
+	 * @version 1.143.0
 	 *
 	 * @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.141.2
+	 * @version 1.143.0
 	 *
 	 * @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.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @since 1.56

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

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * Formatter related utility functions
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @namespace
 	 * @private
 	 */

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.141.2
+	 * @version 1.143.0
 	 * @namespace
 	 * @name module:sap/ui/core/format/TimezoneUtil
 	 * @private

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

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

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

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

package/src/sap/ui/core/interaction/KeyboardInteractionDisplay.js

@@ -277,7 +277,12 @@ sap.ui.define([
 			const sCacheKey = `${sLibrary}:${sLocale}`;
 
 			if (oInteractionXMLCache.has(sCacheKey)) {
-				return oInteractionXMLCache.get(sCacheKey);
+				const oCacheResult = oInteractionXMLCache.get(sCacheKey);
+				if (oCacheResult === null) {
+					Log.debug(`Skipping loading of previously failed interaction XML for library ${sLibrary}, locale ${sLocale}`);
+					continue;
+				}
+				return oCacheResult;
 			}
 
 			try {
@@ -298,6 +303,10 @@ sap.ui.define([
 					break;
 				}
 			} catch (error) {
+				// Cache the failed loading attempt if not already cached
+				if (!oInteractionXMLCache.has(sCacheKey)) {
+					oInteractionXMLCache.set(sCacheKey, null);
+				}
 				Log.error(`Error loading interaction XML for library ${sLibrary}:`, error);
 			}
 		}
@@ -521,7 +530,17 @@ sap.ui.define([
 			localizeKeys,
 			annotateAndTranslateKbdTags,
 			getInteractions,
-			getCommandInfosFor
+			getCommandInfosFor,
+			loadInteractionXMLFor,
+			hasCacheEntry: (sCacheKey) => {
+				return oInteractionXMLCache.has(sCacheKey);
+			},
+			getInteractionXMLFromCache: (sCacheKey) => {
+				return oInteractionXMLCache.get(sCacheKey);
+			},
+			clearCache: () => {
+				oInteractionXMLCache.clear();
+			}
 		}
 	};
 });