@openui5/sap.ui.mdc 1.93.3 → 1.96.2

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

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -169,7 +169,12 @@ sap.ui.define([
 					visibility: "hidden"
 				}
 			},
-			events: {}
+			events: {
+				/**
+				 * Event is fired if the user processes a condition. (Not known if changed.)
+				 */
+				conditionProcessed: {}
+			}
 		},
 		_oManagedObjectModel: null,
 
@@ -272,6 +277,8 @@ sap.ui.define([
 
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+
+			this.fireConditionProcessed();
 		},
 
 		addCondition: function(oEvent) {
@@ -354,7 +361,7 @@ sap.ui.define([
 				var aConditions = this.getConditions();
 				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
 
-				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
 					// type changed -> remove entered value (only if changed by user in Select)
 					// As Static text updated on condition change, don't delete it here.
 					if (iIndex >= 0) {
@@ -362,17 +369,28 @@ sap.ui.define([
 
 						oCondition.values.forEach(function(value, index) {
 							if (value !== null) {
-								oCondition.values[index] = null;
-								bUpdate = true;
+								if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
+										(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
+									// as for Decimal values the type might change we need to format and parse again
+									var oType = _getFieldType.call(this, oOperator.name, index);
+									var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
+									var sValue = oTypeOld.formatValue(oCondition.values[index], "string");
+									var vValue = oType.parseValue(sValue, "string");
+									if (vValue !== oCondition.values[index]) {
+										oCondition.values[index] = oType.parseValue(sValue, "string");
+										bUpdate = true;
+									}
+								} else {
+									oCondition.values[index] = null;
+									bUpdate = true;
+								}
 							}
-						});
+						}.bind(this));
 					}
 				}
 
 				if (iIndex >= 0 && oOperator.valueDefaults) {
-					var bCheckEmpty = false;
 					// sets the default values for the operator back to default, if the condition is inital or the value is null
-
 					oCondition = aConditions[iIndex];
 
 					oCondition.values.forEach(function(value, index) {
@@ -381,12 +399,8 @@ sap.ui.define([
 							oCondition.values[index] = oOperator.valueDefaults[index];
 							oCondition.isInitial = true;
 							bUpdate = true;
-							bCheckEmpty = true;
 						}
 					});
-					if (bCheckEmpty) {
-						FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
-					}
 				}
 
 
@@ -402,6 +416,7 @@ sap.ui.define([
 				}
 
 				if (bUpdate) {
+					FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
 					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
 				}
 			}
@@ -484,6 +499,8 @@ sap.ui.define([
 					FilterOperatorUtil.checkConditionsEmpty(aConditions);
 					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
 
+					this.fireConditionProcessed();
+
 				}.bind(this), 0);
 			}
 		},
@@ -650,8 +667,10 @@ sap.ui.define([
 
 		var oControl;
 		if (oOperator.createControl) {
-			oControl = oOperator.createControl(oNullableType, "$this>", iIndex, sId);
-		} else {
+			oControl = oOperator.createControl(oNullableType, "$this>", iIndex, sId); // the returned control can be null, in this case the default Field will be used
+		}
+
+		if (!oControl) {
 			oControl = new Field(sId, {
 				delegate: _getDelegate.call(this),
 				value: { path: "$this>", type: oNullableType, mode: 'TwoWay', targetType: 'raw' },
@@ -725,6 +744,9 @@ sap.ui.define([
 				if (oDataType.getConstraints() && oDataType.getConstraints().hasOwnProperty("nullable") && oDataType.getConstraints().nullable === false) {
 					// "clone" type and make nullable
 					oNullableType = _createNullableType(oDataType);
+					if (oDataType._bCreatedByOperator) {
+						oNullableType = oOperator._createLocalType(oOperator.valueTypes[iIndex], oDataType);
+					}
 				} else {
 					oNullableType = oDataType; // use given type or default string type
 				}
@@ -1439,6 +1461,8 @@ sap.ui.define([
 		// check if at least one condition has an error
 		_checkInvalidInput.call(this, bInvalid);
 
+		this.fireConditionProcessed();
+
 	}
 
 	function _checkInvalidInput(bInvalid) {

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

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -449,7 +449,7 @@ sap.ui.define([
 				 * <b>Note:</b> For Boolean fields, no <code>FieldHelp</code> should be added, but a default <code>FieldHelp</code> used instead.
 				 */
 				fieldHelp: {
-					type: "sap.ui.mdc.field.FieldHelpBase",
+					type: "sap.ui.mdc.ValueHelp",
 					multiple: false
 				},
 
@@ -728,7 +728,8 @@ sap.ui.define([
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oSource = oEvent.srcControl;
 
-		if (oFieldHelp && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+		if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+			// if only type-ahead but no real value help, only navigate if open TODO: remove function check
 			oEvent.preventDefault();
 			oEvent.stopPropagation();
 			oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
@@ -742,7 +743,8 @@ sap.ui.define([
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oSource = oEvent.srcControl;
 
-		if (oFieldHelp && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+		if (oFieldHelp && (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled() || oFieldHelp.isOpen()) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+			// if only type-ahead but no real value help, only navigate if open TODO: remove function check
 			oEvent.preventDefault();
 			oEvent.stopPropagation();
 			oFieldHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
@@ -774,11 +776,11 @@ sap.ui.define([
 		// in "Select"-case the suggestion help should open on click into field
 		var oFieldHelp = _getFieldHelp.call(this);
 		if (oFieldHelp) {
-			if (oFieldHelp.openByClick() && !oFieldHelp.isOpen(true)) {
+			if (oFieldHelp.shouldOpenOnClick() && !oFieldHelp.isOpen(true)) {
 				oFieldHelp.open(true);
 			}
 			var oSource = oEvent.srcControl;
-			if (oFieldHelp.isOpen(true) && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {
+			if (oFieldHelp.isOpen(true) && (!this._oContentFactory.isMeasure() || (oSource.getShowValueHelp && oSource.getShowValueHelp()))) {
 				oSource.addStyleClass("sapMFocus"); // to show focus outline again after navigation
 				oFieldHelp.removeFocus();
 			}
@@ -1024,12 +1026,12 @@ sap.ui.define([
 
 	}
 
-	function _removeUIMessage() {
+	FieldBase.prototype._removeUIMessage = function() {
 
 		this.setValueState(ValueState.None);
 		this.setValueStateText();
 
-	}
+	};
 
 	/**
 	 * Observes changes.
@@ -1191,7 +1193,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldHelpBase
 	 */
-	FieldBase.prototype.getControlForSuggestion = function() {
+	 FieldBase.prototype.getControlForSuggestion = function() {
 
 		var aContent = this._getContent();
 		if (aContent.length > 0) {
@@ -1206,6 +1208,19 @@ sap.ui.define([
 
 	};
 
+	FieldBase.prototype.getFocusElementForValueHelp = function(bTypahead) {
+		var oSuggestControl = this.getControlForSuggestion();
+		var aIcons = oSuggestControl && oSuggestControl.getMetadata().getAllPrivateAggregations()._endIcon && oSuggestControl.getAggregation("_endIcon");
+		var oIcon;
+		for (var i = 0; i < aIcons.length; i++) { // as MultiInput can have a invisible icon before visible icon
+			if (aIcons[i].getVisible()) {
+				oIcon = aIcons[i];
+				break;
+			}
+		}
+		return bTypahead || !oIcon ? oSuggestControl : oIcon;
+	};
+
 	/**
 	 * In the case that number and unit are shown in different controls, only one unit is supported.
 	 * So the value help needs to be in single selection mode.
@@ -1330,23 +1345,24 @@ sap.ui.define([
 		var oFieldHelp = _getFieldHelp.call(this);
 
 		if (oFieldHelp) {
-			var sRoleDescription = oFieldHelp.getRoleDescription(this.getMaxConditionsForHelp());
-			oAttributes["role"] = "combobox";
+			var oAriaAttributes = oFieldHelp.getAriaAttributes(this.getMaxConditionsForHelp());
+			var sRoleDescription = oAriaAttributes.roleDescription;
+			oAttributes["role"] = oAriaAttributes.role;
 			if (sRoleDescription) {
 				oAttributes.aria["roledescription"] = sRoleDescription;
 			}
-			oAttributes.aria["haspopup"] = oFieldHelp.getAriaHasPopup();
+			oAttributes.aria["haspopup"] = oAriaAttributes.ariaHasPopup;
 			oAttributes["autocomplete"] = "off";
 			if (bOpen) {
 				oAttributes.aria["expanded"] = "true";
-				oAttributes.aria["controls"] = oFieldHelp.getContentId();
+				oAttributes.aria["controls"] = oAriaAttributes.contentId;
 				if (sItemId) {
 					oAttributes.aria["activedescendant"] = sItemId;
 				}
 			} else {
 				oAttributes.aria["expanded"] = "false";
 			}
-			oAttributes["valueHelpEnabled"] = oFieldHelp.getValueHelpEnabled();
+			oAttributes["valueHelpEnabled"] = oAriaAttributes.valueHelpEnabled;
 		}
 
 		this.setProperty("_ariaAttributes", oAttributes, true);
@@ -1663,7 +1679,7 @@ sap.ui.define([
 		if (this._bParseError) {
 			// as wrong input get lost if content control is destroyed.
 			this._bParseError = false;
-			_removeUIMessage.call(this);
+			this._removeUIMessage();
 		}
 
 		if (this._oContentFactory.isMeasure()) {
@@ -1993,7 +2009,7 @@ sap.ui.define([
 
 		if (bUpdateConditions) {
 			// text typed in MultiInput
-			_removeUIMessage.call(this);
+			this._removeUIMessage();
 			var oConditionType;
 			var oMyChange;
 
@@ -2001,6 +2017,10 @@ sap.ui.define([
 				// 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;
 			}
 
@@ -2070,7 +2090,7 @@ sap.ui.define([
 			this._sFilterValue = "";
 			if (!bAsync && bValid) {
 				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
-				oFieldHelp.onFieldChange();
+				oFieldHelp.onControlChange();
 			}
 			// do not trigger async suggestion
 			_clearLiveChangeTimer.call(this);
@@ -2141,7 +2161,7 @@ sap.ui.define([
 			var oFieldHelp = _getFieldHelp.call(this);
 			if (oFieldHelp && this._bConnected) {
 				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
-				oFieldHelp.onFieldChange();
+				oFieldHelp.onControlChange();
 			}
 			oChange.result = aConditions;
 			_resolveAsyncChange.call(this, oChange);
@@ -2231,8 +2251,8 @@ sap.ui.define([
 								}
 							}
 
-							var vOpenByTyping = oFieldHelp.openByTyping();
-							if (this._bConnected && this._getContent()[0] && vOpenByTyping && !(vOpenByTyping instanceof Promise) &&
+							var vOpenByTyping = this.hasOwnProperty("_bOpenByTyping") ? this._bOpenByTyping : oFieldHelp.isTypeaheadSupported();
+							if (this._bConnected && this._getContent()[0] && vOpenByTyping /*&& !(vOpenByTyping instanceof Promise)*/ && //TODO: isTypeaheadsupported always returns a promise now
 								(sap.ui.getCore().getCurrentFocusedControlId() === this._getContent()[0].getId() ||
 									(this._getContent()[1] && sap.ui.getCore().getCurrentFocusedControlId() === this._getContent()[1].getId()))) { // only if still connected and focussed
 								oFieldHelp.setFilterValue(this._sFilterValue);
@@ -2249,14 +2269,15 @@ sap.ui.define([
 						// on first call init FieldHelp (trigger loading metadata on first typing)
 						oFieldHelp.initBeforeOpen(true);
 					}
-					var vOpenByTyping = oFieldHelp.openByTyping(); // trigger determination of search functionality
+					var vOpenByTyping = oFieldHelp.isTypeaheadSupported(); // trigger determination of search functionality
 					if (vOpenByTyping instanceof Promise) {
-						vOpenByTyping.then(function() {
+						vOpenByTyping.then(function(bOpenByTyping) {
 							// trigger open after Promise resolved
 							var oFocusedElement = document.activeElement;
 							if (oFocusedElement && (containsOrEquals(this.getDomRef(), oFocusedElement)) && this._fnLiveChangeTimer) { // if destroyed this._fnLiveChangeTimer is removed
 								this._fnLiveChangeTimer(); // if resolved while initial debounce-time frame, it will not triggered twice
 							}
+							this._bOpenByTyping = bOpenByTyping;
 						}.bind(this));
 					}
 					this._fnLiveChangeTimer();
@@ -2336,7 +2357,7 @@ sap.ui.define([
 			var oFieldHelp = sap.ui.getCore().byId(sId);
 			if (oFieldHelp) {
 				oFieldHelp.detachEvent("select", _handleFieldHelpSelect, this);
-				oFieldHelp.detachEvent("navigate", _handleFieldHelpNavigate, this);
+				oFieldHelp.detachEvent("navigated", _handleFieldHelpNavigated, this);
 				oFieldHelp.detachEvent("dataUpdate", _handleHelpDataUpdate, this);
 				oFieldHelp.detachEvent("disconnect", _handleDisconnect, this);
 				oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this);
@@ -2363,7 +2384,9 @@ sap.ui.define([
 			var oFieldHelp = sap.ui.getCore().byId(sId);
 			if (oFieldHelp) {
 				oFieldHelp.attachEvent("dataUpdate", _handleHelpDataUpdate, this);
-				this.setProperty("_fieldHelpEnabled", true, true);
+				if (!oFieldHelp.valueHelpEnabled || oFieldHelp.valueHelpEnabled()) { //TODO: remove check for existence of function
+					this.setProperty("_fieldHelpEnabled", true, true);
+				}
 			}
 		}
 
@@ -2470,8 +2493,8 @@ sap.ui.define([
 				var aValue = this.getControlDelegate().enhanceValueForUnit(this.getPayload(), [null, aNewConditions[0].values[0]], this._oTypeInitialization); // Delegate must be initialized right now
 				oCondition = Condition.createCondition(oOperator.name, [aValue], aNewConditions[0].inParameters, aNewConditions[0].outParameters, ConditionValidated.NotValidated);
 				aConditions.push(oCondition);
-				var oConditionType = this._oContentFactory.getConditionType();
-				var oConditionsType = this._oContentFactory.getUnitConditionsType();
+				var oConditionType = this._oContentFactory.getConditionType(true);
+				var oConditionsType = this._oContentFactory.getUnitConditionsType(true);
 				// TODO: format once to update current value in type (as empty condtions are not displayed as token)
 				if (oConditionType) {
 					sDOMValue = oConditionType.formatValue(oCondition);
@@ -2513,9 +2536,9 @@ sap.ui.define([
 				// so we need to set the DOM value here. Otherwise it is not updated or, if empty, selected.
 				if (this._oContentFactory.isMeasure() && this._oContentFactory.getUnitConditionsType()) {
 					sDOMValue = this._oContentFactory.getUnitConditionsType().formatValue(aConditions);
-				} else if (this._oContentFactory.getConditionType()) {
+				} else if (this._oContentFactory.getConditionType(true)) {
 					sDOMValue = this._oContentFactory.getConditionType().formatValue(aConditions[0]);
-				} else if (this._oContentFactory.getConditionsType()) {
+				} else if (this._oContentFactory.getConditionsType(true)) {
 					sDOMValue = this._oContentFactory.getConditionsType().formatValue(aConditions);
 				}
 
@@ -2531,7 +2554,10 @@ sap.ui.define([
 				}
 				this._sFilterValue = "";
 			} else if (bClose) {
-				// remove typed value from MultiInput
+				if (this.getMaxConditions() !== 1 && !this._oContentFactory.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("");
 				this._sFilterValue = "";
 				this._bIgnoreInputValue = false; // just clean up
@@ -2542,7 +2568,7 @@ sap.ui.define([
 			// after selection input cannot be wrong
 			if (this._bParseError) { // only remove messages set by Field itself, message from outside should stay.
 				this._bParseError = false;
-				_removeUIMessage.call(this);
+				this._removeUIMessage();
 			}
 		}
 
@@ -2555,7 +2581,7 @@ sap.ui.define([
 
 			if (!FilterOperatorUtil.compareConditionsArray(aConditions, aConditionsOld)) { // update only if real change
 				// handle out-parameters
-				oFieldHelp.onFieldChange();
+				oFieldHelp.onControlChange();
 
 				_triggerChange.call(this, aConditions, true);
 			}
@@ -2563,21 +2589,26 @@ sap.ui.define([
 
 	}
 
-	function _handleFieldHelpNavigate(oEvent) {
+	function _handleFieldHelpNavigated(oEvent) {
 
 		var sValue = oEvent.getParameter("value");
 		var vKey = oEvent.getParameter("key");
 		var oCondition = oEvent.getParameter("condition");
 		var sItemId = oEvent.getParameter("itemId");
 		var bLeaveFocus = oEvent.getParameter("leaveFocus");
+
+		if (!oCondition && vKey) {
+			oCondition = Condition.createItemCondition(vKey, sValue);
+		}
+
 		var sNewValue;
 		var sDOMValue;
 		var oContent = this.getControlForSuggestion();
 		var oOperator = FilterOperatorUtil.getEQOperator(this._getOperators()); /// use EQ operator of Field (might be different one)
+		var oFieldHelp = _getFieldHelp.call(this);
 
 		if (bLeaveFocus) {
 			// nothing to navigate, just set focus visualization back to field
-			var oFieldHelp = _getFieldHelp.call(this);
 			oContent.addStyleClass("sapMFocus");
 			oContent.focus();
 			oFieldHelp.removeFocus();
@@ -2628,17 +2659,19 @@ sap.ui.define([
 			if (!sDOMValue) {
 				if (this._oContentFactory.isMeasure() && this._oContentFactory.getUnitConditionsType() && this._oNavigateCondition) {
 					sDOMValue = this._oContentFactory.getUnitConditionsType().formatValue([this._oNavigateCondition]);
-				} else if (this._oContentFactory.getConditionType() && this._oNavigateCondition) {
+				} else if (this._oContentFactory.getConditionType(true) && this._oNavigateCondition) {
 					sDOMValue = this._oContentFactory.getConditionType().formatValue(this._oNavigateCondition);
-				} else if (this._oContentFactory.getConditionsType() && this._oNavigateCondition) {
+				} else if (this._oContentFactory.getConditionsType(true) && this._oNavigateCondition) {
 					sDOMValue = this._oContentFactory.getConditionsType().formatValue([this._oNavigateCondition]);
 				} else {
 					sDOMValue = sValue || vKey;
 				}
 			}
-			oContent.removeStyleClass("sapMFocus"); // to have focus outline on navigated item
 			oContent.setDOMValue(sDOMValue);
 			oContent._doSelect();
+			if (oFieldHelp.isOpen()) {
+				oContent.removeStyleClass("sapMFocus"); // to have focus outline on navigated item only
+			}
 		}
 
 		this._bPreventGetDescription = false; // back to default
@@ -2658,6 +2691,10 @@ sap.ui.define([
 			var oContent = this.getControlForSuggestion();
 			this._bIgnoreInputValue = false;
 			oContent.setDOMValue("");
+			if (this.getMaxConditions() !== 1 && !this._oContentFactory.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();
+			}
 		}
 
 		_setAriaAttributes.call(this, false);
@@ -2697,10 +2734,11 @@ sap.ui.define([
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		oFieldHelp.detachEvent("select", _handleFieldHelpSelect, this);
-		oFieldHelp.detachEvent("navigate", _handleFieldHelpNavigate, this);
+		oFieldHelp.detachEvent("navigated", _handleFieldHelpNavigated, this);
 		oFieldHelp.detachEvent("disconnect", _handleDisconnect, this);
-		oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this);
+		oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 		oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
+		oFieldHelp.detachEvent("closed", _handleFieldHelpAfterClose, this);
 		this._bConnected = false;
 
 	}
@@ -2709,13 +2747,26 @@ sap.ui.define([
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		if (oFieldHelp && !this._bConnected) {
-			oFieldHelp.connect(this);
+			var oConditionModelInfo = _getConditionModelInfo.call(this);
+			var oConfig = { // TODO: only what is needed (also for DefineConditions and Tokenizer)
+					maxConditions: this.getMaxConditions(), // TODO: in unit case only 1?
+					dataType: this._oContentFactory.getDataType(),
+					operators: this._getOperators(),
+					display: this._oContentFactory.isMeasure() ? FieldDisplay.Value : this.getDisplay(),
+					delegate: this.getControlDelegate(),
+					delegateName: this.getDelegate() && this.getDelegate().name,
+					payload: this.getPayload(),
+					conditionModel: oConditionModelInfo.model,
+					conditionModelName : oConditionModelInfo.name
+			};
+			oFieldHelp.connect(this, oConfig);
 			this._bConnected = true;
 			oFieldHelp.attachEvent("select", _handleFieldHelpSelect, this);
-			oFieldHelp.attachEvent("navigate", _handleFieldHelpNavigate, this);
+			oFieldHelp.attachEvent("navigated", _handleFieldHelpNavigated, this);
 			oFieldHelp.attachEvent("disconnect", _handleDisconnect, this);
-			oFieldHelp.attachEvent("afterClose", _handleFieldHelpAfterClose, this);
+			oFieldHelp.attachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 			oFieldHelp.attachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
+			oFieldHelp.attachEvent("closed", _handleFieldHelpAfterClose, this);
 			var aConditions = this.getConditions();
 			_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
 

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

@@ -184,10 +184,17 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	FieldBaseDelegate.getItemForValue = function(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
+//	FieldBaseDelegate.getItemForValue = function(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
+//
+//		if (oFieldHelp) {
+//			return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+//		}
+//
+//	};
+	FieldBaseDelegate.getItemForValue = function(oPayload, oFieldHelp, oConfig) {
 
 		if (oFieldHelp) {
-			return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return oFieldHelp.getItemForValue(oConfig);
 		}
 
 	};

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Base type for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -712,7 +712,7 @@ sap.ui.define([
 
 	/**
 	 * Calls initialization of the FieldHelp before the FieldHelp is really opened.
-	 * This is called in typeahead on first letter before the FieldHelp is opened with a delay. So the
+	 * This is called in Typeahead on first letter before the FieldHelp is opened with a delay. So the
 	 * content can be determined in the delegate coding early.
 	 *
 	 * <b>Note:</b> This function must only be called by the control the <code>FieldHelp</code> element
@@ -1091,7 +1091,7 @@ sap.ui.define([
 	 */
 	FieldHelpBase.prototype.isValidationSupported = function() {
 		// to be implemented by the concrete FieldHelp
-		return true;
+		return this.isUsableForValidation();
 	};
 
 	/**
@@ -1122,7 +1122,28 @@ sap.ui.define([
 	 */
 	FieldHelpBase.prototype.getItemForValue = function(vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
 
-		return _getItemForValue.call(this, vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst && bCheckKey, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+		if (typeof vValue !== "object" || !vValue.hasOwnProperty("value")) {
+			// not new config object -> map old properties to config
+			vValue = {
+					value: vValue,
+					parsedValue: vParsedValue,
+					inParameters: oInParameters, // TODO: needed?
+					outParameters: oOutParameters, // TODO: needed?
+					bindingContext: oBindingContext,
+					checkKeyFirst: bCheckKeyFirst, // TODO: not longer needed?
+					checkKey: bCheckKey,
+					checkDescription: bCheckDescription,
+					conditionModel: oConditionModel,
+					conditionModelName: sConditionModelName
+			};
+		}
+
+		if (vValue && typeof vValue === "object" && vValue.hasOwnProperty("value")) {
+			// map new Config to old API
+			return _getItemForValue.call(this, vValue.value, vValue.parsedValue, vValue.inParameters, vValue.outParameters, vValue.bindingContext, vValue.checkKeyFirst && vValue.checkKey, vValue.checkKey, vValue.checkDescription, vValue.conditionModel, vValue.conditionModelName);
+		} else {
+			return _getItemForValue.call(this, vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst && bCheckKey, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+		}
 
 	};
 
@@ -1476,6 +1497,45 @@ sap.ui.define([
 
 	}
 
+	/// renaming of functions -> call original ones
+	FieldHelpBase.prototype.isTypeaheadSupported = function() {
+		return this.openByTyping();
+	};
+	FieldHelpBase.prototype.shouldOpenOnClick = function() {
+		return this.openByClick();
+	};
+	FieldHelpBase.prototype.onControlChange = function() {
+		return this.onFieldChange();
+	};
+
+	FieldHelpBase.prototype.getAriaAttributes = function(iMaxConditions) {
+
+		return {
+			contentId: this.getContentId(),
+			ariaHasPopup: this.getAriaHasPopup(),
+			role: "combobox",
+			roleDescription: this.getRoleDescription(iMaxConditions),
+			valueHelpEnabled: this.getValueHelpEnabled()
+		};
+
+	};
+
+	FieldHelpBase.prototype.attachEvent = function(sEventId, oData, fnFunction, oListener) {
+		if (sEventId === "navigated") {
+			return Element.prototype.attachEvent.apply(this, ["navigate", oData, fnFunction, oListener]);
+		} else {
+			return Element.prototype.attachEvent.apply(this, arguments);
+		}
+	};
+
+	FieldHelpBase.prototype.detachEvent = function(sEventId, fnFunction, oListener) {
+		if (sEventId === "navigated") {
+			return Element.prototype.detachEvent.apply(this, ["navigate", fnFunction, oListener]);
+		} else {
+			return Element.prototype.detachEvent.apply(this, arguments);
+		}
+	};
+
 	return FieldHelpBase;
 
 });

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

@@ -27,10 +27,12 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class 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.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @since 1.54.0
+	 * @experimental As of version 1.54
+	 * @ui5-restricted sap.ui.mdc
 	 * @alias sap.ui.mdc.field.FieldInfoBase
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -39,7 +41,13 @@ sap.ui.define([
 		metadata: {
 			library: "sap.ui.mdc",
 			events: {
+				/**
+				 * This event is fired if the data was updated.
+				 */
 				dataUpdate: {},
+				/**
+				 * This event is fired after the popover is opened.
+				 */
 				popoverAfterOpen: {}
 			}
 		}

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Input
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @abstract
 	 * @private