@openui5/sap.ui.core 1.132.1 → 1.133.0

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

@@ -5,8 +5,8 @@
  */
 
 // Provides class sap.ui.core.date.Buddhist
-sap.ui.define(['./UniversalDate', '../CalendarType', './_Calendars'],
-	function(UniversalDate, CalendarType, _Calendars) {
+sap.ui.define(['./UniversalDate','./_Calendars', 'sap/base/i18n/date/CalendarType'],
+	function(UniversalDate, _Calendars, CalendarType) {
 	"use strict";
 
 	/**

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

@@ -7,10 +7,10 @@
 // Provides type sap.ui.core.date.CalendarUtils.
 sap.ui.define([
 	"sap/base/i18n/Formatting",
+	"sap/base/i18n/date/CalendarWeekNumbering",
 	"sap/ui/core/Locale",
-	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/ui/core/LocaleData"
-], function(Formatting, Locale, CalendarWeekNumbering, LocaleData) {
+], function(Formatting, CalendarWeekNumbering, Locale, LocaleData) {
 	"use strict";
 
 	/**
@@ -34,7 +34,7 @@ sap.ui.define([
 		 *   which define the first calendar week</li>
 		 * </ul>
 		 *
-		 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+		 * @param {module:sap/base/i18n/date/CalendarWeekNumbering} [sCalendarWeekNumbering]
 		 *   The calendar week numbering; if omitted, the calendar week numbering of the configuration
 		 *   is used; see
 		 *   {@link module:sap/base/i18n/Formatting.getCalendarWeekNumbering Formatting.getCalendarWeekNumbering}.
@@ -46,7 +46,7 @@ sap.ui.define([
 		 *   Is only used when <code>sCalendarWeekNumbering</code> is set to <code>Default</code>.
 		 * @returns {{firstDayOfWeek: int, minimalDaysInFirstWeek: int}|undefined}
 		 *   The calendar week configuration, or <code>undefined<code> for an invalid value of
-		 *   <code>sap.ui.core.date.CalendarWeekNumbering</code>.
+		 *   <code>module:sap/base/i18n/date/CalendarWeekNumbering</code>.
 		 * @public
 		 * @since 1.108.0
 		 */

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

@@ -5,8 +5,8 @@
  */
 
 // Provides class sap.ui.core.date.Gregorian
-sap.ui.define(['./UniversalDate', '../CalendarType', './_Calendars'],
-	function(UniversalDate, CalendarType, _Calendars) {
+sap.ui.define(['./UniversalDate', './_Calendars', 'sap/base/i18n/date/CalendarType'],
+	function(UniversalDate, _Calendars, CalendarType) {
 	"use strict";
 
 

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

@@ -7,11 +7,11 @@
 // Provides class sap.ui.core.date.Islamic
 sap.ui.define([
 	'./UniversalDate',
-	'../CalendarType',
 	'sap/base/Log',
 	'sap/base/i18n/Formatting',
+	'sap/base/i18n/date/CalendarType',
 	'./_Calendars'
-], function(UniversalDate, CalendarType, Log, Formatting, _Calendars) {
+], function(UniversalDate, Log, Formatting, CalendarType, _Calendars) {
 	"use strict";
 
 

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

@@ -5,8 +5,8 @@
  */
 
 // Provides class sap.ui.core.date.Japanese
-sap.ui.define(['./UniversalDate', '../CalendarType', './_Calendars'],
-	function(UniversalDate, CalendarType, _Calendars) {
+sap.ui.define(['./UniversalDate', './_Calendars', 'sap/base/i18n/date/CalendarType'],
+	function(UniversalDate, _Calendars, CalendarType) {
 	"use strict";
 
 

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

@@ -5,8 +5,8 @@
  */
 
 // Provides class sap.ui.core.date.Persian
-sap.ui.define(['./UniversalDate', '../CalendarType', './_Calendars'],
-	function(UniversalDate, CalendarType, _Calendars) {
+sap.ui.define(['./UniversalDate', './_Calendars', 'sap/base/i18n/date/CalendarType'],
+	function(UniversalDate, _Calendars, CalendarType) {
 	"use strict";
 
 

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

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

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

@@ -7,14 +7,14 @@
 // Provides class sap.ui.core.date.UniversalDate
 sap.ui.define([
 	"sap/base/i18n/Formatting",
+	"sap/base/i18n/date/CalendarWeekNumbering",
 	'sap/ui/base/Object',
 	"sap/ui/core/Locale",
 	'sap/ui/core/LocaleData',
 	'./_Calendars',
 	'./CalendarUtils',
-	'./CalendarWeekNumbering',
 	'./UI5Date'
-], function(Formatting, BaseObject, Locale, LocaleData, _Calendars, CalendarUtils, CalendarWeekNumbering, UI5Date) {
+], function(Formatting, CalendarWeekNumbering, BaseObject, Locale, LocaleData, _Calendars, CalendarUtils, UI5Date) {
 	"use strict";
 
 	/**
@@ -784,7 +784,7 @@ sap.ui.define([
 	 * Retrieves the calendar week
 	 *
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -809,7 +809,7 @@ sap.ui.define([
 	 * @param {{week: int, year: int}} oWeek the calendar week, note: week index starts with <code>0</code>,
 	 *   <code>oWeek.year</code> is optional and defaults to {@link sap.ui.core.date.UniversalDate#getFullYear}
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -832,7 +832,7 @@ sap.ui.define([
 	 * Retrieves the UTC calendar week
 	 *
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -857,7 +857,7 @@ sap.ui.define([
 	 * @param {{week: int, year: int}} oWeek the calendar week, note: week index starts with <code>0</code>,
 	 *   <code>oWeek.year</code> is optional and defaults to {@link sap.ui.core.date.UniversalDate#getFullYear}
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used to get the calendar week calculation properties, defaults to the formatLocale
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -986,7 +986,7 @@ sap.ui.define([
 	 * @param {int} iDay the date, e.g. <code>3</code>
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
 	 *   e.g. <code>new Locale("de-DE")</code>
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -1041,7 +1041,7 @@ sap.ui.define([
 	 * @param {int} iWeek the calendar week index, e.g. <code>8</code>
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
 	 *   e.g. <code>new Locale("de-DE")</code>
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} [vCalendarWeekNumbering]
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   In case an object is provided, both properties <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code> must be set, otherwise an error is thrown.
@@ -1082,7 +1082,7 @@ sap.ui.define([
 	 * Determines if the split week algorithm should be applied (the first day of the first calendar
 	 * week of the year is January 1st).
 	 *
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and
 	 *   <code>minimalDaysInFirstWeek</code>
 	 * @param {sap.ui.core.Locale} oLocale the locale used for the week calculation
@@ -1100,7 +1100,7 @@ sap.ui.define([
 	/**
 	 * Checks the calendar week configuration
 	 *
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>
 	 * @throws {TypeError} If:
 	 * <ul>
@@ -1122,7 +1122,7 @@ sap.ui.define([
 	/**
 	 * Resolves the calendar week configuration
 	 *
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>
 	 * @param {sap.ui.core.Locale} [oLocale] locale to be used
 	 * @returns {{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} calendar week calculation configuration
@@ -1144,7 +1144,7 @@ sap.ui.define([
 	 * @param {int} iYear year, e.g. <code>2016</code>
 	 * @param {sap.ui.core.Locale} [oLocale] the locale used for the week calculation, if oWeekConfig is not provided (falls back to the formatLocale)
 	 *   e.g. <code>new Locale("de-DE")</code>
-	 * @param {sap.ui.core.date.CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
+	 * @param {module:sap/base/i18n/date/CalendarWeekNumbering|{firstDayOfWeek: int, minimalDaysInFirstWeek: int}} vCalendarWeekNumbering
 	 *   calendar week numbering or object with fields <code>firstDayOfWeek</code> and <code>minimalDaysInFirstWeek</code>,
 	 *   the default is derived from <code>oLocale</code> but this parameter has precedence over oLocale if both are provided.
 	 *   e.g. <code>{firstDayOfWeek: 1, minimalDaysInFirstWeek: 4}</code>

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.132.1
+	 * @version 1.133.0
 	 * @alias sap.ui.core.delegate.ItemNavigation
 	 * @public
 	 */

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

@@ -18,7 +18,8 @@ sap.ui.define([
 	'sap/ui/core/IntervalTrigger',
 	'sap/ui/core/ResizeHandler',
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/events/KeyCodes"
+	"sap/ui/events/KeyCodes",
+	'sap/ui/core/Element'
 ],
 	function(
 		Localization,
@@ -27,7 +28,8 @@ sap.ui.define([
 		IntervalTrigger,
 		ResizeHandler,
 		jQuery,
-		KeyCodes
+		KeyCodes,
+		Element
 	) {
 	"use strict";
 
@@ -59,7 +61,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 * @alias sap.ui.core.delegate.ScrollEnablement
-		 * @version 1.132.1
+		 * @version 1.133.0
 		 * @author SAP SE
 		 */
 		var ScrollEnablement = BaseObject.extend("sap.ui.core.delegate.ScrollEnablement", /** @lends sap.ui.core.delegate.ScrollEnablement.prototype */ {
@@ -438,8 +440,8 @@ sap.ui.define([
 
 			_customScrollTo : function(left, top, oEvent) {
 				var sNodeName = oEvent.target.nodeName;
-				// do not prevent events coming from input controls
-				if (sNodeName != "INPUT" && sNodeName != "TEXTAREA") {
+				// do not prevent events coming from input controls or sap.m.Select
+				if (sNodeName != "INPUT" && sNodeName != "TEXTAREA" && !Element.closestTo(oEvent.target)?.isA("sap.m.Select")) {
 					oEvent.preventDefault();
 					oEvent.setMarked();
 

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.132.1
+	 * @version 1.133.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.132.1
+	 * @version 1.133.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.132.1
+	 * @version 1.133.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.132.1
+	 * @version 1.133.0
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/fieldhelp/FieldHelp.js

@@ -107,12 +107,207 @@ sap.ui.define([
 		 */
 		#oUpdateHotspotsPromise = null;
 
+		/**
+		 * @typedef {Map<string,Map<string,string>>} sap.ui.core.fieldhelp.Text2IdByType
+		 *
+		 * Map of a text property path to a map of the qualified name of the type to the ID property path for the text
+		 * property which is used with the following semantics:
+		 * If the given text property path is used relative to a path P of the given type, the path
+		 * for field help lookup is the ID property path appended to P.
+		 * Sample mappings:
+		 * "ProductName" => { "com.sap....PackagedDangerousGoodWorkItemType" => "Product" },
+		 * "toBusinessPartner/CompanyName" => {
+		 *   "com.sap....SalesOrderType" => "BusinessPartnerID",
+		 *   "com.sap....SalesOrderItemType"=> "BusinessPartnerID"
+		 * }
+		 * Sample for path used to lookup field help resulting from these mappings: Binding path
+		 * "SalesOrderSet('42')/toBusinessPartner/CompanyName" is mapped to path
+		 * "SalesOrderSet('42')/BusinessPartnerID" to look up field help
+		 */
+
+		// map of meta model -> promise on text to ID mapping
+		// Map(<string, Promise<sap.ui.core.fieldhelp.Text2IdByType>>)
+		static #mMetaModel2TextMappingPromise = new Map();
+
+		/**
+		 * @interface
+		 * @name sap.ui.core.fieldhelp.MetaModelInterface
+		 * @description Interface for uniform access to OData V4 and OData V2 meta models to retrieve information
+		 *   required to compute text to ID property mappings.
+		 */
+
+		/**
+		 * Gets the array of property names for the given entity type or complex type.
+		 * Calling this method requires that {@link #requestTypes} has been called before, so that metadata is
+		 * loaded and can be accessed synchronously.
+		 *
+		 * @function
+		 * @name sap.ui.core.fieldhelp.MetaModelInterface#getProperties
+		 * @param {object} oType The type object
+		 * @returns {string[]} Array of property names
+		 */
+
+		/**
+		 * Gets the path of the <code>com.sap.vocabulary.common.Text</code> annotation for the given property in the
+		 * given entity type or complex type.
+		 * Calling this method requires that {@link #requestTypes} has been called before, so that metadata is
+		 * loaded and can be accessed synchronously.
+		 *
+		 * @function
+		 * @name sap.ui.core.fieldhelp.MetaModelInterface#getTextPropertyPath
+		 * @param {string} sType The type name
+		 * @param {string} sProperty The property name
+		 * @returns {string|undefined} The path value of the <code>com.sap.vocabulary.common.Text</code> annotation
+		 *   targeting the given property or <code>undefined</code> if the property has no such annotation
+		 */
+
+		/**
+		 * Gets the qualified name of the type for the given resolved data path.
+		 * Calling this method requires that {@link #requestTypes} has been called before, so that metadata is
+		 * loaded and can be accessed synchronously.
+		 *
+		 * @function
+		 * @name sap.ui.core.fieldhelp.MetaModelInterface#getTypeQName
+		 * @param {string} sResolvedPath The resolved data path
+		 * @returns {string|undefined}
+		 *   The qualified type name for the resolved path or <code>undefined</code>, if the path does not correspond to
+		 *   a type
+		 */
+
+		/**
+		 * Requests the entity types and complex types for this meta model.
+		 *
+		 * @async
+		 * @function
+		 * @name sap.ui.core.fieldhelp.MetaModelInterface#requestTypes
+		 * @returns {Promise<Array<Map<string, object>>>}
+		 *   A promise resolving with an array with two maps of the type's qualified name to the type object; the first
+		 *   map for entity types, the second for complex types. The promise rejects, if the requested metadata cannot
+		 *   be loaded.
+		 */
+
+		/**
+		 * Implementation of the meta model interface for OData V4.
+		 *
+	 	 * @implements {sap.ui.core.fieldhelp.MetaModelInterface}
+	 	 */
+		static #oMetaModelInterfaceV4 = {
+			getProperties(oType) {
+				return Object.keys(oType).filter((sKey) => oType[sKey].$kind === "Property");
+			},
+
+			getTextPropertyPath(sType, sProperty) {
+				return this.oMetaModel.getObject(`/${sType}/${sProperty}@com.sap.vocabularies.Common.v1.Text/$Path`);
+			},
+
+			getTypeQName(sResolvedPath) {
+				return this.oMetaModel.getObject(this.oMetaModel.getMetaPath(sResolvedPath) + "/$Type");
+			},
+
+			async requestTypes() {
+				const mEntityTypes = new Map();
+				const mComplexTypes = new Map();
+				const mScope = await this.oMetaModel.requestObject("/$");
+				Object.entries(mScope).forEach(([sKey, oValue]) => {
+					if (oValue.$kind === "EntityType") {
+						mEntityTypes.set(sKey, oValue);
+					} else if (oValue.$kind === "ComplexType") {
+						mComplexTypes.set(sKey, oValue);
+					}
+				});
+				return [mEntityTypes, mComplexTypes];
+			}
+		};
+
+		/**
+		 * Gets the meta model interface for the given OData meta model. If computing a text to ID property mapping is
+		 * not supported for the given meta model, <code>undefined</code> is returned.
+		 *
+		 * @param {sap.ui.model.odata.ODataMetaModel|sap.ui.model.odata.v4.ODataMetaModel} oMetaModel
+		 *   The OData meta model to retrieve the meta model interface for
+		 * @returns {sap.ui.core.fieldhelp.MetaModelInterface|undefined} The meta model interface or
+		 *   <code>undefined</code>
+		 */
+		static _getMetamodelInterface(oMetaModel) {
+			if (oMetaModel.isA("sap.ui.model.odata.v4.ODataMetaModel")) {
+				const oInterface = Object.create(FieldHelp.#oMetaModelInterfaceV4);
+				oInterface.oMetaModel = oMetaModel;
+				return oInterface;
+			}
+
+			return undefined;
+		}
+
+		/**
+		 * Requests the ID property path for the given meta model interface and the given resolved path; if the
+		 * resolved path does not point to a text property, the resolved path itself is returned.
+		 *
+		 * @param {sap.ui.core.fieldhelp.MetaModelInterface} oMetaModelInterface
+		 *   The OData meta model interface
+		 * @param {string} sResolvedPath
+		 *    The resolved path
+		 * @returns {Promise<string>}
+		 *   A promise that resolves with the ID property path for the given resolved path, if it points to a text
+		 *   property or the given resolved path otherwise. The promise rejects, if the requested metadata cannot
+		 *   be loaded.
+		 */
+		static async _requestIDPropertyPath(oMetaModelInterface, sResolvedPath) {
+			const mText2IdByType = await FieldHelp._requestText2IdByType(oMetaModelInterface);
+			const [sFirstSegment, ...aSuffixSegments] = sResolvedPath.slice(1).split("/");
+			const aPrefixSegments = [sFirstSegment];
+			while (aSuffixSegments.length) {
+				const sPrefixPath = "/" + aPrefixSegments.join("/");
+				const sTypeQName = oMetaModelInterface.getTypeQName(sPrefixPath);
+				const sTextPropertyPath = aSuffixSegments.join("/");
+				const sIDPropertyPath = mText2IdByType.get(sTextPropertyPath)?.get(sTypeQName);
+				if (sIDPropertyPath) {
+					return sPrefixPath + "/" + sIDPropertyPath;
+				}
+				aPrefixSegments.push(aSuffixSegments.shift());
+			}
+			return sResolvedPath;
+		}
+
+		/**
+		 * Requests the mapping of text properties to ID properties for the given meta model interface.
+		 *
+		 * @param {sap.ui.core.fieldhelp.MetaModelInterface} oMetaModelInterface
+		 *   The meta model interface
+		 * @returns {Promise<sap.ui.core.fieldhelp.Text2IdByType>}
+		 *   A promise on the mapping of text to ID properties by type. The promise rejects, if the requested metadata
+		 *   cannot be loaded.
+		 */
+		static _requestText2IdByType(oMetaModelInterface) {
+			if (FieldHelp.#mMetaModel2TextMappingPromise.has(oMetaModelInterface.oMetaModel)) {
+				return FieldHelp.#mMetaModel2TextMappingPromise.get(oMetaModelInterface.oMetaModel);
+			}
+
+			const oTextMappingPromise = oMetaModelInterface.requestTypes().then(([mEntityTypes, mComplexTypes]) => {
+				const mText2IdByType = new Map();
+				const mAllTypes = new Map([...mEntityTypes, ...mComplexTypes]);
+				for (const [sType, oType] of mAllTypes) {
+					for (const sProperty of oMetaModelInterface.getProperties(oType)) {
+						const sTextPropertyPath = oMetaModelInterface.getTextPropertyPath(sType, sProperty);
+						if (!sTextPropertyPath) {
+							continue;
+						}
+						const mIdByType = mText2IdByType.get(sTextPropertyPath) ??
+							mText2IdByType.set(sTextPropertyPath, new Map()).get(sTextPropertyPath);
+						mIdByType.set(sType, sProperty);
+					}
+				}
+				return mText2IdByType;
+			});
+			FieldHelp.#mMetaModel2TextMappingPromise.set(oMetaModelInterface.oMetaModel, oTextMappingPromise);
+			return oTextMappingPromise;
+		}
+
 		/**
 		 * Requests the <code>String</code> value of the <code>com.sap.vocabularies.Common.v1.DocumentationRef</code>
 		 * annotation for the given binding.
 		 *
 		 * @param {sap.ui.model.Binding} oBinding The binding
-		 * @return {Promise<string>|undefined}
+		 * @returns {Promise<string>|undefined}
 		 *   If the binding is destroyed, or does not belong to an OData model, or the resolved path of the binding is a
 		 *   meta model path or referencing an annotation, then <code>undefined</code> is returned; if the binding
 		 *   belongs to an OData model the <code>com.sap.vocabularies.Common.v1.DocumentationRef</code> annotation value
@@ -124,7 +319,7 @@ sap.ui.define([
 			if (oBinding.isDestroyed()) {
 				return undefined;
 			}
-			const sResolvedPath = oBinding.getResolvedPath();
+			let sResolvedPath = oBinding.getResolvedPath();
 			if (!sResolvedPath || sResolvedPath.includes("#") /*meta model path*/
 					|| sResolvedPath.includes("@") /*annotation path*/) {
 				return undefined;
@@ -143,8 +338,12 @@ sap.ui.define([
 						?.String;
 				});
 			} else { // V4 meta model
-				oFieldHelpAnnotationPromise = oMetaModel.requestObject("@" + sDocumentationRef,
-					oMetaModel.getMetaContext(sResolvedPath));
+				const oFieldHelpPathPromise = FieldHelp._requestIDPropertyPath(
+					FieldHelp._getMetamodelInterface(oMetaModel), sResolvedPath);
+				oFieldHelpAnnotationPromise = oFieldHelpPathPromise.then((sFieldHelpPropertyPath) => {
+					sResolvedPath = sFieldHelpPropertyPath; // for message logged in case of errors below
+					return oMetaModel.requestObject("@" + sDocumentationRef, oMetaModel.getMetaContext(sResolvedPath));
+				});
 			}
 			return oFieldHelpAnnotationPromise.catch((oReason) => {
 					Log.error(`Failed to request '${sDocumentationRef}' annotation for path '${sResolvedPath}'`,
@@ -408,6 +607,7 @@ sap.ui.define([
 			this.#bActive = false;
 			this.#mDocuRefControlToFieldHelp = {};
 			this.#fnUpdateHotspotsCallback = null;
+			FieldHelp.#mMetaModel2TextMappingPromise.clear();
 			ManagedObject.prototype.updateFieldHelp = undefined; // restore the default
 		}
 

package/src/sap/ui/core/fieldhelp/FieldHelpUtil.js

@@ -9,17 +9,17 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * Util class to set field help information for controls like filter fields that don't have OData property bindings.
+	 * Utility class to set field help information for controls for which field help information cannot be deduced
+	 * automatically from OData metadata or for which the automatically deduced field help needs to be overwritten.
+	 * These can be controls like filter fields that don't have OData property bindings.
 	 *
 	 * @alias module:sap/ui/core/fieldhelp/FieldHelpUtil
 	 * @author SAP SE
 	 * @class
 	 *
 	 * @hideconstructor
-	 * @private
-	 * @ui5-restricted sap.ui.comp.filterbar, sap.fe.templates.ListReport
-	 * @since 1.126.0
-	 * @see module:sap/ui/core/fieldhelp/FieldHelp
+	 * @public
+	 * @since 1.133.0
 	 */
 	class FieldHelpUtil {
 		/**
@@ -29,13 +29,13 @@ sap.ui.define([
 		 *   The element on which to set the field help
 		 * @param {string|string[]} vDocumentationRefs
 		 *   The string value or an array of string values of
-		 *   <code>com.sap.vocabularies.Common.v1.DocumentationRef</code> OData annotations
+		 *   <code>com.sap.vocabularies.Common.v1.DocumentationRef</code> OData annotations, for example
+		 *   <code>"urn:sap-com:documentation:key?=type=DE&id=MY_ID&origin=MY_ORIGIN"</code>"
 		 * @throws {Error}
 		 *   If there is already a custom data with key <code>sap-ui-DocumentationRef</code> that is not of type
 		 *   {@link module:sap/ui/core/fieldhelp/FieldHelpCustomData}
 		 *
-		 * @private
-		 * @ui5-restricted sap.ui.comp.filterbar, sap.fe.templates.ListReport
+		 * @public
 		 */
 		static setDocumentationRef(oElement, vDocumentationRefs) {
 			const aValue = Array.isArray(vDocumentationRefs) ? vDocumentationRefs : [vDocumentationRefs];