@openui5/sap.ui.mdc 1.115.1 → 1.117.0

package/.reuse/dep5

@@ -457,11 +457,6 @@ Comment: these files belong to: UI5 Web Components
 
 # Outside of Libraries:
 
-Files: src/testsuite-utils/src/main/resources/META-INF/less/less.js
-Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
-License: Apache-2.0
-Comment: these files belong to: LESS
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors

package/THIRDPARTY.txt

@@ -460,19 +460,13 @@ Contained in: src/sap.ui.webc.main/src/sap/ui/webc/main/thirdparty/*.*
 
 Outside of Libraries:
 
-Component: LESS, version: 1.6.3
-Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.3.0
+Component: SAP Theming Base Content, version: 11.4.2
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.mdc",
-  "version": "1.115.1",
+  "version": "1.117.0",
   "description": "OpenUI5 UI Library sap.ui.mdc",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.115.1",
-    "@openui5/sap.ui.core": "1.115.1",
-    "@openui5/sap.ui.layout": "1.115.1"
+    "@openui5/sap.m": "1.117.0",
+    "@openui5/sap.ui.core": "1.117.0",
+    "@openui5/sap.ui.layout": "1.117.0"
   }
 }

package/src/sap/ui/mdc/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.115.1</version>
+	<version>1.117.0</version>
 
 	<documentation>UI5 library: sap.ui.mdc</documentation>
 

package/src/sap/ui/mdc/ActionToolbar.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class The column for the metadata driven table, that hold the template to be shown when the rows has data.
 	 * @extends sap.m.OverflowToolbar
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @constructor
 	 * @since 1.58
 	 * @public

package/src/sap/ui/mdc/AggregationBaseDelegate.js

@@ -23,9 +23,12 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 	 *
 	 * @author SAP SE
 	 *
+	 * @namespace
+	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.82.0
-	 * @alias sap.ui.mdc.AggregationBaseDelegate
+	 * @alias module:sap/ui/mdc/AggregationBaseDelegate
+	 * @extends module:sap/ui/mdc/BaseDelegate
 	 */
 	var AggregationBaseDelegate = Object.assign({}, BaseDelegate, {
 
@@ -83,7 +86,7 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 		/**
 		 * A validator to evaluate the theoretical control state.
 		 *
-		 * @param {sap.ui.mdc.Control} oControl Instance of a <code>sap.ui.mdc.Control</code>
+		 * @param {sap.ui.mdc.Control} oControl Instance of an <code>sap.ui.mdc.Control</code>
 		 * @param {Object} oState The theoretical external state representation of an MDC control. The representation of this format is similar as processed by {@link sap.ui.mdc.p13n.StateUtil StateUtil}
 		 * @returns {Object} An object that must contain at least the <code>validation</code> attribute {@link sap.ui.core.MessageType MessageType}.
 		 * If <code>warning</code> or <code>error</code> state types have been provided, the <code>message</code> is shown in addition.
@@ -111,18 +114,17 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 		},
 
 		/**
-		 * A validator to evaluate the state of a MDC control.
+		 * A validator to evaluate the state of an MDC control.
 		 *
-		 * @param {Object<sap.ui.mdc.Control>} oControl Instance of a MDC control
+		 * @param {sap.ui.mdc.Control} oControl Instance of a MDC control
 		 * @param {map} [mValidation] Object Describing the validation result
-
 		 */
 		determineValidationState: function(oControl) {
             return oControl.checkValidationState ? oControl.checkValidationState() : -1;
 		},
 
 		/**
-		 * Visualizes the validation state of a MDC control.
+		 * Visualizes the validation state of an MDC control.
 		 *
 		 * @param {Object<sap.ui.mdc.Control>} oControl Instance of a MDC control
 		 * @returns {map} mValidation Describes the validation result.

package/src/sap/ui/mdc/BaseDelegate.js

@@ -6,7 +6,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// sap.ui.mdc.BaseDelegate
+// module:sap/ui/mdc/BaseDelegate
 sap.ui.define(['sap/ui/mdc/enums/BaseType', 'sap/ui/mdc/DefaultTypeMap', "sap/base/Log"], function (BaseType, DefaultTypeMap, Log) {
 	"use strict";
 
@@ -14,7 +14,7 @@ sap.ui.define(['sap/ui/mdc/enums/BaseType', 'sap/ui/mdc/DefaultTypeMap', "sap/ba
 	 * Basic Delegate for {@link sap.ui.mdc.Control}, {@link sap.ui.mdc.Element}<br>
 	 *
 	 * All delegate implementations for MDC controls must be derived directly or indirectly from this entity.
-	 * Applications should implement {@link sap.ui.mdc.BaseDelegate.getTypeMap getTypeMap} to provide type mappings based on their model usage.
+	 * Applications should implement {@link module:sap/ui/mdc/BaseDelegate.getTypeMap getTypeMap} to provide type mappings based on their model usage.
 	 * Please also see the following extensible presets: {@link sap.ui.mdc.DefaultTypeMap}, {@link sap.ui.mdc.odata.TypeMap}, {@link sap.ui.mdc.odata.v4.TypeMap}
 	 *
 	 * @namespace
@@ -29,9 +29,9 @@ sap.ui.define(['sap/ui/mdc/enums/BaseType', 'sap/ui/mdc/DefaultTypeMap', "sap/ba
 	* Returns a TypeUtil for this delegate.
 	*
 	* @param {sap.ui.mdc.Control} oControl Delegate payload object
-	* @return {sap.ui.mdc.util.TypeUtil|sap.ui.mdc.util.TypeMap} configured TypeUtil/TypeMap
+	* @return {sap.ui.mdc.util.TypeUtil|module:sap/ui/mdc/util/TypeMap} configured TypeUtil/TypeMap
 	* @since 1.79.0
-	* @deprecated (since 1.115.0) - please see {@link #getTypeMap}
+	* @deprecated since 1.115.0 - please see {@link #getTypeMap}
 	*
 	*/
 	BaseDelegate.getTypeUtil = function (oControl) {
@@ -48,7 +48,7 @@ sap.ui.define(['sap/ui/mdc/enums/BaseType', 'sap/ui/mdc/DefaultTypeMap', "sap/ba
 	 * Returns the typeutil configuration for this delegate.
 	 *
 	 * @param {sap.ui.mdc.Control} oControl Delegate payload object
-	 * @return {sap.ui.mdc.util.TypeMap} typeMap configuration for this delegate
+	 * @return {module:sap/ui/mdc/util/TypeMap} typeMap configuration for this delegate
 	 * Note: The returned array will also serve as a key in the weakmap-based typeutil cache of BaseDelegate
 	 * @since 1.114.0
 	 * @public

package/src/sap/ui/mdc/Chart.js

@@ -67,7 +67,7 @@ sap.ui.define([
          * <b>Note:</b> The inner chart needs to be assigned <code>ChartDelegate</code>.
          * @extends sap.ui.mdc.Control
          * @author SAP SE
-         * @version 1.115.1
+         * @version 1.117.0
          * @constructor
          *
          * @public
@@ -434,7 +434,7 @@ sap.ui.define([
 	 * @property {string} [tooltip]
 	 *   The tooltip of the identifier
 	 * @property {string} datatype
-	 *   The name of the type of the property
+	 *   The name of the data type of the property
 	 * @property {object} [constraints]
 	 *   Defines constraints for the data type of the property
 	 * @property {object} [formatOptions]
@@ -832,8 +832,11 @@ sap.ui.define([
 
         /**
          * Rebinds the inner chart instance by calling oDelegate.rebind
-         */
-        Chart.prototype._rebind = function () {
+		 *
+		 * @param {boolean} [bForceRefresh] Indicates that the binding must be refreshed regardless of any <code>bindingInfo</code> change
+		 * @private
+		 */
+        Chart.prototype._rebind = function (bForceRefresh) {
 
             if (!this._bInnerChartReady) {
                 //TODO: This can lead to a race conditition when the "Go" button is pressed while the inner chart still intializes
@@ -842,7 +845,7 @@ sap.ui.define([
 
                 //Wait with rebind until inner chart is ready
                 this.initialized().then(function () {
-                    this._rebind();
+                    this._rebind(bForceRefresh);
                 }.bind(this));
                 return;
             }
@@ -874,7 +877,7 @@ sap.ui.define([
         Chart.prototype._getToolbar = function () {
             if (this.getAggregation("_toolbar")) {
                 return this.getAggregation("_toolbar");
-            } else {
+            } else if (!this._bIsDestroyed){
                 var oToolbar = new ChartToolbar(this.getId() + "--toolbar", {
                     design: "Transparent"
                 });

package/src/sap/ui/mdc/ChartDelegate.js

@@ -287,7 +287,7 @@ sap.ui.define([
 
 
 	/**
-	 * Char <code>ChartTypeLayoutConfig</code> type.
+	 * Chart <code>ChartTypeLayoutConfig</code> type.
 	 *
 	 * @typedef {object} sap.ui.mdc.chart.ChartTypeLayoutConfig
 	 * @property {string} key identifier for the chart type
@@ -347,7 +347,7 @@ sap.ui.define([
 	/**
 	 * Sets the chart type of the inner chart.
 	 * This function is called by the chart when the <code>chartType</code> property is updated.
-	 *  <b>Note:</b> This function is called by the chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setChartType setChartType} instead.
+	 * <b>Note:</b> This function is called by the chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#chartType chartType} instead.
 	 *
 	 * @param {string} sChartType New chart type
 	 *

package/src/sap/ui/mdc/Control.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

package/src/sap/ui/mdc/DefaultTypeMap.js

@@ -17,19 +17,19 @@ sap.ui.define([
 	* <b>Note:</b> This <code>TypeMap</code> implementation contains the following types:
 	*
 	* <ul>
-	* <li>sap.ui.model.type.Boolean (alias Boolean)</li>
-	* <li>sap.ui.model.type.Currency (alias Currency)</li>
-	* <li>sap.ui.model.type.Date (alias Date)</li>
-	* <li>sap.ui.model.type.DateTime (alias DateTime)</li>
-	* <li>sap.ui.model.type.Float (alias Float)</li>
-	* <li>sap.ui.model.type.Integer (alias Integer)</li>
-	* <li>sap.ui.model.type.String (alias String)</li>
-	* <li>sap.ui.model.type.Time (alias Time)</li>
-	* <li>sap.ui.model.type.Unit (alias Unit)</li>
+	* <li>{@link sap.ui.model.type.Boolean} (alias <code>Boolean</code>)</li>
+	* <li>{@link sap.ui.model.type.Currency} (alias <code>Currency</code>)</li>
+	* <li>{@link sap.ui.model.type.Date} (alias <code>Date</code>)</li>
+	* <li>{@link sap.ui.model.type.DateTime} (alias <code>DateTime</code>)</li>
+	* <li>{@link sap.ui.model.type.Float} (alias <code>Float</code>)</li>
+	* <li>{@link sap.ui.model.type.Integer} (alias <code>Integer</code>)</li>
+	* <li>{@link sap.ui.model.type.String} (alias <code>String</code>)</li>
+	* <li>{@link sap.ui.model.type.Time} (alias <code>Time</code>)</li>
+	* <li>{@link sap.ui.model.type.Unit} (alias <code>Unit</code>)</li>
 	* </ul>
 	*
 	* @author SAP SE
-	* @version 1.115.1
+	* @version 1.117.0
 	* @public
 	* @since 1.114.0
 	* @namespace

package/src/sap/ui/mdc/Element.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

package/src/sap/ui/mdc/Field.js

@@ -52,11 +52,11 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @since 1.54.0
 	 *
 	 * @public
@@ -142,7 +142,7 @@ sap.ui.define([
 		this.setProperty("_operators", ["EQ"], true);
 
 		this._oObserver.observe(this, {
-			properties: ["value", "additionalValue"]
+			properties: ["value", "additionalValue", "valueState"]
 		});
 
 	};
@@ -285,6 +285,13 @@ sap.ui.define([
 			_triggerConditionUpdate.call(this);
 		}
 
+		if (oChanges.name === "valueState") {
+			// if condition update is pending do not remove the value state later if set before from outside
+			if (this._bPendingConditionUpdate) {
+				this._bKeepValueState = true;
+			}
+		}
+
 		if (oChanges.name === "conditions") {
 			// keep value/additionalValue and conditions in sync
 			// (value must be updated if conditions are changed in async parsing too, so not in change event)
@@ -321,6 +328,7 @@ sap.ui.define([
 					_triggerConditionUpdate.call(this);
 				}
 			}.bind(this));
+			this._bPendingConditionUpdate = true;
 			return;
 		}
 
@@ -332,7 +340,6 @@ sap.ui.define([
 			this._iConditionUpdateTimer = setTimeout(function() {
 				_updateCondition.call(this, _getValue.call(this), _getAdditionalValue.call(this));
 				this._iConditionUpdateTimer = undefined;
-				this._bPendingConditionUpdate = false;
 			}.bind(this), 0);
 			this._bPendingConditionUpdate = true;
 		}
@@ -350,8 +357,8 @@ sap.ui.define([
 		} else {
 			var oCurrentCondition = aConditions[0];
 			var vOldValue = oCurrentCondition && oCurrentCondition.values[0];
-			var sOldAdditionalValue = oCurrentCondition && oCurrentCondition.values[1] ? oCurrentCondition.values[1] : null; // to compare with default value
-			if (!oCurrentCondition || oCurrentCondition.operator !== "EQ" || !_compareValues.call(this, vOldValue, vValue) || sOldAdditionalValue !== vAdditionalValue) {
+			var vOldAdditionalValue = oCurrentCondition && oCurrentCondition.values[1] ? oCurrentCondition.values[1] : null; // to compare with default value
+			if (!oCurrentCondition || oCurrentCondition.operator !== "EQ" || !_compareValues.call(this, vOldValue, vValue) || !_compareAdditionalValues.call(this, vAdditionalValue, vOldAdditionalValue)) {
 				var oDelegate = this.getControlDelegate();
 				var oNextCondition = oDelegate.createCondition(this, this, [vValue, vAdditionalValue], oCurrentCondition);
 				if (!Condition.compareConditions(oCurrentCondition, oNextCondition)) { // We do a full comparison here as FilterOperatorUtils.compareConditions may ignore text changes
@@ -360,6 +367,9 @@ sap.ui.define([
 			}
 		}
 
+		this._bPendingConditionUpdate = false;
+		this._bKeepValueState = false;
+
 	}
 
 	function _adjustValue(vValue, vOldValue) {
@@ -421,6 +431,22 @@ sap.ui.define([
 
 	}
 
+	function _compareAdditionalValues(vValue1, vValue2, bUpdateCheck) {
+
+		var bEqual = vValue1 === vValue2;
+
+		if (!bEqual && (vValue1 === null || vValue1 === undefined || vValue1 === "") && (vValue2 === null || vValue2 === undefined || vValue2 === "")) {
+			// in the moment there is no real data type support for additionalValue, normally only String types are used.
+			// As, depending on the data type configuration a "" can be converted into null or vice versa it needs to be handed both as initial.
+			// In case of wrong user input with disabled ValueHelp input validation no addtitionalValue is added at all, so if set to "" by model it is no change.
+			// TODO: This logic needs to be adopted if there is a real data type support like for value.
+			bEqual = true;
+		}
+
+		return bEqual;
+
+	}
+
 	function _initializeType(vValue) {
 
 		if (!this._oTypeInitialization) {
@@ -508,7 +534,7 @@ sap.ui.define([
 		var vOldValue = this.getValue();
 		var vOldAdditionalValue = this.getAdditionalValue();
 
-		if (aConditions.length === 0 && vOldValue === null && vOldAdditionalValue === null) {
+		if (aConditions.length === 0 && _isValueNull(vOldValue) && _isValueNull(vOldAdditionalValue)) {
 			// Field initialized from setter -> cannot have a condition -> no update needed
 			return;
 		}
@@ -528,7 +554,7 @@ sap.ui.define([
 			// to run not in V4 update issues if data not already loaded
 			this.setProperty("value", vValue, true);
 		}
-		if (vAdditionalValue !== vOldAdditionalValue && !_checkAdditionalValueOneWay.call(this)) {
+		if (!_compareAdditionalValues.call(this, vAdditionalValue, vOldAdditionalValue, true) && !_checkAdditionalValueOneWay.call(this)) {
 			// to run not in V4 update issues if data not already loaded
 			// do not update property in OneWay mode to keep in sync with model
 			this.setProperty("additionalValue", vAdditionalValue, true);
@@ -577,6 +603,26 @@ sap.ui.define([
 
 	};
 
+	function _isValueNull(vValue) {
+
+		var bNull = false;
+
+		if (vValue === null) {
+			bNull = true;
+		} else if (Array.isArray(vValue)) {
+			bNull = true;
+			for (var i = 0; i < vValue.length; i++) {
+				if (vValue[i] !== null) {
+					bNull = false;
+					break;
+				}
+			}
+		}
+
+		return bNull;
+
+	}
+
 	/**
 	 * Sets a new value for property {@link #getConditions conditions}.
 	 *

package/src/sap/ui/mdc/FilterBar.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @constructor
 	 * @public
 	 * @since 1.61.0
@@ -213,9 +213,10 @@ sap.ui.define([
 	FilterBar.prototype.onAdaptFilters = function(oEvent) {
 
 		return this._retrieveMetadata().then(function() {
-			return this.getEngine().uimanager.show(this, "Item", {
+			return this.getEngine().show(this, "Item", {
 				reset: function(){
 					this.getEngine().reset(this);
+					this._getConditionModel().checkUpdate(true);
 			}.bind(this)
 		})
 		.then(function(oPopup){
@@ -228,7 +229,7 @@ sap.ui.define([
 
 	/**
 	 * Returns the external conditions of the inner condition model.
-	 * <b>Note:</b> This API returns only attributes related to the {@link sap.ui.mdc.FilterBar#p13nMode} property configuration.
+	 * <b>Note:</b> This API returns only attributes related to the {@link sap.ui.mdc.FilterBar#setP13nMode p13nMode} property configuration.
 	 * @public
 	 * @returns {sap.ui.mdc.State} Object containing the current status of the <code>FilterBar</code>
 	 */

package/src/sap/ui/mdc/FilterBarDelegate.js

@@ -28,8 +28,8 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * method might be called without the parameter <code>mPropertyBag</code>.
 	 *
 	 * @public
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @param {string} sPropertyName The name of the property info object/JSON
-	 * @param {sap.ui.mdc.Control} oControl Instance of an <code>sap.ui.mdc.Control</code>
 	 * @param {Object} [mPropertyBag] Instance of property bag from SAPUI5 flexibility change API
 	 *
 	 * @returns {Promise<sap.ui.mdc.FilterField>} <code>Promise</code> that resolves with an instance of the implementing {@link sap.ui.mdc.FilterField Control}.
@@ -38,8 +38,8 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * has already been created, it must to either return the existing instance or create a new instance.
 	 *
 	 */
-	FilterBarDelegate.addItem = function(oControl, sPropertyName, mPropertyBag) {
-		return AggregationBaseDelegate.addItem(oControl, sPropertyName, mPropertyBag);
+	FilterBarDelegate.addItem = function(oFilterBar, sPropertyName, mPropertyBag) {
+		return AggregationBaseDelegate.addItem(oFilterBar, sPropertyName, mPropertyBag);
 	};
 
 	/**
@@ -51,42 +51,42 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * method can be called without the parameter <code>mPropertyBag</code>.
 	 *
 	 * @public
-	 * @param {sap.ui.core.Control} oItem The control instance that was removed
-	 * @param {sap.ui.mdc.Control} oControl Instance of an <code>sap.ui.mdc.Control</code>
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
+	 * @param {sap.ui.mdc.FilterField} oFilterField The filter field instance that was removed
 	 * @param {Object} [mPropertyBag] Instance of property bag from SAPUI5 flexibility
 	 *
 	 * @returns {Promise<boolean>} <code>Promise</code> that resolved with <code>true</code>, <code>false</code> to allow/prevent default behavior of the change
 	 */
-	FilterBarDelegate.removeItem = function(oControl, oItem, mPropertyBag) {
+	FilterBarDelegate.removeItem = function(oFilterBar, oFilterField, mPropertyBag) {
 		// return true within the Promise for default behavior
-		return AggregationBaseDelegate.removeItem(oControl, oItem, mPropertyBag);
+		return AggregationBaseDelegate.removeItem(oFilterBar, oFilterField, mPropertyBag);
 	};
 
 	/**
 	 * This method is called during the appliance of the add condition change.
-	 * The intention is to update the {@link sap.ui.mdc.FilterBar#propertyInfo} property.
+	 * The intention is to update the {@link sap.ui.mdc.FilterBarBase#setPropertyInfo propertyInfo} property.
 	 *
 	 * @public
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @param {string} sPropertyName The name of a property
-	 * @param {sap.ui.mdc.Control} oControl The instance of a filter bar
 	 * @param {Object} mPropertyBag Instance of a property bag from the SAPUI5 flexibility change API
 	 * @returns {Promise} <code>Promise</code> that is resolved once the propertyInfo property has been updated
 	 */
-	FilterBarDelegate.addCondition = function(oControl, sPropertyName, mPropertyBag) {
+	FilterBarDelegate.addCondition = function(oFilterBar, sPropertyName, mPropertyBag) {
 		return Promise.resolve();
     };
 
-	/**
+	/** propertyInfo
 	 * This method is called during the appliance of the remove condition change.
-	 * The intention is to update the  {@link sap.ui.mdc.FilterBar#propertyInfo} property.
+	 * The intention is to update the {@link sap.ui.mdc.FilterBarBase#setPropertyInfo propertyInfo} property.
 	 *
 	 * @public
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @param {string} sPropertyName The name of a property
-	 * @param {sap.ui.mdc.Control} oControl The instance of a filter bar
 	 * @param {Object} mPropertyBag Instance of a property bag from the SAPUI5 flexibility change API
 	 * @returns {Promise} <code>Promise</code> that is resolved once the propertyInfo property has been updated
 	 */
-	FilterBarDelegate.removeCondition = function(oControl, sPropertyName, mPropertyBag) {
+	FilterBarDelegate.removeCondition = function(oFilterBar, sPropertyName, mPropertyBag) {
 		return Promise.resolve();
     };
 
@@ -95,21 +95,21 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * Retrieves the relevant metadata for a given payload and returns the property info array.
 	 *
 	 * @public
-	 * @param {sap.ui.mdc.Control} oControl Instance of an <code>sap.ui.mdc.Control</code>
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @returns {Promise<sap.ui.mdc.filterbar.PropertyInfo[]>} Once resolved, an array of property info objects is returned
 	 */
-	FilterBarDelegate.fetchProperties = function(oControl) {
-		return AggregationBaseDelegate.fetchProperties(oControl);
+	FilterBarDelegate.fetchProperties = function(oFilterBar) {
+		return AggregationBaseDelegate.fetchProperties(oFilterBar);
 	};
 
 	/**
 	 * This method is called when the Clear button is pressed.
 	 *
 	 * @public
-	 * @param {sap.ui.mdc.Control} oControl The instance of a filter bar
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @returns {Promise} <code>Promise</code> that is resolved once the action has been completed
 	 */
-	FilterBarDelegate.clearFilters = function(oControl) {
+	FilterBarDelegate.clearFilters = function(oFilterBar) {
 		return Promise.resolve();
     };
 
@@ -117,7 +117,7 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * A validator to evaluate the filter bar state.
 	 *
 	 * @public
-	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of an <code>sap.ui.mdc.FilterBar</code>
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @param {map} [mValidation] Object describing the validation result. This object is only provided when called from the {@link sap.ui.mdc.FilterBar FilterBar}
 	 * @param {string} [mValidation.status] Status of the validation {@link sap.ui.mdc.enums.FilterBarValidationStatus}
 	 * @returns {sap.ui.mdc.enums.FilterBarValidationStatus} The inner filter bar state
@@ -130,7 +130,7 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate", "sap/ui/mdc/enums/FilterBar
 	 * Visualizes the filter bar validation state.
 	 *
 	 * @public
-	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of an <code>sap.ui.mdc.FilterBar</code>
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 	 * @param {map} mValidation Describes the validation result. This object is only provided when called from the {@link sap.ui.mdc.FilterBar FilterBar}
 	 * @param {sap.ui.mdc.enums.FilterBarValidationStatus} mValidation.status Status of the validation as returned via {@link sap.ui.mdc.filterbar.FilterBarBase#checkValidationState checkValidationState}
 	 */

package/src/sap/ui/mdc/FilterField.js

@@ -30,30 +30,32 @@ sap.ui.define([
 	 * That is why the <code>conditions</code> property must be bound to the related conditions in the {@link sap.ui.mdc.condition.ConditionModel ConditionModel}.
 	 * The type of this data must be defined in the <code>dataType</code> property.
 	 *
+	 * Based on the data type settings, a default control is rendered by the <code>FilterField</code> as follows:
+	 *
 	 * <ul>
-	 * <li>In display mode normally a {@link sap.m.Text Text} control is rendered.</li>
-	 * <li>If <code>multipleLines</code> is set a {@link sap.m.ExpandableText ExpandableText} control is rendered.</li>
-	 * <li>If multiple values are allowed a {@link sap.m.Tokenizer Tokenizer} control is rendered.</li>
-	 * <li>In edit mode normally a {@link sap.m.Input Input} control is rendered.</li>
-	 * <li>If multiple values are allowed a {@link sap.m.MultiInput MultiInput} control is rendered.</li>
-	 * <li>If <code>multipleLines</code> is set a {@link sap.m.TextArea TextArea} control is rendered.</li>
-	 * <li>If a date type or a date-time type is used, a {@link sap.m.DateRangeSelection DateRangeSelection} control is rendered.</li>
+	 * <li>In display mode, usually a {@link sap.m.Text Text} control is rendered.</li>
+	 * <li>If <code>multipleLines</code> is set, an {@link sap.m.ExpandableText ExpandableText} control is rendered.</li>
+	 * <li>If multiple values are allowed, a {@link sap.m.Tokenizer Tokenizer} control is rendered.</li>
+	 * <li>In edit mode, usually an {@link sap.m.Input Input} control is rendered.</li>
+	 * <li>If multiple values are allowed, a {@link sap.m.MultiInput MultiInput} control is rendered.</li>
+	 * <li>If <code>multipleLines</code> is set, a {@link sap.m.TextArea TextArea} control is rendered.</li>
+	 * <li>If a date type or a date/time type is used, a {@link sap.m.DateRangeSelection DateRangeSelection} control is rendered.</li>
 	 * <li>If a date type is used and only single values are allowed, a {@link sap.m.DatePicker DatePicker} control is rendered.</li>
 	 * <li>If a date type is used and only single ranges are allowed, a {@link sap.m.DateRangeSelection DateRangeSelection} control is rendered.</li>
-	 * <li>If a date-time type is used and only single values are allowed, a {@link sap.m.DateTimePicker DateTimePicker} control is rendered.</li>
+	 * <li>If a date/time type is used and only single values are allowed, a {@link sap.m.DateTimePicker DateTimePicker} control is rendered.</li>
 	 * <li>If a time type is used and only single values are allowed, a {@link sap.m.TimePicker TimePicker} control is rendered.</li>
-	 * <li>If used for search a {@link sap.m.SearchField SearchField} control is rendered.</li>
+	 * <li>If used for search, a {@link sap.m.SearchField SearchField} control is rendered.</li>
 	 * </ul>
 	 *
 	 * @extends sap.ui.mdc.field.FieldBase
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @since 1.48.0
 	 *
 	 * @public
@@ -67,7 +69,7 @@ sap.ui.define([
 				/**
 				 * Supported operator names for conditions.
 				 *
-				 * If empty, default operators depending on used data type are used.
+				 * If empty, default operators depending on used data type are taken.
 				 *
 				 * @since 1.73.0
 				 */
@@ -129,7 +131,7 @@ sap.ui.define([
 
 						/**
 						 * Returns a <code>Promise</code> for the change. The <code>Promise</code> returns the value if it is resolved.
-						 * If the <code>change</code> event is synchronous, the promise has already been already resolved. If it is asynchronous,
+						 * If the <code>change</code> event is synchronous, the <code>Promise</code> has already been resolved. If it is asynchronous,
 						 * it will be resolved after the value has been updated.
 						 *
 						 * The <code>FilterField</code> should be set to busy during the parsing to prevent user input.