@openui5/sap.ui.mdc 1.94.0 → 1.95.0

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.94.0
+	 * @version 1.95.0
 	 *
 	 * @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,7 +776,7 @@ 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;
@@ -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,12 @@ sap.ui.define([
 
 	};
 
+	FieldBase.prototype.getFocusElementForValueHelp = function(bTypahead) {
+		var oSuggestControl = this.getControlForSuggestion();
+		var oIcon = oSuggestControl && oSuggestControl.mAggregations && oSuggestControl.mAggregations._endIcon && oSuggestControl.mAggregations._endIcon[0];
+		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 +1338,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 +1672,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 +2002,7 @@ sap.ui.define([
 
 		if (bUpdateConditions) {
 			// text typed in MultiInput
-			_removeUIMessage.call(this);
+			this._removeUIMessage();
 			var oConditionType;
 			var oMyChange;
 
@@ -2001,6 +2010,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 +2083,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 +2154,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 +2244,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 +2262,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 +2350,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 +2377,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);
+				}
 			}
 		}
 
@@ -2531,7 +2547,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 +2561,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 +2574,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 +2582,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();
@@ -2636,9 +2660,11 @@ sap.ui.define([
 					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 +2684,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 +2727,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 +2740,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);
 
@@ -2813,6 +2857,7 @@ sap.ui.define([
 		return {
 			valueType: this._oContentFactory.retrieveDataType(),
 			originalDateType: this._oContentFactory.getDateOriginalType() || this._oContentFactory.getUnitOriginalType(),
+			additionalType: this._oContentFactory.getUnitType(), // only set if unit
 			display: this._oContentFactory.isMeasure() ? FieldDisplay.Value : this.getDisplay(),
 			fieldHelpID: this._oContentFactory.isMeasure() ? undefined : this.getFieldHelp() || this._sDefaultFieldHelp,
 			operators: this._getOperators(),
@@ -2886,7 +2931,8 @@ sap.ui.define([
 
 		return {
 			valueType: this._oContentFactory.getUnitType(),
-			originalDateType: this._oContentFactory.retrieveDataType(), // use type of measure for currentValue
+			originalDateType: this._oContentFactory.getDateOriginalType() || this._oContentFactory.getUnitOriginalType(),
+			additionalType: this._oContentFactory.retrieveDataType(), // use type of measure for currentValue
 			display: this.getDisplay(),
 			fieldHelpID: this.getFieldHelp() || this._sDefaultFieldHelp,
 			operators: ["EQ"],

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.94.0
+	 * @version 1.95.0
 	 * @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,7 +27,7 @@ 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.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

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.94.0
+	 * @version 1.95.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.94.0
+	 * @version 1.95.0
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

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

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

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a value help dialog.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -1369,6 +1369,10 @@ sap.ui.define([
 				if (oWrapper) {
 					var oValueHelpPanel = oDialog.getContent()[0];
 					_setContentOnValueHelpPanel.call(this, oValueHelpPanel, oWrapper.getDialogContent());
+					if (!this._bApplyFilter && !this._bClosing && (this.isOpen() || this._bOpen) && !oWrapper.isSuspended()) {
+						// in case ListBinding changed or is not longer suspended
+						this._bApplyFilter = true;
+          }
 				}
 			}
 		}
@@ -2601,6 +2605,8 @@ sap.ui.define([
 					liveMode: !oWrapper.isSuspended(), // if suspended, no live search
 					showGoButton: false
 				});
+				oFilterBar.setInternalConditions(this._oConditions); // if already InParameter or SearchValue set, move it to FilterBar
+				this._oConditions = {};
 				this.setAggregation("_filterBar", oFilterBar, true);
 			}
 

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>FieldValueHelp</code> content control wrapper.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a table control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpContentWrapperBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @experimental As of version 1.88

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>InParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a list of items.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>OutParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.mdc.field.InParameter
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel