@openui5/sap.ui.mdc 1.108.2 → 1.110.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -11,6 +11,7 @@ sap.ui.define([
 	'sap/ui/mdc/field/FieldBaseRenderer',
 	'sap/ui/mdc/condition/FilterOperatorUtil',
 	'sap/ui/mdc/condition/Condition',
+	'sap/ui/mdc/condition/ConditionValidateException',
 	'sap/ui/mdc/field/ConditionType',
 	'sap/ui/mdc/field/ConditionsType',
 	'sap/ui/mdc/enum/BaseType',
@@ -41,6 +42,7 @@ sap.ui.define([
 	FieldBaseRenderer,
 	FilterOperatorUtil,
 	Condition,
+	ConditionValidateException,
 	ConditionType,
 	ConditionsType,
 	BaseType,
@@ -84,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -97,7 +99,7 @@ sap.ui.define([
 	 */
 	var FieldBase = Control.extend("sap.ui.mdc.field.FieldBase", /* @lends sap.ui.mdc.field.FieldBase.prototype */ {
 		metadata: {
-			interfaces: ["sap.ui.core.IFormContent", "sap.ui.core.ISemanticFormContent"],
+			interfaces: ["sap.ui.core.IFormContent", "sap.ui.core.ISemanticFormContent", "sap.m.IOverflowToolbarContent"],
 			designtime: "sap/ui/mdc/designtime/field/FieldBase.designtime",
 			library: "sap.ui.mdc",
 			properties: {
@@ -988,22 +990,25 @@ sap.ui.define([
 				// do not destroy if used in Field binding
 				this._getContentFactory().getUnitOriginalType().destroy();
 			}
-			this._getContentFactory().getUnitOriginalType(undefined);
+			this._getContentFactory().setUnitOriginalType(undefined);
 		}
+
+		this._getContentFactory().setIsMeasure(false);
 	};
 
 	function _getDataTypeName() {
-		if (this._getContentFactory().getDataType() && typeof this._getContentFactory().getDataType() === "object") {
-			return this._getContentFactory().getDataType().getMetadata().getName();
+		var oDataType = this._getContentFactory().getDateOriginalType() || this._getContentFactory().getUnitOriginalType() || this._getContentFactory().getDataType(); // use original data type
+		if (oDataType && typeof oDataType === "object") {
+			return oDataType.getMetadata().getName();
 		} else if (this.bDelegateInitialized) {
-			return this.getControlDelegate().getDataTypeClass(this.getPayload(), this.getDataType());
+			return this.getTypeUtil().getDataTypeClassName(this.getDataType());
 		} else {
 			return this.getDataType();
 		}
 	}
 
 	function _getDataTypeConstraints() {
-		var oDataType = this._getContentFactory().getDataType();
+		var oDataType = this._getContentFactory().getDateOriginalType() || this._getContentFactory().getUnitOriginalType() || this._getContentFactory().getDataType(); // use original data type
 		if (oDataType && typeof oDataType === "object" && oDataType.getConstraints()) {
 			return oDataType.getConstraints();
 		} else {
@@ -1012,7 +1017,7 @@ sap.ui.define([
 	}
 
 	function _getDataTypeFormatOptions() {
-		var oDataType = this._getContentFactory().getDataType();
+		var oDataType = this._getContentFactory().getDateOriginalType() || this._getContentFactory().getUnitOriginalType() || this._getContentFactory().getDataType(); // use original data type
 		if (oDataType && typeof oDataType === "object" && oDataType.getFormatOptions()) {
 			return oDataType.getFormatOptions();
 		} else {
@@ -1066,12 +1071,12 @@ sap.ui.define([
 
 	};
 
-	function _setUIMessage(sMsg) {
+	// function _setUIMessage(sMsg) {
 
-		this.setValueState(ValueState.Error);
-		this.setValueStateText(sMsg);
+	// 	this.setValueState(ValueState.Error);
+	// 	this.setValueStateText(sMsg);
 
-	}
+	// }
 
 	FieldBase.prototype._removeUIMessage = function() {
 
@@ -1316,7 +1321,14 @@ sap.ui.define([
 			return this._getContentFactory().getDateOriginalType().formatValue(vValue, "string");
 		} else {
 			var oConditionsType = this._getContentFactory().getConditionsType();
-			return oConditionsType.formatValue(aConditions);
+			var oFormatOptions = oConditionsType.getFormatOptions();
+			var bNoFormatting = oFormatOptions.noFormatting;
+			oFormatOptions.noFormatting = false; // for display text always format
+			oConditionsType.setFormatOptions(oFormatOptions);
+			var sResult = oConditionsType.formatValue(aConditions);
+			oFormatOptions.noFormatting = bNoFormatting; // turn back
+			oConditionsType.setFormatOptions(oFormatOptions);
+			return sResult;
 		}
 
 	};
@@ -1330,6 +1342,21 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Required by the {@link sap.m.IOverflowToolbarContent} interface.
+	 * Registers invalidations event which is fired when width of the control is changed.
+	 *
+	 * @protected
+	 * @returns {object} Configuration information for the <code>sap.m.IOverflowToolbarContent</code> interface.
+	 */
+	FieldBase.prototype.getOverflowToolbarConfig = function() {
+		return {
+			canOverflow: true,
+			invalidationEvents: [],
+			propsUnrelatedToSize: ["conditions", "editMode", "display", "valueState", "valueStateText"] // only add properties that are normally changed during livetime
+		};
+	};
+
 	/*
 	 * If Field is inside of a Form use Forms aria logic for label
 	 */
@@ -1408,13 +1435,15 @@ sap.ui.define([
 			oAttributes.aria["haspopup"] = oAriaAttributes.ariaHasPopup;
 			oAttributes["autocomplete"] = "off";
 			if (bOpen) {
-				oAttributes.aria["expanded"] = "true";
+				if (oAriaAttributes.role) {
+					oAttributes.aria["expanded"] = "true"; // only allowed for combobox, listbox...
+				}
 				oAttributes.aria["controls"] = oAriaAttributes.contentId;
 				if (sItemId) {
 					oAttributes.aria["activedescendant"] = sItemId;
 				}
-			} else {
-				oAttributes.aria["expanded"] = "false";
+			} else if (oAriaAttributes.role) {
+				oAttributes.aria["expanded"] = "false"; // only allowed for combobox, listbox...
 			}
 			oAttributes["valueHelpEnabled"] = oAriaAttributes.valueHelpEnabled;
 		}
@@ -1495,6 +1524,7 @@ sap.ui.define([
 			if (!this._getContentFactory().getContentConditionTypes()[sName]) {
 				this._getContentFactory().getContentConditionTypes()[sName] = {};
 			}
+			this._getContentFactory().setNoFormatting(false); // initialize
 			this.awaitControlDelegate().then(function() {
 				if (!this.bIsDestroyed) {
 					this._oContentFactory.setHideOperator(_isOnlyOneSingleValue.call(this, this._getOperators())); // in single value eq Field hide operator
@@ -1505,13 +1535,14 @@ sap.ui.define([
 			// find out what is bound to conditions
 			var oBindingInfo;
 			var sProperty;
+			var bPropertyBound = false;
 			for (sProperty in oContent.getMetadata().getAllProperties()) {
 				if (oContent.getBindingPath(sProperty) === "/conditions") {
 					oBindingInfo = oContent.getBindingInfo(sProperty);
 					if (oBindingInfo && oBindingInfo.type && oBindingInfo.type instanceof ConditionsType) {
 						this._getContentFactory().getContentConditionTypes()[sName].oConditionsType = oBindingInfo.type;
 					}
-					this._getContentFactory().setBoundProperty(sProperty);
+					bPropertyBound = true;
 				}
 				if (sProperty === "editable" && !oContent.getBindingPath(sProperty) && oContent.isPropertyInitial(sProperty)) {
 					oContent.bindProperty(sProperty, { path: "$field>/editMode", formatter: ContentFactory._getEditable });
@@ -1556,6 +1587,9 @@ sap.ui.define([
 							var oTemplateBindingInfo = oBindingInfo.template.getBindingInfo(sProperty);
 							if (oTemplateBindingInfo && oTemplateBindingInfo.type && oTemplateBindingInfo.type instanceof ConditionType) {
 								this._getContentFactory().getContentConditionTypes()[sName].oConditionType = oTemplateBindingInfo.type;
+								if (bPropertyBound) { // both value and tokens are bound -> don't format Value, only parse it
+									this._getContentFactory().setNoFormatting(true);
+								}
 								break;
 							}
 						}
@@ -2042,20 +2076,10 @@ sap.ui.define([
 
 		// try to find the corresponding async. change and reject it
 		var vValue = oEvent.getParameter("newValue");
+		var oException = oEvent.getParameter("exception");
+		var aWrongConditions = oException && oException instanceof ConditionValidateException && oException.getConditions(); // we store the conditions in the ConditionValidationException
 		var bFound = false;
 		var i = 0;
-		var bIsMeasure = this._oContentFactory.isMeasure();
-		var iPart = 0;
-
-		if (bIsMeasure) { // check on what part the error occurs and compare only this value
-			var oControl = oEvent.getParameter("element");
-			var aContent = this._getContent();
-			for (i = 0; i < aContent.length; i++) {
-				if (oControl === aContent[i]) {
-					iPart = i;
-				}
-			}
-		}
 
 		for (i = 0; i < this._aAsyncChanges.length; i++) {
 			var oChange = this._aAsyncChanges[i];
@@ -2064,23 +2088,10 @@ sap.ui.define([
 					// for empty string no condition is created
 					oChange.reject(oEvent.getParameter("exception"));
 					bFound = true;
-				} else {
-					for (var j = 0; j < oChange.result.length; j++) {
-						var oCondition = oChange.result[j];
-						var vCompare = oCondition.values[0];
-						var vCompareBT = oCondition.operator === "BT" && oCondition.values[1];
-						if (bIsMeasure) {
-							vCompare = vCompare[iPart];
-							vCompareBT = oCondition.operator === "BT" && vCompareBT[iPart];
-						}
-						if (deepEqual(vCompare, vValue) || (oCondition.operator === "BT" && deepEqual(vCompareBT, vValue))) {
-							oChange.reject(oEvent.getParameter("exception"));
-							bFound = true;
-							break;
-						}
-					}
-				}
-				if (bFound) {
+					break;
+				} else if (deepEqual(oChange.result, aWrongConditions)) { // compare parsing result with conditions used for validation -> must be the same
+					oChange.reject(oException);
+					bFound = true;
 					break;
 				}
 			}
@@ -2120,113 +2131,19 @@ sap.ui.define([
 	function _performContentChange(oChange) {
 
 		var aConditions = this.getConditions();
-		var vValue;
 		var bValid = true;
 		var vWrongValue;
-		var oCondition;
 		var oSource = oChange.changeEvent.source;
-		var bAsync = false;
-		var bChanged = true; // normally only called on real change. But in SearchField called on every ENTER
-		var bChangeIfNotChanged = false; // in SearchField case fire change even if value not changed. TODO: other event for this
 
 		if (oChange.changeEvent.parameters.hasOwnProperty("valid")) {
 			bValid = oChange.changeEvent.parameters["valid"];
-			if (!bValid && oChange.changeEvent.parameters.hasOwnProperty("value")) {
-				vWrongValue = oChange.changeEvent.parameters["value"];
-			}
-		}
-
-		// use parsed value of the condition, if possible
-		var bUpdateConditions = false;
-		var sBoundProperty = this._getContentFactory().getBoundProperty();
-		var oBinding = sBoundProperty && oSource.getBinding(sBoundProperty);
-		if (oBinding && oBinding.getBindingMode() !== BindingMode.OneWay && oBinding.getPath() === "/conditions" && bValid) {
-			oCondition = aConditions[0];
-			vValue = aConditions[0] && aConditions[0].values[0];
-		} else if (oChange.changeEvent.parameters.hasOwnProperty("value")) {
-			vValue = oChange.changeEvent.parameters["value"];
-			if (bValid) {
-				bUpdateConditions = true;
-			}
-		} else {
-			oCondition = aConditions[0];
-			vValue = aConditions[0] && aConditions[0].values[0];
-		}
-
-		if (bUpdateConditions) {
-			// text typed in MultiInput
-			this._removeUIMessage();
-			var oConditionType;
-			var oMyChange;
-
-			if (this._bIgnoreInputValue) {
-				// remove filter value from input and don't use it as input
-				this._bIgnoreInputValue = false;
-				oSource.setDOMValue("");
-				if (oSource.getMetadata().hasProperty("value")) {
-					// clear "value" property of MultiInput as there might be an old value from a invalid input before
-					oSource.setValue();
-				}
-				return;
-			}
-
-			oCondition = SyncPromise.resolve().then(function() {
-				var iMaxConditions = this.getMaxConditions();
-
-				if (this._oNavigateCondition) {
-					// text entered via navigation -> use this data, no parsing is needed
-					bValid = true;
-					return this._oNavigateCondition;
-				} else if (vValue === "" && iMaxConditions !== 1) {
-					// in multivalue case an empty input don't changes the conditions and must not be validated with the data type
-					// this happens after an invalid input was just cleared
-					return null;
-				} else {
-					oConditionType = this._getContentFactory().getConditionType();
-					var vResult = oConditionType.parseValue(vValue);
-					var iLength = this._aAsyncChanges.length;
-
-					if (iLength > 0 && !this._aAsyncChanges[iLength - 1].changeFired) {
-						oMyChange = this._aAsyncChanges[iLength - 1];
-						oMyChange.changeFired = true;
-						oMyChange.changeEvent = oChange.changeEvent;
-						_triggerChange.call(this, undefined, undefined, undefined, oMyChange.promise);
-					}
-					return vResult;
-				}
-			}.bind(this)).then(function(oCondition) {
-				bChanged = _updateConditionsFromChange.call(this, oCondition, aConditions, oConditionType, bValid, vValue, oSource, oMyChange || oChange);
-				bChanged = bChanged || bChangeIfNotChanged; // in SearchField fire change if value not changed
-				return oCondition;
-			}.bind(this)).catch(function(oException) {
-				if (oException && !(oException instanceof ParseException) && !(oException instanceof FormatException) && !(oException instanceof ValidateException)) {// FormatException could also occur
-					// unknown error -> just raise it
-					throw oException;
-				}
-				bValid = false;
-				vWrongValue = vValue;
-				this._bParseError = true;
-				this._sFilterValue = "";
-				_setUIMessage.call(this, oException.message);
-
-				if (oMyChange && oMyChange.reject) {
-					if (_removeAsyncChange.call(this, oMyChange)) { // only if still valid (might be alredy rejected)
-						oMyChange.reject(oException);
-					}
-				} else if (bAsync) {
-					_triggerChange.call(this, aConditions, bValid, vWrongValue);
-				}
-			}.bind(this)).unwrap();
-
-			if (oCondition instanceof Promise) {
-				// will be parsed async
-				bAsync = true;
-			}
-		} else if (!oChange.changeEvent.parameters.hasOwnProperty("valid") && this._bParseError) {
+		} else if (this._bParseError) {
 			// this might be result of a value that cannot be parsed
-			vWrongValue = oChange.changeEvent.parameters["value"];
 			bValid = false;
 		}
+		if (!bValid && oChange.changeEvent.parameters.hasOwnProperty("value")) {
+			vWrongValue = oChange.changeEvent.parameters["value"];
+		}
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		if (oFieldHelp && this._bConnected) {
@@ -2234,7 +2151,7 @@ sap.ui.define([
 				oFieldHelp.close(); // if focus is not in field, Field help closes automatically
 			}
 			this._sFilterValue = "";
-			if (!bAsync && bValid) {
+			if (bValid) {
 				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
 				oFieldHelp.onControlChange();
 			}
@@ -2250,75 +2167,12 @@ sap.ui.define([
 		if (oChange.resolve) {
 			// async promise needs to be resolved
 			_resolveAsyncChange.call(this, oChange);
-		} else if (!bAsync && bChanged) {
+		} else {
 			_triggerChange.call(this, aConditions, bValid, vWrongValue);
 		}
 
 	}
 
-	// Please note: This method may update aConditions!
-	function _updateConditionsFromChange(oCondition, aConditions, oConditionType, bValid, vValue, oSource, oChange) {
-
-		var iMaxConditions = this.getMaxConditions();
-		var bChanged = false;
-
-		if (oCondition === null && iMaxConditions !== 1) {
-			// in multi value case no new condition means no condition-change
-			// but fire change event as before a change event with invalid value was fired
-			return true;
-		}
-
-		if (oConditionType) {
-			// in navigation no validation needed
-			oConditionType.validateValue(oCondition);
-		}
-
-		if (bValid) {
-			if (oCondition) {
-				if (this._getContentFactory().isMeasure() && aConditions.length === 1 && aConditions[0].values[0][0] === undefined) {
-					// remove empty condition
-					aConditions.length = 0;
-				}
-				if (iMaxConditions !== 1 && FilterOperatorUtil.indexOfCondition(oCondition, aConditions) >= 0) {
-					// condition already exist (only error if tokens, in SearchField it is OK)
-					throw new ParseException(this._oResourceBundle.getText("field.CONDITION_ALREADY_EXIST", [vValue]));
-				} else {
-					if (iMaxConditions > 0 && iMaxConditions <= aConditions.length) {
-						// remove first conditions to meet maxConditions
-						aConditions.splice(0, aConditions.length - iMaxConditions + 1);
-					}
-					aConditions.push(oCondition);
-				}
-			} else if (iMaxConditions === 1) {
-				aConditions.length = 0;
-			}
-
-			if (!deepEqual(aConditions, this.getConditions())) {
-				this.setProperty("conditions", aConditions, true); // do not invalidate whole field
-				bChanged = true;
-			}
-
-			if (iMaxConditions !== 1) {
-				oSource.setValue(""); // remove typed value of MultiInput
-			}
-
-		}
-
-		if (oChange.resolve) {
-			var oFieldHelp = _getFieldHelp.call(this);
-			if (oFieldHelp && this._bConnected) {
-				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
-				oFieldHelp.onControlChange();
-			}
-			oChange.result = aConditions;
-			_resolveAsyncChange.call(this, oChange);
-			_removeAsyncChange.call(this, oChange);
-		}
-
-		return bChanged;
-
-	}
-
 	function _handleContentLiveChange(oEvent) {
 
 		var vValue;
@@ -2400,21 +2254,44 @@ sap.ui.define([
 								}
 							}
 
-							var vOpenByTyping = this.hasOwnProperty("_bOpenByTyping") ? this._bOpenByTyping : oFieldHelp.isTypeaheadSupported();
-							var oFocusedElement = document.activeElement;
-							if (this._bConnected && this._getContent()[0] && vOpenByTyping /*&& !(vOpenByTyping instanceof Promise)*/ && //TODO: isTypeaheadsupported always returns a promise now
-								oFocusedElement && (containsOrEquals(this.getDomRef(), oFocusedElement))) { // only if still connected and focussed
-								if (!this._sFilterValue && oFieldHelp.isOpen()) {
-									oFieldHelp.close(); // close if no filter
-								} else if (this._sFilterValue) {
-									oFieldHelp.setFilterValue(this._sFilterValue);
-									if (this.getMaxConditionsForHelp() === 1 && oFieldHelp.getConditions().length > 0) {
-										// While single-suggestion no item is selected
-										oFieldHelp.setConditions([]);
+							var _handleTypeahead = function () {
+								var oFocusedElement = document.activeElement;
+								if (oFocusedElement && (containsOrEquals(this.getDomRef(), oFocusedElement))) { // only if still connected and focussed
+									var bIsNew = oFieldHelp.isA("sap.ui.mdc.ValueHelp");
+									var bIsFHOpen = oFieldHelp.isOpen();
+									if (!bIsNew && !this._sFilterValue && bIsFHOpen) {
+										oFieldHelp.close(); // close if no filter
+									} else if (bIsNew || this._sFilterValue) {
+										oFieldHelp.setFilterValue(this._sFilterValue);
+										if (this.getMaxConditionsForHelp() === 1 && oFieldHelp.getConditions().length > 0) {
+											// While single-suggestion no item is selected
+											oFieldHelp.setConditions([]);
+										}
+										if (!bIsFHOpen) {
+											/*
+												sap.ui.mdc.ValueHelp can only be "asked" to open a typeahead by a connected control.
+												It will then decide on actual opening after content initialization via ValueHelpDelegate.showTypeahead which can be customized by applications.
+												An already open typeahead content will consult showTypeahead again on any every filtervalue update and eventually close.
+											*/
+											oFieldHelp.open(true);
+										}
+									}
+									_setAriaAttributes.call(this, true);
+									delete this._vLiveChangeValue;
+								}
+							}.bind(this);
+
+							if (this._bConnected && this._getContent()[0]) {
+								if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
+									oFieldHelp.isTypeaheadSupported().then(function (bTypeahead) {
+										return !!bTypeahead && _handleTypeahead();
+									});
+								} else {
+									var vOpenByTyping = this.hasOwnProperty("_bOpenByTyping") ? this._bOpenByTyping : oFieldHelp.isTypeaheadSupported();
+									if (vOpenByTyping) {
+										_handleTypeahead();
 									}
-									oFieldHelp.open(true);
 								}
-								_setAriaAttributes.call(this, true);
 								delete this._vLiveChangeValue;
 							}
 						}.bind(this), 300, { leading: false, trailing: true });
@@ -2599,7 +2476,6 @@ sap.ui.define([
 			var aConditions = this.getConditions();
 			_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
 			oFieldHelp.toggleOpen(false);
-			_setAriaAttributes.call(this, true); // if closed it will be set again on afterclose
 			if (!oFieldHelp.isFocusInHelp()) {
 				// need to reset bValueHelpRequested in Input, otherwise on focusout no change event and navigation don't work
 				var oContent = oEvent.getSource();
@@ -2722,11 +2598,7 @@ sap.ui.define([
 				}
 				this._sFilterValue = "";
 			} else if (bClose) {
-				if (this.getMaxConditions() !== 1 && !this._getContentFactory().getBoundProperty() && oContent.getMetadata().hasProperty("value") && oContent.getProperty("value")) {
-					// clear "value" property of MultiInput as there might be an old value from a invalid input before
-					oContent.setValue();
-				}
-				oContent.setDOMValue("");
+				oContent.setDOMValue(""); // as value property of MultiInput control might still be empty during typing. So setValue (via Binding) doesn't updates DOM-value (as no change is recognized).
 				this._sFilterValue = "";
 				this._bIgnoreInputValue = false; // just clean up
 			} else {
@@ -2825,6 +2697,8 @@ sap.ui.define([
 			sNewValue = vKey;
 		}
 
+		var bOpen = oFieldHelp.isOpen();
+
 		if (oContent && oContent.setDOMValue) {
 			if (!sDOMValue) {
 				if (this._getContentFactory().isMeasure() && this._getContentFactory().getUnitConditionsType() && this._oNavigateCondition) {
@@ -2841,7 +2715,7 @@ sap.ui.define([
 			if (oContent._doSelect) {
 				oContent._doSelect();
 			}
-			if (oFieldHelp.isOpen()) {
+			if (bOpen) {
 				oContent.removeStyleClass("sapMFocus"); // to have focus outline on navigated item only
 			}
 		}
@@ -2849,7 +2723,7 @@ sap.ui.define([
 		this._bPreventGetDescription = false; // back to default
 		this._getContentFactory().updateConditionType();
 
-		_setAriaAttributes.call(this, true, sItemId);
+		_setAriaAttributes.call(this, bOpen, sItemId);
 
 		this._bIgnoreInputValue = false; // use value for input
 		this.fireLiveChange({ value: sNewValue });
@@ -2864,9 +2738,10 @@ sap.ui.define([
 			this._bIgnoreInputValue = false;
 			oContent.setDOMValue("");
 			this._sFilterValue = "";
-			if (this.getMaxConditions() !== 1 && !this._getContentFactory().getBoundProperty() && oContent.getMetadata().hasProperty("value") && oContent.getProperty("value")) {
+			this._getContentFactory().updateConditionType();
+			if (this.getMaxConditions() !== 1) {
 				// clear "value" property of MultiInput as there might be an old value from a invalid input before
-				oContent.setValue();
+				this._oManagedObjectModel.checkUpdate(true); // forces update of value property via binding to conditions
 			}
 		}
 
@@ -2879,6 +2754,12 @@ sap.ui.define([
 
 	}
 
+	function _handleFieldHelpOpened(oEvent) {
+
+		_setAriaAttributes.call(this, true);
+
+	}
+
 	function _handleFieldSwitchToValueHelp(oEvent) {
 
 		var oContent = this.getControlForSuggestion();
@@ -2925,7 +2806,12 @@ sap.ui.define([
 			oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 			oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
 			oFieldHelp.detachEvent("closed", _handleFieldHelpAfterClose, this);
-			this._bConnected = false;
+			if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
+				oFieldHelp.detachEvent("opened", _handleFieldHelpOpened, this);
+			} else {
+				oFieldHelp.detachEvent("open", _handleFieldHelpOpened, this); // as old FieldHelp has no opened event use open event. But this is also fires async there
+			}
+		this._bConnected = false;
 		}
 
 	}
@@ -2969,6 +2855,11 @@ sap.ui.define([
 				oFieldHelp.attachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 				oFieldHelp.attachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
 				oFieldHelp.attachEvent("closed", _handleFieldHelpAfterClose, this);
+				if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
+					oFieldHelp.attachEvent("opened", _handleFieldHelpOpened, this);
+				} else {
+					oFieldHelp.attachEvent("open", _handleFieldHelpOpened, this); // as old FieldHelp has no opened event use open event. But this is also fires async there
+				}
 				var aConditions = this.getConditions();
 				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
 
@@ -3089,7 +2980,10 @@ sap.ui.define([
 			conditionModelName: oConditionModelInfo.name,
 			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getMaxConditions() !== 1, // also replace whitespaces in tokens
 			control: this,
-			defaultOperatorName : this.getDefaultOperator ? this.getDefaultOperator() : null
+			defaultOperatorName : this.getDefaultOperator ? this.getDefaultOperator() : null,
+			getConditions: this.getConditions.bind(this), // to add condition in multi-value case
+			noFormatting: this._getContentFactory().getNoFormatting(),
+			keepValue: this._bIgnoreInputValue ? this._sFilterValue : null
 		};
 
 	};
@@ -3167,7 +3061,8 @@ sap.ui.define([
 			conditionModelName : oConditionModelInfo.name,
 			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getEditMode() === EditMode.EditableDisplay,
 			control: this,
-			getConditions: this.getConditions.bind(this) // TODO: better solution to update unit in all conditions
+			getConditions: this.getConditions.bind(this), // TODO: better solution to update unit in all conditions
+			noFormatting: false
 		};
 
 	};

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -258,7 +258,7 @@ sap.ui.define([
 	 * @param {object} oConditionPayload Additional context information for this key
 	 * @param {sap.ui.core.Control} [oControl] Instance if the calling control
 	 * @param {sap.ui.model.Type} oType Type of the value
-	 * @returns {string|object|Promise} Description for key or object containing description, key, in and out parameters. If it is not available right away (must be requested), a <code>Promise</code> is returned.
+	 * @returns {string|sap.ui.mdc.valuehelp.ValueHelpItem|Promise<string|sap.ui.mdc.valuehelp.ValueHelpItem>} Description for key or object containing description, key and payload. If it is not available right away (must be requested), a <code>Promise</code> is returned.
 	 * @throws {sap.ui.model.FormatException} if the description cannot be determined
 	 * @since: 1.78.0
 	 * @private
@@ -288,39 +288,6 @@ sap.ui.define([
 
 	};
 
-	/**
-	 * This function returns which <code>FieldHelpBaseDelegate</code> is used
-	 * if a default field help (for example, for Boolean values) is created.
-	 *
-	 * @param {object} oPayload Payload for delegate
-	 * @returns {object} Delegate object with <code>name</code and <code>payload</code>
-	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldBase
-	 * @since 1.78.0
-	 */
-	FieldBaseDelegate.getDefaultFieldHelpBaseDelegate = function(oPayload) {
-
-		return {name: "sap/ui/mdc/field/FieldHelpBaseDelegate", payload: {}};
-
-	};
-
-	/**
-	 * This function returns which <code>FieldValueHelpDelegate</code> is used
-	 * if a default field help (for example, for defining conditions in </code>FilterField</code>)
-	 * is created.
-	 *
-	 * @param {object} oPayload Payload for delegate
-	 * @returns {object} Delegate object with <code>name</code and <code>payload</code>
-	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldBase
-	 * @since 1.78.0
-	 */
-	FieldBaseDelegate.getDefaultFieldValueHelpDelegate = function(oPayload) {
-
-		return {name: "sap/ui/mdc/field/FieldValueHelpDelegate", payload: {}};
-
-	};
-
 	/**
 	 * This function returns which <code>ValueHelpDelegate</code> is used
 	 * if a default field help (for example, for defining conditions in </code>FilterField</code>)

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

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