@openui5/sap.ui.mdc 1.124.2 → 1.126.0

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -6,6 +6,7 @@
 sap.ui.define([
 		'sap/ui/mdc/condition/Operator',
 		'sap/ui/mdc/util/DateUtil',
+		'sap/ui/mdc/enums/OperatorValueType',
 		'sap/ui/model/Filter',
 		'sap/ui/model/FilterOperator',
 		'sap/base/Log'
@@ -14,6 +15,7 @@ sap.ui.define([
 	(
 		Operator,
 		DateUtil,
+		OperatorValueType,
 		Filter,
 		FilterOperator,
 		Log
@@ -25,17 +27,19 @@ sap.ui.define([
 		 * Creates a <code>sap.ui.mdc.condition.RangeOperator</code> object.
 		 * This is used in the {@link sap.ui.mdc.FilterField FilterField} control to define which filter operators are supported.
 		 *
+		 * <b>Note:</b> Use this class only for filter field of type date or time related data types.
+		 *
 		 * If a function or property is initial, the default implementation is used.
 		 *
 		 * @extends sap.ui.mdc.condition.Operator
 		 * @param {object} oConfiguration Included all parameters of {@link sap.ui.mdc.condition.Operator Operator} and adds some special ones
 		 * @param {string} [oConfiguration.label] additional array of labels for the values of the operator. Will be shown as placeholder text or label on the value fields.
-		 * @param {function} [oConfiguration.calcRange] function to calculate the date range of the operation. the function returns an array of UniversalDates.
+		 * @param {function} oConfiguration.calcRange function to calculate the date range of the operation. The function returns an array of UniversalDates. In case of a single <code>filterOperator</code> the array can return a single value.
 		 * @param {function} [oConfiguration.formatRange] function to format the date range.
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @public
 		 * @alias sap.ui.mdc.condition.RangeOperator
 		 * @since 1.74.0
@@ -43,10 +47,19 @@ sap.ui.define([
 		 */
 		const RangeOperator = Operator.extend("sap.ui.mdc.condition.RangeOperator", /** @lends sap.ui.mdc.condition.RangeOperator.prototype */ {
 			constructor: function(oConfiguration) {
-				oConfiguration.filterOperator = "RANGE"; // No default operator for the filter exist
+				oConfiguration.filterOperator = oConfiguration.filterOperator || FilterOperator.BT;
 				if (oConfiguration.valueTypes && oConfiguration.valueTypes.length > 0) {
-					oConfiguration.tokenTest = oConfiguration.tokenTest || "^#tokenText#$";
-					oConfiguration.tokenParse = oConfiguration.tokenParse || "^#tokenText#$|^(.+)?$"; // if text not entered take everything as just argument might be entered
+					if (oConfiguration.valueTypes[0] === OperatorValueType.Static) { // as static operators cannot hold any value only the text is interesting
+						if (oConfiguration.longText && oConfiguration.longText !== oConfiguration.tokenText) {
+							oConfiguration.tokenTest = oConfiguration.tokenTest || "^" + oConfiguration.longText + "$|^#tokenText#$"; // as static text don't need to be entered allow longText too
+						} else {
+							oConfiguration.tokenTest = oConfiguration.tokenTest || "^#tokenText#$";
+						}
+						oConfiguration.tokenParse = oConfiguration.tokenParse || "^(.+)?$"; // as no value can be entered, everything is valid (validity tested with tokenTest)
+					} else {
+						oConfiguration.tokenTest = oConfiguration.tokenTest || "^#tokenText#$";
+						oConfiguration.tokenParse = oConfiguration.tokenParse || "^#tokenText#$|^(.+)?$"; // if text not entered take everything as just argument might be entered
+					}
 				} else {
 					oConfiguration.tokenParse = oConfiguration.tokenParse || "^#tokenText#$";
 				}
@@ -85,7 +98,7 @@ sap.ui.define([
 					this.formatRange = oConfiguration.formatRange;
 				} else if (this.calcRange) {
 					this.formatRange = function(aRange, oDataType) {
-						return oDataType.formatValue(aRange[0], "string") + " - " + oDataType.formatValue(aRange[1], "string");
+						return oDataType.formatValue(aRange[0], "string") + (aRange[1] ? " - " + oDataType.formatValue(aRange[1], "string") : "");
 					};
 				}
 
@@ -94,7 +107,7 @@ sap.ui.define([
 
 		RangeOperator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
 			const aRange = this._getRange(oCondition.values, oType, sBaseType);
-			return new Filter({ path: sFieldPath, operator: FilterOperator.BT, value1: aRange[0], value2: aRange[1] });
+			return new Filter({ path: sFieldPath, operator: this.filterOperator, value1: aRange[0], value2: aRange[1] });
 		};
 
 		RangeOperator.prototype._getRange = function(aValues, oType, sBaseType) {
@@ -109,7 +122,7 @@ sap.ui.define([
 				aRange = this.calcRange();
 			}
 
-			for (let i = 0; i < 2; i++) {
+			for (let i = 0; i < aRange.length; i++) {
 				//the calcRange result must be converted from local time into the correct type format.
 				aRange[i] = DateUtil.dateToType(aRange[i].getJSDate(), oType, sBaseType);
 			}
@@ -131,6 +144,19 @@ sap.ui.define([
 			return this.formatRange(aRange, oType);
 		};
 
+		RangeOperator.prototype.format = function(oCondition, oType, sDisplay, bHideOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes, sCustomFormat) { // sDisplay, oAdditionalType and aAdditionalCompositeTypes needed in EQ formatter
+
+			const sTokenText = sCustomFormat || this.tokenFormat;
+
+			if (this.valueTypes.length === 1 && this.valueTypes[0] === OperatorValueType.Static && sTokenText.indexOf("{0}") >= 0) {
+				// for static Operators what should display a real value use static text
+				const sReplace = this.getStaticText(oType);
+				return sTokenText.replace(new RegExp("\\{" + 0 + "\\}", "g"), sReplace);
+			}
+
+			return Operator.prototype.format.apply(this, arguments);
+
+		};
 		return RangeOperator;
 
 	}, /* bExport= */

package/src/sap/ui/mdc/designtime/field/Field.designtime.js

@@ -8,10 +8,13 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	'sap/ui/fl/Utils',
 	'sap/ui/fl/apply/api/FlexRuntimeInfoAPI',
-	'sap/m/p13n/Engine'
-], (Element, Utils, FlexRuntimeInfoAPI, Engine) => {
+	'sap/m/p13n/Engine',
+	"sap/ui/core/Lib"
+], (Element, Utils, FlexRuntimeInfoAPI, Engine, Library) => {
 	"use strict";
 
+	const oRB = Library.getResourceBundleFor("sap.ui.mdc");
+
 	return {
 		properties: {
 			value: {
@@ -42,7 +45,7 @@ sap.ui.define([
 		actions: {
 			settings: {
 				"sap.ui.mdc": {
-					name: "info.POPOVER_DEFINE_LINKS",
+					name: oRB.getText("info.POPOVER_DEFINE_LINKS"),
 					isEnabled: (oControl) => !!oControl.getFieldInfo(),
 					handler: function(oControl, mPropertyBag) {
 						const oFieldInfo = oControl.getFieldInfo();

package/src/sap/ui/mdc/field/ConditionType.js

@@ -23,7 +23,8 @@ sap.ui.define([
 		'sap/ui/mdc/enums/ConditionValidated',
 		'sap/base/util/merge',
 		'sap/base/strings/whitespaceReplacer',
-		'sap/ui/base/SyncPromise'
+		'sap/ui/base/SyncPromise',
+		'sap/base/util/Deferred'
 	],
 	(
 		Element,
@@ -43,7 +44,8 @@ sap.ui.define([
 		ConditionValidated,
 		merge,
 		whitespaceReplacer,
-		SyncPromise
+		SyncPromise,
+		Deferred
 	) => {
 		"use strict";
 
@@ -59,7 +61,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 *
 		 * @since 1.62.0
 		 * @public
@@ -83,6 +85,7 @@ sap.ui.define([
 		 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 		 * @param {object} [oFormatOptions.payload] Payload of the delegate
 		 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
+		 * @param {function(sap.ui.mdc.condition.ConditionObject,Promise<sap.ui.mdc.condition.ConditionObject>)} [oFormatOptions.awaitFormatCondition] Provides control access to condition enhancements done by the ConditionType during formatting (e.g. description retrieval for item condition)
 		 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
 		 * @param {boolean} [oFormatOptions.convertWhitespaces] If set, whitespaces will be replaced by special characters to display whitespaces in HTML
 		 * @param {sap.ui.core.Control} [oFormatOptions.control] Instance of the calling control
@@ -137,7 +140,9 @@ sap.ui.define([
 		 */
 		ConditionType.prototype.formatValue = function(oCondition, sTargetType) {
 
+			let oType = this._getValueType();
 			if (oCondition == undefined || oCondition == null || this._bDestroyed) { // if destroyed do nothing
+				_attachCurrentValueAtType.call(this, oCondition, oType); // initialize current value
 				return null;
 			}
 
@@ -150,7 +155,6 @@ sap.ui.define([
 				sTargetType = "string";
 			}
 
-			let oType = this._getValueType();
 			const oAdditionalType = this._getAdditionalValueType();
 			const bIsUnit = this._isUnit(oType);
 			const bPreventGetDescription = this.oFormatOptions.preventGetDescription;
@@ -177,36 +181,38 @@ sap.ui.define([
 						const oBindingContext = this.oFormatOptions.bindingContext;
 						const vKey = bIsUnit ? oCondition.values[0][1] : oCondition.values[0];
 
+						// Provides communication of ongoing async formatting incl. description retrieval to the observing control (to allow FilterFields to persist the description in the ConditionModel)
+						const fnAwaitFormatCondition = this.oFormatOptions.awaitFormatCondition;
+						const oFormatConditionDeferred = fnAwaitFormatCondition && new Deferred();
+						fnAwaitFormatCondition?.(oCondition, oFormatConditionDeferred.promise);
+
 						return SyncPromise.resolve().then(() => {
 							return _getDescription.call(this, vKey, oCondition, oType, oAdditionalType, oBindingContext);
 						}).then((vDescription) => { // if description needs to be requested -> return if it is resolved
+							const oFormatCondition = merge({}, oCondition); // do not manipulate original object
 							if (vDescription) {
 								oCondition = merge({}, oCondition); // do not manipulate original object
-								if (bIsUnit) {
-									// in unit case create "standard" condition using String type for text arrangement
+								if (bIsUnit) { // in unit case create "standard" condition using String type for text arrangement
 									oType = this._getDefaultType();
 									oCondition.operator = oEQOperator.name;
 									if (typeof vDescription !== "object") {
 										vDescription = { key: vKey, description: vDescription };
 									}
 								}
-
-								if (typeof vDescription === "object") {
-									oCondition = _mapResultToCondition.call(this, oCondition, vDescription);
-								} else if (oCondition.values.length === 1) {
-									oCondition.values.push(vDescription);
-								} else {
-									oCondition.values[1] = vDescription;
-								}
+								const sDescription = typeof vDescription === "object" ? vDescription.description : vDescription;
+								oFormatCondition.values[1] = sDescription;
+								oFormatConditionDeferred?.resolve(oFormatCondition);
+							} else {
+								oFormatConditionDeferred?.reject(null);
 							}
-							return _returnResult.call(this, oCondition, undefined, iCallCount, true, oType, oAdditionalType);
+							return _returnResult.call(this, oFormatCondition, undefined, iCallCount, true, oType, oAdditionalType);
 						}).catch((oException) => {
 							let oMyException;
 							if (!(oException instanceof FormatException) || !_isInvalidInputAllowed.call(this)) {
 								// if "invalid" input is allowed don't fire an exception
 								oMyException = oException;
 							}
-
+							oFormatConditionDeferred?.reject(oException);
 							return _returnResult.call(this, oCondition, oMyException, iCallCount, true, oType, oAdditionalType);
 						}).unwrap();
 					}
@@ -310,7 +316,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 */
-		 ConditionType.prototype.getTextForCopy = function(oCondition) {
+		ConditionType.prototype.getTextForCopy = function(oCondition) {
 
 			// TODO: what if description is not known in the moment? Can copy be async?
 			const oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
@@ -324,7 +330,7 @@ sap.ui.define([
 
 			return oOperator.getTextForCopy(oCondition, oType, sDisplay, bHideOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes);
 
-		 };
+		};
 
 		/**
 		 * Parses an external value of the given source type to a condition that holds the value in model
@@ -904,17 +910,24 @@ sap.ui.define([
 
 		function _attachCurrentValueAtType(oCondition, oType) {
 
-			if (this._isCompositeType(oType) && oCondition && oCondition.values[0]) {
-				oType._aCurrentValue = merge([], oCondition.values[0]); // use copy to prevent changes on original arry change aCurrentValue too
+			if (this._isCompositeType(oType)) {
+				let aCurrentValue;
+
+				if (oCondition && oCondition.values[0]) {
+					aCurrentValue = oCondition.values[0];
+				} else {
+					aCurrentValue = []; // need to have an array to process it in Operator._parseValue
+				}
+				oType._aCurrentValue = merge([], aCurrentValue); // use copy to prevent changes on original arry change aCurrentValue too
 
 				const oAdditionalType = this._getAdditionalType();
 				if (this._isCompositeType(oAdditionalType)) { // store in corresponding unit or measure type too
-					oAdditionalType._aCurrentValue = merge([], oCondition.values[0]);
+					oAdditionalType._aCurrentValue = merge([], aCurrentValue);
 				}
 
 				const oOriginalType = this._getOriginalType();
 				if (this._isCompositeType(oOriginalType)) { // store in original type too (Currently not used in Unit/Currency type, but basically in CompositeType for parsing)
-					oOriginalType._aCurrentValue = merge([], oCondition.values[0]);
+					oOriginalType._aCurrentValue = merge([], aCurrentValue);
 				}
 			}
 
@@ -935,24 +948,6 @@ sap.ui.define([
 
 		}
 
-		function _mapResultToCondition(oCondition, oResult) {
-
-			oCondition.values = [oResult.key, oResult.description];
-
-			if (oResult.inParameters) {
-				oCondition.inParameters = oResult.inParameters;
-			}
-			if (oResult.outParameters) {
-				oCondition.outParameters = oResult.outParameters;
-			}
-			if (oResult.payload) {
-				oCondition.payload = oResult.payload;
-			}
-
-			return oCondition;
-
-		}
-
 		function _isInputValidationEnabled() {
 
 			const oValueHelp = _getValueHelp.call(this);

package/src/sap/ui/mdc/field/ConditionTypeMixin.js

@@ -24,7 +24,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @since 1.121.0
 		 * @alias sap.ui.mdc.field.ConditionTypeUtils
 		 *

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -54,7 +54,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 *
 		 * @since 1.62.0
 		 * @public
@@ -197,11 +197,15 @@ sap.ui.define([
 				});
 			};
 
-			for (let i = 0; i < aConditions.length; i++) {
-				aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sTargetType));
+			if (aConditions.length === 0) { // call ConditionType with no condition to let it initialize types and so on (To have same behavior as ConditionType would be used in binding)
+				aSyncPromises.push(fnCreateSyncPromise.call(this, null, sTargetType));
+			} else {
+				for (let i = 0; i < aConditions.length; i++) {
+					aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sTargetType));
 
-				if (iMaxConditions > 0 && i >= iMaxConditions - 1) {
-					break;
+					if (iMaxConditions > 0 && i >= iMaxConditions - 1) {
+						break;
+					}
 				}
 			}
 
@@ -216,7 +220,7 @@ sap.ui.define([
 			for (let i = 0; i < aFormattedValues.length; i++) {
 				if (vValue) {
 					vValue = vValue + this._oResourceBundle.getText("field.SEPARATOR") + aFormattedValues[i];
-				} else {
+				} else if (aFormattedValues[i]) {
 					vValue = aFormattedValues[i];
 				}
 			}

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/DynamicDateRangeConditionsType.js

@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.mdc.field.ConditionsType
 		 *
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 *
 		 * @since 1.96.0
 		 * @public

package/src/sap/ui/mdc/field/FieldBase.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -671,6 +671,8 @@ sap.ui.define([
 
 		this._oCreateContentPromise = undefined;
 
+		this._oValueHelpRequestPromise = undefined;
+
 		this._sFilterValue = "";
 
 	};
@@ -755,6 +757,8 @@ sap.ui.define([
 		this._oObserver = undefined;
 		this._oCreateContentPromise = undefined;
 
+		this._oValueHelpRequestPromise = undefined;
+
 		const oValueHelp = _getValueHelp.call(this);
 		if (oValueHelp) {
 			if (this._bConnected) {
@@ -1051,8 +1055,8 @@ sap.ui.define([
 	 * @returns {string} fieldPath of the field
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.filterbar.FilterBarBase
+	 * @deprecated as of 1.115.0, replaced by {@link #setPropertyKey propertyKey} property
 	 */
-	// @deprecated as of 1.115.0, replaced by {@link #setPropertyKey propertyKey} property
 	FieldBase.prototype.getFieldPath = function() {
 
 		const sBindingPath = this.getBindingPath("conditions");
@@ -2882,27 +2886,44 @@ sap.ui.define([
 
 	}
 
-	function _handleValueHelpRequest(oEvent, bOpenAsTypeahed) { // if triggered by valueHelpRequest event alway open as dialog, if called from Tap or Focus as typeahead
+	/* This allows FilterFields to defer valuehelp opening until all validated conditions are formatted and their descriptions are updated in the conditionmodel */
+	function _waitForFormatting () {
+		const oFormattingPromise = this.getFormattingPromise();
+		const bModifyBusy = oFormattingPromise && !this.getBusy();
+		if (bModifyBusy) {
+			this.setBusy(true);
+		}
+		return oFormattingPromise?.finally(() => {
+			if (bModifyBusy) {
+				this.setBusy(false);
+			}
+		});
+	}
 
-		const oValueHelp = _getValueHelp.call(this);
+	async function _handleValueHelpRequest(oEvent, bOpenAsTypeahed) { // if triggered by valueHelpRequest event always open as dialog, if called from Tap or Focus as typeahead
 
-		if (oValueHelp) {
+		const oValueHelp = _getValueHelp.call(this);
+		if (oValueHelp && !this._oValueHelpRequestPromise) {
 			if (this._fnLiveChangeTimer) { // as live change might pending we need to update the filterValue
 				this._fnLiveChangeTimer.flush();
 			}
-			oValueHelp.setFilterValue(this._sFilterValue); // use types value for filtering, even if reopening ValueHelp
-			const aConditions = this.getConditions();
-			_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
-			oValueHelp.toggleOpen(!!bOpenAsTypeahed);
-			const oContent = oEvent.srcControl || oEvent.getSource(); // as, if called from Tap or other browser event getSource is not available
-			if (!oValueHelp.isFocusInHelp()) {
-				// need to reset bValueHelpRequested in Input, otherwise on focusout no change event and navigation don't work
-				if (oContent.bValueHelpRequested) {
-					oContent.bValueHelpRequested = false; // TODO: need API
+			this._oValueHelpRequestPromise = _waitForFormatting.call(this);
+			await this._oValueHelpRequestPromise;
+			if (!this.isFieldDestroyed()) {
+				oValueHelp.setFilterValue(this._sFilterValue); // use types value for filtering, even if reopening ValueHelp
+				const aConditions = this.getConditions();
+				_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
+				oValueHelp.toggleOpen(!!bOpenAsTypeahed);
+				const oContent = oEvent.srcControl || oEvent.getSource(); // as, if called from Tap or other browser event getSource is not available
+				if (!oValueHelp.isFocusInHelp()) {
+					// need to reset bValueHelpRequested in Input, otherwise on focusout no change event and navigation don't work
+					if (oContent.bValueHelpRequested) {
+						oContent.bValueHelpRequested = false; // TODO: need API
+					}
 				}
+				this._oValueHelpRequestPromise = undefined;
 			}
 		}
-
 	}
 
 	function _setShowValueStateMessage(bValue) {
@@ -3253,11 +3274,11 @@ sap.ui.define([
 				oContentFactory.updateConditionType();
 				_setAriaAttributes.call(this, true, sItemId); // TODO: check if still open?
 			}
-		}
 
-		if (sItemId) {
-			// in Typeahead we don't have to wait for onOpened as we know that something is found
-			oContent.removeStyleClass("sapMFocus"); // to have focus outline on selected item in valueHelp only
+			if (sItemId) {
+				// in Typeahead we don't have to wait for onOpened as we know that something is found
+				oContent.removeStyleClass("sapMFocus"); // to have focus outline on selected item in valueHelp only
+			}
 		}
 
 	}
@@ -3751,9 +3772,21 @@ sap.ui.define([
 	 */
 	FieldBase.prototype.isSearchField = function() {
 
-		const regexp = new RegExp("^\\*(.*)\\*|\\$search$");
-		const sFieldPath = this.getFieldPath();
-		return regexp.test(sFieldPath) && this.getMaxConditions() === 1;
+		/**
+		 * @deprecated Since version 1.115.0
+		 */
+		// eslint-disable-next-line no-lone-blocks
+		{
+			let bIsSearchField = false;
+			const sFieldPath = this.getFieldPath();
+
+			if (sFieldPath) {
+				const regexp = new RegExp("^\\*(.*)\\*|\\$search$");
+				bIsSearchField = regexp.test(sFieldPath) && this.getMaxConditions() === 1;
+			}
+
+			return bIsSearchField;
+		}
 
 	};
 
@@ -3847,6 +3880,17 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Allows fields to wait for async formatting result processing
+	 *
+	 * @returns {undefined|Promise} returns a promise waiting for ongoing formatting
+	 * @protected
+	 * @since 1.126.0
+	 */
+	FieldBase.prototype.getFormattingPromise = function () {
+		return undefined;
+	};
+
 	function _isFocused() {
 
 		const oFocusedElement = document.activeElement;

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * This is the basis for link-features. If the link is pressed a popover might be opened.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @since 1.54.0
 	 * @public
@@ -174,7 +174,7 @@ sap.ui.define([
 	 * @private
 	 */
 	FieldInfoBase.prototype._createPopover = function(oPanel) {
-		const oPopover = new ResponsivePopover(this.getId() + "-popover", {
+		const oPopover = new ResponsivePopover(this.getPopoverId(), {
 			contentWidth: "380px",
 			horizontalScrolling: false,
 			showHeader: Device.system.phone,
@@ -215,10 +215,19 @@ sap.ui.define([
 	 */
 	FieldInfoBase.prototype.getPopover = function() {
 		return this.getDependents().find((oDependent) => {
-			return oDependent.isA("sap.m.ResponsivePopover");
+			return oDependent.isA("sap.m.ResponsivePopover") && oDependent.getId() === this.getPopoverId();
 		});
 	};
 
+	/**
+	 * Gets the ID for the <code>Popover/code> by adding "-popover" to the ID of the <code>FieldInfo</code>
+	 * @returns {string} ID for the <code>Popover/code>
+	 * @private
+	 */
+	FieldInfoBase.prototype.getPopoverId = function() {
+		return this.getId() + "-popover";
+	};
+
 	return FieldInfoBase;
 
 });

package/src/sap/ui/mdc/field/FieldInput.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.Input Input} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.Input
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -16,7 +16,7 @@ sap.ui.define([
 		 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 		 *
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @since 1.86.0
 		 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 		 *