@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -120,20 +120,22 @@ sap.ui.define([
 			}
 
 			var aValues = [];
-			var sOption = oOperator.name;
-			if (mLibrary.StandardDynamicDateRangeKeys.indexOf(sOption) === -1) {
-				sOption = oOperator.alias || sOption;
-			}
+			var sBaseType = _getBaseType.call(this);
+			var sOption = FilterOperatorUtil.getDynamicDateOptionForOperator(oOperator, mLibrary.StandardDynamicDateRangeKeys, sBaseType);
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
-				if (mLibrary.StandardDynamicDateRangeKeys.indexOf(sOption) >= 0 && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+				if (sOption && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
 					aValues.push(_dateToTimestamp.call(this, oCondition.values[i]));
 				} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
 					aValues.push(oCondition.values[i]);
 				}
 			}
 
-			var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+			if (!sOption) {
+				sOption = FilterOperatorUtil.getCustomDynamicDateOptionForOperator(oOperator, sBaseType);
+			}
+
+			var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
 			vResult = oDynamicDateType.formatValue({operator: sOption, values: aValues}, sInternalType);
 		}
 
@@ -141,7 +143,7 @@ sap.ui.define([
 
 	};
 
-	function _getDynamicDateType(oOperator) {
+	function _getDynamicDateType(sBaseType) {
 
 		if (!this._oDynamicDateType) {
 			var oDynamicDateFormatOptions = {
@@ -150,6 +152,11 @@ sap.ui.define([
 				},
 				"int": {}
 			};
+			if (sBaseType === BaseType.DateTime) {
+				oDynamicDateFormatOptions.datetime = {
+					source: {pattern: "timestamp"}
+				};
+			}
 
 			this._oDynamicDateType = new DynamicDateType(oDynamicDateFormatOptions);
 		}
@@ -160,12 +167,30 @@ sap.ui.define([
 	function _dateToTimestamp(vValue) {
 
 		var oType = _getInternalType.call(this);
+		var sBaseType = _getBaseType.call(this);
 		var sDate = oType.formatValue(vValue, "string");
-		var aDate = sDate.split("-");
-		var iYear = parseInt(aDate[0]);
-		var iMonth = parseInt(aDate[1]) - 1;
-		var iDate = parseInt(aDate[2]);
-		var iTimeStamp = new Date(iYear, iMonth, iDate).getTime();
+		var aParts;
+		var iHour = 0;
+		var iMinute = 0;
+		var iSecond = 0;
+		var iMillisecond = 0;
+
+		if (sBaseType === BaseType.DateTime) {
+			aParts = sDate.split("T");
+			sDate = aParts[0];
+			var sTime = aParts[1];
+			aParts = sTime.split(":");
+			iHour = parseInt(aParts[0]);
+			iMinute = parseInt(aParts[1]);
+			iSecond = parseInt(aParts[2]);
+			iMillisecond = parseInt(aParts[3]);
+		}
+
+		aParts = sDate.split("-");
+		var iYear = parseInt(aParts[0]);
+		var iMonth = parseInt(aParts[1]) - 1;
+		var iDate = parseInt(aParts[2]);
+		var iTimeStamp = new Date(iYear, iMonth, iDate, iHour, iMinute, iSecond, iMillisecond).getTime();
 
 		return iTimeStamp;
 
@@ -174,11 +199,20 @@ sap.ui.define([
 	function _timestampToDate(iTimeStamp) {
 
 		var oType = _getInternalType.call(this);
+		var sBaseType = _getBaseType.call(this);
 		var oDate = new Date(iTimeStamp);
 		var iYear = oDate.getFullYear();
 		var iMonth = oDate.getMonth() + 1;
 		var iDate = oDate.getDate();
 		var sDate = iYear.toString() + "-" + ((iMonth < 10) ? "0" : "") + iMonth.toString() + "-" + ((iDate < 10) ? "0" : "") + iDate.toString();
+
+		if (sBaseType === BaseType.DateTime) {
+			var iHour = oDate.getHours();
+			var iMinute = oDate.getMinutes();
+			var iSecond = oDate.getSeconds();
+			var iMillisecond = oDate.getMilliseconds();
+			sDate = sDate + "T" + ((iHour < 10) ? "0" : "") + iHour.toString() + ":" + ((iMinute < 10) ? "0" : "") + iMinute.toString() + ":" + ((iSecond < 10) ? "0" : "") + iSecond.toString() + ":" + ((iMillisecond < 100) ? "0" : "") + ((iMillisecond < 10) ? "0" : "") + iMillisecond.toString();
+		}
 		var vDate = oType.parseValue(sDate, "string");
 
 		return vDate;
@@ -189,7 +223,15 @@ sap.ui.define([
 
 		if (!this._oInternalType) {
 			var oType = _getValueType.call(this);
-			this._oInternalType = DateUtil.createInternalType(oType, "yyyy-MM-dd");
+			var sBaseType = _getBaseType.call(this);
+			var sPattern;
+
+			if (sBaseType === BaseType.DateTime) {
+				sPattern = "yyyy-MM-dd'T'HH:mm:ss:SSS";
+			} else {
+				sPattern = "yyyy-MM-dd";
+			}
+			this._oInternalType = DateUtil.createInternalType(oType, sPattern);
 		}
 
 		return this._oInternalType;
@@ -214,16 +256,17 @@ sap.ui.define([
 			}
 
 			var sOperator = oValue.operator; // sOperator is the Option name
-			var oOperator = FilterOperatorUtil.getOperator(sOperator); // getOperator will search via name and alias
+			var oOperator = FilterOperatorUtil.getOperatorForDynamicDateOption(sOperator, _getBaseType.call(this)); // search via name and alias
 			sOperator = oOperator.name; // map it back to the real Operator name
 
 			if (oOperator) {
-				var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+				var sBaseType = _getBaseType.call(this);
+				var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
 				var vResult = oDynamicDateType.parseValue(oValue, sInternalType);
 				var aValues = [];
 
 				for (var i = 0; i < oOperator.valueTypes.length; i++) {
-					if (mLibrary.StandardDynamicDateRangeKeys.indexOf(oValue.operator) >= 0 && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+					if (mLibrary.StandardDynamicDateRangeKeys[oValue.operator] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
 						aValues.push(_timestampToDate.call(this, vResult.values[i]));
 					} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
 						aValues.push(vResult.values[i]);
@@ -261,9 +304,9 @@ sap.ui.define([
 				throw new ValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"));
 			}
 
-			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator, aOperators);
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 
-			if (!oOperator) {
+			if (!oOperator || aOperators.indexOf(oOperator.name) === -1) {
 				throw new ValidateException("No valid condition provided, Operator wrong.");
 			}
 
@@ -299,13 +342,27 @@ sap.ui.define([
 
 		var aOperators = this.oFormatOptions.operators;
 		if (!aOperators || aOperators.length === 0) {
-			aOperators = FilterOperatorUtil.getOperatorsForType(BaseType.Date); // TODO: check for type
+			aOperators = FilterOperatorUtil.getOperatorsForType(_getBaseType.call(this));
 		}
 
 		return aOperators;
 
 	}
 
+	function _getBaseType() {
+
+		var oType = _getValueType.call(this);
+		var sType = oType.getMetadata().getName();
+		var oFormatOptions = oType.getFormatOptions();
+		var oConstraints = oType.getConstraints();
+		var oDelegate = this.oFormatOptions.delegate;
+		var oPayload = this.oFormatOptions.payload;
+		var sBaseType = oDelegate ? oDelegate.getTypeUtil(oPayload).getBaseType(sType, oFormatOptions, oConstraints) : BaseType.Date;
+
+		return sBaseType;
+
+	}
+
 	return DynamicDateRangeConditionsType;
 
 });

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.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -227,6 +227,8 @@ sap.ui.define([
 				 *
 				 * This property only affects types that support multiple lines.
 				 *
+				 * This property is only used for single-value fields.
+				 *
 				 * <b>Note</b> If the data type used doesn't support multiple lines an error is thrown.
 				 */
 				multipleLines: {
@@ -565,8 +567,6 @@ sap.ui.define([
 
 		Control.prototype.init.apply(this, arguments);
 
-		this._oManagedObjectModel = new ManagedObjectModel(this);
-
 		this._oObserver = new ManagedObjectObserver(this._observeChanges.bind(this));
 
 		this._oObserver.observe(this, {
@@ -576,8 +576,6 @@ sap.ui.define([
 			associations: ["fieldHelp", "ariaLabelledBy"]
 		});
 
-		this._oDatePickerRequested = {};
-
 		this.attachEvent("modelContextChange", this._handleModelContextChange, this);
 
 		this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
@@ -623,8 +621,10 @@ sap.ui.define([
 			_detachContentHandlers.call(this, oContentDisplay);
 		}
 
-		this._oManagedObjectModel.destroy();
-		delete this._oManagedObjectModel;
+		if (this._oManagedObjectModel) {
+			this._oManagedObjectModel.destroy();
+			delete this._oManagedObjectModel;
+		}
 
 		this._oObserver.disconnect();
 		this._oObserver = undefined;
@@ -655,19 +655,28 @@ sap.ui.define([
 		if (!this.bDelegateInitialized && !this.bDelegateLoading) {
 			this.initControlDelegate();
 		}
+		this._triggerCheckCreateInternalContent();
+
+		this._bSettingsApplied = true;
 
 		return this;
 	};
 
-	FieldBase.prototype.setProperty = function(sPropertyName, oValue, bSuppressInvalidate) {
+	FieldBase.prototype.setProperty = function(sPropertyName, vValue, bSuppressInvalidate) {
 
 		// most properties are rendered from content controls. Only invalidate whole Field if needed
-		// (multipleLines mostly changed together with editMode -> update once om rendering)
-		if (sPropertyName !== "width" && sPropertyName !== "editMode" && sPropertyName !== "multipleLines" && sPropertyName !== "showEmptyIndicator") {
+		// (multipleLines mostly changed together with editMode -> update once on rendering)
+		if (sPropertyName === "editMode") {
+			// only invalidate if switched between edit and display, not for redonly or disabled
+			var sOld = this.getEditMode();
+			if (sOld !== EditMode.Display && sOld !== EditMode.EditableDisplay && vValue !== EditMode.Display && vValue !== EditMode.EditableDisplay) {
+				bSuppressInvalidate = true;
+			}
+		} else if (sPropertyName !== "width" && sPropertyName !== "multipleLines" && sPropertyName !== "showEmptyIndicator") {
 			bSuppressInvalidate = true;
 		}
 
-		return Control.prototype.setProperty.apply(this, [sPropertyName, oValue, bSuppressInvalidate]);
+		return Control.prototype.setProperty.apply(this, [sPropertyName, vValue, bSuppressInvalidate]);
 
 	};
 
@@ -1144,6 +1153,10 @@ sap.ui.define([
 
 		if (oChanges.name === "editMode") {
 			_refreshLabel.call(this); // as required-idicator might set or removed on Label
+			if (this._bSettingsApplied && (oChanges.old === EditMode.Display || oChanges.old === EditMode.EditableDisplay || oChanges.current === EditMode.Display || oChanges.current === EditMode.EditableDisplay)) {
+				// edit mode changed after settings applied (happens if edit mode is bound and binding updates after control initialization)
+				this._triggerCheckCreateInternalContent();
+			}
 		}
 	};
 
@@ -1580,6 +1593,34 @@ sap.ui.define([
 		}
 	}
 
+	/*
+	 * Check if all needed information are provided. If possible create internal controls
+	 */
+	FieldBase.prototype._checkCreateInternalContent = function() {
+
+		if (this.getVisible() && this._oContentFactory.getDataType()) {
+			_createInternalContentWrapper.call(this);
+		}
+
+	};
+
+	/*
+	 * To be sure that the check is not called multiple times it needs
+	 * to be checked if there is a pending check.
+	 * Multiple calls might happen if properties are cheged oftten or
+	 * the chck is triggered in BindingContext update (what is often called in propagation).
+	 */
+	FieldBase.prototype._triggerCheckCreateInternalContent = function() {
+
+		if (!this._oCheckCreateInternalContentPromise) {
+			this._oCheckCreateInternalContentPromise = this.awaitControlDelegate().then(function() {
+				delete this._oCheckCreateInternalContentPromise;
+				this._checkCreateInternalContent();
+			}.bind(this));
+		}
+
+	};
+
 	function _createInternalContent() {
 		var sEditMode = this.getEditMode();
 		var oContent = this.getContent();
@@ -1648,6 +1689,7 @@ sap.ui.define([
 					var oControl = aControls[iIndex];
 					oControl.attachEvent("parseError", _handleParseError, this);
 					oControl.attachEvent("validationError", _handleValidationError, this);
+					oControl.attachEvent("validationSuccess", _handleValidationSuccess, this);
 					_modifyKeyboardHandler.call(this, oControl, oContentType.getUseDefaultEnterHandler());
 					_modifyFieldGroupHandler.call(this, oControl, false);
 					_setModelOnContent.call(this, oControl);
@@ -1658,6 +1700,7 @@ sap.ui.define([
 				}
 
 				_refreshLabel.call(this);
+				delete this._oCreateContentPromise; // after finished new creation request can be sync again
 			}.bind(this));
 		}
 	}
@@ -1695,6 +1738,9 @@ sap.ui.define([
 	};
 
 	function _setModelOnContent(oContent) {
+		if (!this._oManagedObjectModel && !this._bIsBeingDestroyed) {
+			this._oManagedObjectModel = new ManagedObjectModel(this);
+		}
 		oContent.setModel(this._oManagedObjectModel, "$field");
 	}
 
@@ -1960,6 +2006,12 @@ sap.ui.define([
 
 	}
 
+	function _handleValidationSuccess(oEvent) {
+
+		this._bParseError = false; // if last valif value is entered again no condition is updated
+
+	}
+
 	function _handleContentChange(oEvent) {
 
 		var oChangeEvent = { parameters: merge({}, oEvent.getParameters()), source: oEvent.getSource() };
@@ -2536,6 +2588,7 @@ sap.ui.define([
 			aConditions.splice(0, aConditions.length - iMaxConditions);
 		}
 
+		var bChangeAfterError = false;
 		if (oContent && oContent.setDOMValue) {
 			if (this.getMaxConditionsForHelp() === 1 && aConditions.length > 0) {
 				// the focus is still in the Field. The update of the inner control is done via ManagedObjectModel binding.
@@ -2576,6 +2629,7 @@ sap.ui.define([
 			if (this._bParseError) { // only remove messages set by Field itself, message from outside should stay.
 				this._bParseError = false;
 				this._removeUIMessage();
+				bChangeAfterError = true;
 			}
 		}
 
@@ -2592,6 +2646,8 @@ sap.ui.define([
 
 				_triggerChange.call(this, aConditions, true);
 			}
+		} else if (bChangeAfterError) { // last valif value choosen again
+			_triggerChange.call(this, aConditions, true);
 		}
 
 	}
@@ -2698,6 +2754,7 @@ sap.ui.define([
 			var oContent = this.getControlForSuggestion();
 			this._bIgnoreInputValue = false;
 			oContent.setDOMValue("");
+			this._sFilterValue = "";
 			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();
@@ -2706,6 +2763,11 @@ sap.ui.define([
 
 		_setAriaAttributes.call(this, false);
 
+		// sync conditions with FieldHelp as we cannot e sure that it still is in sync
+		var oFieldHelp = oEvent.getSource();
+		var aConditions = this.getConditions();
+		_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
+
 	}
 
 	function _handleFieldSwitchToValueHelp(oEvent) {
@@ -2728,7 +2790,8 @@ sap.ui.define([
 		//		// also in display mode to get right text
 		//		_handleConditionsChange.call(this, this.getConditions());
 		if (!isEditing && !this._bPendingConditionUpdate && this.getConditions().length > 0 &&
-			(this.getMaxConditions() !== 1 || (this.getDisplay() !== FieldDisplay.Value && !this._bParseError))) {
+			(this.getMaxConditions() !== 1 || (this.getDisplay() !== FieldDisplay.Value && !this._bParseError))
+			&& this._oManagedObjectModel) {
 			// update tokens in MultiValue
 			// update text/value only if no parse error, otherwise wrong value would be removed
 			// don't update if contidions are outdated (updated async in Field)
@@ -2764,7 +2827,8 @@ sap.ui.define([
 					delegateName: this.getDelegate() && this.getDelegate().name,
 					payload: this.getPayload(),
 					conditionModel: oConditionModelInfo.model,
-					conditionModelName : oConditionModelInfo.name
+					conditionModelName: oConditionModelInfo.name,
+					defaultOperatorName: this.getDefaultOperator ? this.getDefaultOperator() : null
 			};
 			oFieldHelp.connect(this, oConfig);
 			this._bConnected = true;
@@ -2885,8 +2949,9 @@ sap.ui.define([
 			payload: this.getPayload(),
 			preventGetDescription: this._bPreventGetDescription,
 			conditionModel: oConditionModelInfo.model,
-			conditionModelName : oConditionModelInfo.name,
-			defaultOperatorName : this.getDefaultOperator ? this.getDefaultOperator() : null
+			conditionModelName: oConditionModelInfo.name,
+			defaultOperatorName: this.getDefaultOperator ? this.getDefaultOperator() : null,
+			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getMaxConditions() !== 1 // also replace whitespaces in tokens
 		};
 
 	};
@@ -2961,7 +3026,8 @@ sap.ui.define([
 			preventGetDescription: this._bPreventGetDescription,
 			conditionModel: oConditionModelInfo.model,
 			conditionModelName : oConditionModelInfo.name,
-			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
+			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getEditMode() === EditMode.EditableDisplay
 		};
 
 	};
@@ -3131,6 +3197,17 @@ sap.ui.define([
 
 	}
 
+	FieldBase.prototype._isPropertyInitial = function(sPropertyName) {
+
+		// as bound propertys are never initial even if there is no existing binding right now check the binding too
+		if (this.isBound(sPropertyName) && !this.getBinding(sPropertyName)) {
+			return !Object.prototype.hasOwnProperty.call(this.mProperties, sPropertyName);
+		} else {
+			return this.isPropertyInitial(sPropertyName);
+		}
+
+	};
+
 	return FieldBase;
 
 });

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

@@ -98,7 +98,7 @@ sap.ui.define([
 	 * This function enhances the value with unit or currency information if needed by the data type.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {any[]} aValues Value
+	 * @param {any[]} aValue Value
 	 * @param {object} oTypeInitialization Information needed to initialize internal type
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase

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

@@ -15,9 +15,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// initialize the Icon Pool
-	IconPool.insertFontFaceStyle();
-
 	/**
 	 * FieldBase renderer.
 	 * @namespace

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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -962,7 +962,7 @@ sap.ui.define([
 	 * @type {sap.ui.mdc.field.FieldHelpItem}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.ui.mdc.field.FieldHelpItem
+	 * @typedef {object} sap.ui.mdc.field.FieldHelpItem
 	 * @property {any} key Key of the item
 	 * @property {string} description Description of the item
 	 * @property {object} [inParameters] In parameters of the item. For each field path a value is stored

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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0
@@ -99,17 +99,21 @@ sap.ui.define([
 		if (this._oPopover && this._oPopover.isOpen()) {
 			return Promise.resolve();
 		}
-		return this.createPopover().then(function(oPopover) {
-			// Note: it is not needed to destroy this._oPopover in exit as through addDependent() the popover
-			// instance will be automatically destroyed once the FieldInfoBase instance is destroyed.
-			this._oPopover = oPopover;
+		return this.checkDirectNavigation().then(function(bNavigated) {
+			return bNavigated ? Promise.resolve() : this.createPopover().then(function(oPopover) {
+				if (oPopover) {
+					// Note: it is not needed to destroy this._oPopover in exit as through addDependent() the popover
+					// instance will be automatically destroyed once the FieldInfoBase instance is destroyed.
+					this._oPopover = oPopover;
 
-			this.addDependent(this._oPopover);
+					this.addDependent(this._oPopover);
 
-			this._oPopover.openBy(oControl || oParent);
+					this._oPopover.openBy(oControl || oParent);
 
-			this._oPopover.attachAfterOpen(function() {
-				this.firePopoverAfterOpen();
+					this._oPopover.attachAfterOpen(function() {
+						this.firePopoverAfterOpen();
+					}.bind(this));
+				}
 			}.bind(this));
 		}.bind(this));
 	};
@@ -125,9 +129,19 @@ sap.ui.define([
 		throw new Error("sap.ui.mdc.field.FieldInfoBase: method getContent must be redefined");
 	};
 
+	/**
+	 * Checks if there is a direct navigation or if there is a popover to be opened.
+	 * @returns {Promise} Resolves a Boolean value
+	 * @protected
+	 */
+	FieldInfoBase.prototype.checkDirectNavigation = function() {
+		throw new Error("sap.ui.mdc.field.FieldInfoBase: method checkDirectNavigation must be redefined");
+	};
+
 	// ----------------------- Protected methods --------------------------------------------
 
 	/**
+	 * Returns the parent control.
 	 * @returns {sap.ui.mdc.Field} <code>Field</code> control
 	 * @protected
 	 */
@@ -144,10 +158,10 @@ sap.ui.define([
 	 */
 	FieldInfoBase.prototype.createPopover = function() {
 		var oPopover;
+
 		return this.getContent(function () {
 			return oPopover;
 		}).then(function(oPanel) {
-
 			oPopover = new ResponsivePopover(this.getId() + "-popover", {
 				contentWidth: "380px",
 				horizontalScrolling: false,

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.97.1
+	 * @version 1.100.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.97.1
+	 * @version 1.100.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.97.1
+	 * @version 1.100.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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -1832,6 +1832,9 @@ sap.ui.define([
 								// ignore empty conditions for filtering
 								oHelpParameters[sHelpPath] = [];
 								if (bUseConditions) { // just use conditions
+									if (!vValue) {
+										vValue = []; // if ConditionModel Binding not initilaized in the moment
+									}
 									for (j = 0; j < vValue.length; j++) {
 										oCondition = merge({}, vValue[j]);
 										// change paths of in- and out-parameters
@@ -2411,6 +2414,7 @@ sap.ui.define([
 
 	function _handleDialogAfterClose(oEvent) {
 
+		var aConditions = this.getConditions(); // get conditions here as they might be modified in a close handler
 		this._bDialogOpen = false;
 		this._aOldConditions = undefined;
 
@@ -2419,7 +2423,6 @@ sap.ui.define([
 		if (this._bOK) {
 			// fire select event after Dialog is closed because inside applyFocusInfo is called
 			// that might reset cursor and selection of field -> update it after this
-			var aConditions = this.getConditions();
 			this.fireSelect({conditions: aConditions, add: false, close: true});
 		}
 		this._bOK = undefined;

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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -149,7 +149,7 @@ sap.ui.define([
 	 * <code>FieldValueHelp</code> needs to wait.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.model.ListBinding} oListBindings <code>ListBinding</code> to check
+	 * @param {sap.ui.model.ListBinding} oListBinding <code>ListBinding</code> to check
 	 * @returns {boolean|Promise<boolean>} <code>Promise</code> that is resolved once <code>ListBinding</code> has been updated
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldvalueHelp, sap.ui.mdc.field.FieldValueHelpMTableWrapper