@openui5/sap.ui.mdc 1.96.1 → 1.97.1

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -100,6 +100,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"],
+			designtime: "sap/ui/mdc/designtime/field/FieldBase.designtime",
 			library: "sap.ui.mdc",
 			properties: {
 				/**
@@ -725,30 +726,34 @@ sap.ui.define([
 
 	FieldBase.prototype.onsapup = function(oEvent) {
 
-		var oFieldHelp = _getFieldHelp.call(this);
-		var oSource = oEvent.srcControl;
+		if (this.getEditMode() === EditMode.Editable) {
+			var oFieldHelp = _getFieldHelp.call(this);
+			var oSource = oEvent.srcControl;
 
-		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
-			oFieldHelp.navigate(-1);
+			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
+				oFieldHelp.navigate(-1);
+			}
 		}
 
 	};
 
 	FieldBase.prototype.onsapdown = function(oEvent) {
 
-		var oFieldHelp = _getFieldHelp.call(this);
-		var oSource = oEvent.srcControl;
+		if (this.getEditMode() === EditMode.Editable) {
+			var oFieldHelp = _getFieldHelp.call(this);
+			var oSource = oEvent.srcControl;
 
-		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
-			oFieldHelp.navigate(1);
+			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
+				oFieldHelp.navigate(1);
+			}
 		}
 
 	};
@@ -1044,12 +1049,6 @@ sap.ui.define([
 	 */
 	FieldBase.prototype._observeChanges = function(oChanges) {
 
-		var fnUpdateInternalContent = function() {
-			if (this.getAggregation("_content", []).length > 0) {
-					_createInternalContentWrapper.call(this);
-			}
-		};
-
 		if (oChanges.name === "dataType") {
 			// check only if different type (in Field type might be already taken from binding)
 			if (this._oContentFactory.getDataType()) {
@@ -1081,8 +1080,7 @@ sap.ui.define([
 		}
 
 		if (oChanges.name === "maxConditions") {
-			fnUpdateInternalContent.call(this);
-			this._oContentFactory.updateConditionType();
+			this._updateInternalContent();
 		}
 
 		if (oChanges.name === "conditions") {
@@ -1111,7 +1109,7 @@ sap.ui.define([
 		}
 
 		if (oChanges.name === "display") {
-			_destroyInternalContent.call(this); // as bound property can change
+			this._destroyInternalContent(); // as bound property can change
 			this._oContentFactory.updateConditionType();
 		}
 
@@ -1149,6 +1147,14 @@ sap.ui.define([
 		}
 	};
 
+	// to allow Field or FilterField trigger and update if content control
+	FieldBase.prototype._updateInternalContent = function() {
+		if (this.getAggregation("_content", []).length > 0) {
+			_createInternalContentWrapper.call(this);
+			this._oContentFactory.updateConditionType(); // if control is not excanged at least ConditionType needs to be updated
+		}
+	};
+
 	// return the focus DOM elementof the used control
 	FieldBase.prototype.getFocusDomRef = function() {
 
@@ -1210,7 +1216,7 @@ sap.ui.define([
 
 	FieldBase.prototype.getFocusElementForValueHelp = function(bTypahead) {
 		var oSuggestControl = this.getControlForSuggestion();
-		var aIcons = oSuggestControl && oSuggestControl.getMetadata().getAllPrivateAggregations()._endIcon && oSuggestControl.getAggregation("_endIcon");
+		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()) {
@@ -1432,7 +1438,7 @@ sap.ui.define([
 			// bind to ManagedObjectModel at rendering to prevent unneded updates
 
 			if (this.getAggregation("_content", []).length > 0) {
-				_destroyInternalContent.call(this);
+				this._destroyInternalContent();
 			}
 
 			// as for edit and display different Types are possible switch them with edit mode
@@ -1586,7 +1592,7 @@ sap.ui.define([
 		if (oContent || this._bIsBeingDestroyed ||
 			(sEditMode === EditMode.Display && this.getContentDisplay()) ||
 			(sEditMode !== EditMode.Display && this.getContentEdit())) {
-			_destroyInternalContent.call(this);
+			this._destroyInternalContent();
 			var aContent = this._getContent(); // external set content
 			if (aContent.length === 1) {
 				_setModelOnContent.call(this, aContent[0]); // bind to ManagedObjectModel
@@ -1618,7 +1624,7 @@ sap.ui.define([
 			this._oContentFactory.setHideOperator(_isOnlyOneSingleValue.call(this, aOperators)); // in single value eq Field hide operator
 
 			if (oContentOld) {
-				_destroyInternalContent.call(this);
+				this._destroyInternalContent();
 
 				if (oContentOld.isA("sap.m.DateTimeField")) {
 					// in case of DatePicker remove type with special format options
@@ -1662,7 +1668,7 @@ sap.ui.define([
 
 	}
 
-	function _destroyInternalContent() {
+	FieldBase.prototype._destroyInternalContent = function () {
 
 		// if the internalContent must be new created the data type must be switched back to original one
 		// so new creation of control is using original data
@@ -1686,7 +1692,7 @@ sap.ui.define([
 			this._oContentFactory.setIsMeasure(false);
 		}
 
-	}
+	};
 
 	function _setModelOnContent(oContent) {
 		oContent.setModel(this._oManagedObjectModel, "$field");
@@ -1870,23 +1876,26 @@ sap.ui.define([
 
 	function _useDefaultFieldHelp(oContentType, aOperators, sEditMode, iMaxConditions) {
 
-		if (oContentType.getUseDefaultFieldHelp() && !this.getFieldHelp() && sEditMode !== EditMode.Display) {
-			if (aOperators.length === 1) {
-				var bIsSingleValue = _isOnlyOneSingleValue.call(this, aOperators); // if operator not exists unse no field help
-				// not if operator is handled by special control (like DatePicker)
-				if (iMaxConditions === 1) {
-					if (!(oContentType.getEditOperator() && oContentType.getEditOperator()[aOperators[0]]) &&
-						(oContentType.getUseDefaultFieldHelp().oneOperatorSingle || !bIsSingleValue)) {
-						// "bool" case (always default field help) or operator needs more than one value (e.g. between)
+		var oUseDefaultFieldHelp = oContentType.getUseDefaultFieldHelp();
+		if (oUseDefaultFieldHelp && !this.getFieldHelp() && sEditMode !== EditMode.Display) {
+			if ((iMaxConditions === 1 && oUseDefaultFieldHelp.single) || (iMaxConditions !== 1 && oUseDefaultFieldHelp.multi)) {
+				if (aOperators.length === 1) {
+					var bIsSingleValue = _isOnlyOneSingleValue.call(this, aOperators); // if operator not exists unse no field help
+					// not if operator is handled by special control (like DatePicker)
+					if (iMaxConditions === 1) {
+						if (!(oContentType.getEditOperator() && oContentType.getEditOperator()[aOperators[0]]) &&
+								(oUseDefaultFieldHelp.oneOperatorSingle || !bIsSingleValue)) {
+							// "bool" case (always default field help) or operator needs more than one value (e.g. between)
+							return true;
+						}
+					} else if (oUseDefaultFieldHelp.oneOperatorMulti || !bIsSingleValue) {
+						// DatePicker case - in multi-value use default help to get DatePicker controls
 						return true;
 					}
-				} else if (oContentType.getUseDefaultFieldHelp().oneOperatorMulti || !bIsSingleValue) {
-					// DatePicker case - in multi-value use default help to get DatePicker controls
+				} else {
+					// multiple operators -> default help needed
 					return true;
 				}
-			} else {
-				// multiple operators -> default help needed
-				return true;
 			}
 		}
 
@@ -2200,8 +2209,6 @@ sap.ui.define([
 			vPreviousValue = aConditions[0] && aConditions[0].values[0];
 		}
 
-		this._bParseError = false; // last parsing result is obsolete if user starts typing
-
 		var oFieldHelp = _getFieldHelp.call(this);
 
 		if (oFieldHelp && (!this._oContentFactory.isMeasure() || oSource.getShowValueHelp())) {

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

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

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

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

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

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

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

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -648,11 +648,11 @@ sap.ui.define([
 
 				if (oWrapper) {
 					oWrapper.fieldHelpOpen(false);
-						_updateSelectedItems.call(this);
-					}
-					this._aOldConditions = this.getConditions();
-					oDialog.open();
-					this._bDialogOpen = true; // to know already during opening animation
+					_updateSelectedItems.call(this);
+				}
+				this._aOldConditions = this.getConditions();
+				oDialog.open();
+				this._bDialogOpen = true; // to know already during opening animation
 			} else {
 				this._bOpen = true;
 			}

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -75,6 +75,26 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Changes the search string.
+	 *
+	 * If <code>$search</code> is used, depending on which back-end service is used, the search string might need to be escaped.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {boolean} bTypeahead <code>true</code> if the search is called for a type-ahead
+	 * @param {string} sSearch Search string
+	 * @returns {string} Search string to use
+	 * @since 1.97.0
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	 FieldValueHelpDelegate.adjustSearch = function(oPayload, bTypeahead, sSearch) {
+
+		return sSearch;
+
+	};
+
 	/**
 	 * Executes a filter in a <code>ListBinding</code>.
 	 *

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @experimental As of version 1.88
@@ -561,6 +561,7 @@ sap.ui.define([
 				oListBinding.suspend();
 			}
 
+			sSearch = oDelegate.delegate.adjustSearch(oDelegate.payload, this._bSuggestion, sSearch);
 			oDelegate.delegate.executeSearch(oDelegate.payload, oListBinding, sSearch);
 			Log.info("ValueHelp-Search: " + sSearch);
 		}

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

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

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

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel
@@ -124,6 +124,7 @@ sap.ui.define([
 
 			if (!this._oTokenizer) {
 				this._oTokenizer = this.byId("VHPTokenizer");
+				this._oTokenizer.addAriaDescribedBy( this._oTokenizer.getTokensInfoId());
 				this._oTokenizer._oScroller.setHorizontal(true);
 			}
 			this._oTokenizerPanel = this.byId("VHPTokenizerPanel");

package/src/sap/ui/mdc/field/content/BooleanContent.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -34,7 +34,7 @@ sap.ui.define([
 			return [null];
 		},
 		getUseDefaultFieldHelp: function() {
-			return { name: "bool", oneOperatorSingle: true, oneOperatorMulti: true };
+			return { name: "bool", oneOperatorSingle: true, oneOperatorMulti: true, single: true, multi: true };
 		},
 		createEditMultiValue: function() {
 			throw new Error("sap.ui.mdc.field.content.BooleanContent - createEditMultiValue not defined!");