@openui5/sap.ui.mdc 1.96.1 → 1.97.1

package/src/sap/ui/mdc/field/content/ContentFactory.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([
@@ -271,28 +271,36 @@ sap.ui.define([
 		return this._bHideOperator;
 	};
 
-	ContentFactory.prototype.getConditionType = function(bSkipConditionTypeGeneration) {
-		if (!bSkipConditionTypeGeneration && !this._oConditionType) {
-			var oFormatOptions = this.getField()._getFormatOptions();
-			this._oConditionType = new ConditionType(oFormatOptions);
-			this._oConditionType._bCreatedByField = true;
+	function _getCondType(sCondType, CondType, fnGetFormatOptions, bSkipTypeGeneration) {
+
+		if (!bSkipTypeGeneration) {
+			if (this[sCondType] && this[sCondType].getMetadata().getName() !== CondType.getMetadata().getName()) {
+				// ConditionsType changed
+				this[sCondType].destroy();
+				this[sCondType] = undefined;
+			}
+
+			if (!this[sCondType]) {
+				var oFormatOptions = fnGetFormatOptions();
+				this[sCondType] = new CondType(oFormatOptions);
+				this[sCondType]._bCreatedByField = true;
+			}
 		}
+		return this[sCondType];
+
+	}
 
-		return this._oConditionType;
+	ContentFactory.prototype.getConditionType = function(bSkipConditionTypeGeneration) {
+		return _getCondType.call(this, "_oConditionType", ConditionType, this.getField()._getFormatOptions.bind(this.getField()), bSkipConditionTypeGeneration);
 	};
 
 	ContentFactory.prototype.setConditionType = function(oConditionType) {
 		this._oConditionType = oConditionType;
 	};
 
-	ContentFactory.prototype.getConditionsType = function(bSkipConditionsTypeGeneration) {
-		if (!bSkipConditionsTypeGeneration && !this._oConditionsType) {
-			var oFormatOptions = this.getField()._getFormatOptions();
-			this._oConditionsType = new ConditionsType(oFormatOptions);
-			this._oConditionsType._bCreatedByField = true;
-		}
-
-		return this._oConditionsType;
+	ContentFactory.prototype.getConditionsType = function (bSkipConditionsTypeGeneration, CustomConditionsType) {
+		var UsedConditionType = CustomConditionsType || ConditionsType; // CustomConditionsType used for DynamicDateRange
+		return _getCondType.call(this, "_oConditionsType", UsedConditionType, this.getField()._getFormatOptions.bind(this.getField()), bSkipConditionsTypeGeneration);
 	};
 
 	ContentFactory.prototype.setConditionsType = function(oConditionsType) {
@@ -300,13 +308,7 @@ sap.ui.define([
 	};
 
 	ContentFactory.prototype.getUnitConditionsType = function(bSkipConditionsTypeGeneration) {
-		if (!bSkipConditionsTypeGeneration && !this._oUnitConditionsType) {
-			var oFormatOptions = this.getField()._getUnitFormatOptions();
-			this._oUnitConditionsType = new ConditionsType(oFormatOptions);
-			this._oUnitConditionsType._bCreatedByField = true;
-		}
-
-		return this._oUnitConditionsType;
+		return _getCondType.call(this, "_oUnitConditionsType", ConditionsType, this.getField()._getUnitFormatOptions.bind(this.getField()), bSkipConditionsTypeGeneration);
 	};
 
 	ContentFactory.prototype.getContentConditionTypes = function() {

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

@@ -1,17 +1,28 @@
 /*
  * ! 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([
 	"sap/ui/mdc/field/content/DefaultContent",
 	"sap/ui/mdc/enum/BaseType",
 	"sap/ui/mdc/util/DateUtil",
+	"sap/ui/mdc/condition/FilterOperatorUtil",
+	"sap/ui/mdc/condition/Operator",
 	"sap/ui/core/library"
-], function(DefaultContent, BaseType, DateUtil, coreLibrary) {
+], function(
+	DefaultContent,
+	BaseType,
+	DateUtil,
+	FilterOperatorUtil,
+	Operator,
+	coreLibrary) {
 	"use strict";
 
 	var CalendarType = coreLibrary.CalendarType;
+	var StandardDynamicDateRangeKeys;
+	var DynamicDateUtil;
+	var DynamicDateFormat;
 
 	/**
 	 * Object-based definition of the date content type that is used in the {@link sap.ui.mdc.field.content.ContentFactory}.
@@ -29,14 +40,20 @@ sap.ui.define([
 		getEditMultiLine: function() {
 			return [null];
 		},
+		getEdit: function() {
+			return ["sap/m/DynamicDateRange", "sap/ui/mdc/condition/OperatorDynamicDateOption", "sap/ui/mdc/field/DynamicDateRangeConditionsType", "sap/m/StandardDynamicDateRangeKeys", "sap/m/DynamicDateUtil", "sap/m/DynamicDateFormat"];
+		},
 		getEditOperator: function() {
 			return {
 				"EQ": { name: "sap/m/DatePicker", create: this._createDatePickerControl }, // TODO: how to check custom operators
 				"BT": { name: "sap/m/DateRangeSelection", create: this._createDateRangePickerControl }
 			};
 		},
+		getEditForHelp: function() {
+			return DefaultContent.getEdit.apply(this, arguments);
+		},
 		getUseDefaultFieldHelp: function() {
-			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: true };
+			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: true, single: false, multi: true };
 		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.DateContent - createEditMultiLine not defined!");
@@ -155,6 +172,115 @@ sap.ui.define([
 					oContentFactory.setCalendarType(oFormatOptions.calendarType);
 				}
 			}
+		},
+		createEdit: function(oContentFactory, aControlClasses, sId) {
+
+			var DynamicDateRange = aControlClasses[0];
+			var OperatorDynamicDateOption = aControlClasses[1];
+			var DynamicDateRangeConditionsType = aControlClasses[2];
+
+			if (!StandardDynamicDateRangeKeys || !DynamicDateUtil || !DynamicDateFormat) {
+				StandardDynamicDateRangeKeys = aControlClasses[3];
+				DynamicDateUtil = aControlClasses[4];
+				DynamicDateFormat = aControlClasses[5];
+			}
+
+			var oConditionsType = oContentFactory.getConditionsType(false, DynamicDateRangeConditionsType);
+			var vOptions;
+			if (oContentFactory.getField().getMetadata().hasProperty("operators")) { // TODO: Field case needed?
+				var fnGetDateRangeOptions = function (aOperators) {
+					return this._getDateRangeOptions(aOperators, oContentFactory, OperatorDynamicDateOption);
+				}.bind(this);
+				vOptions = {path: "$field>/operators", formatter: fnGetDateRangeOptions};
+			} else {
+				vOptions = this._getDateRangeOptions(undefined, oContentFactory, OperatorDynamicDateOption);
+			}
+
+			var oDynamicDateRange = new DynamicDateRange(sId, {
+				value: { path: "$field>/conditions", type: oConditionsType },
+				formatter: this._getDateRangeFormatter(oContentFactory),
+				placeholder: "{$field>/placeholder}",
+//				textAlign: "{$field>/textAlign}",	// this is currently not supported by the DynamicDateRange
+//				textDirection: "{$field>/textDirection}", // this is currently not supported by the DynamicDateRange
+				required: "{$field>/required}",
+				editable: { path: "$field>/editMode", formatter: oContentFactory.getMetadata()._oClass._getEditable },
+				enabled: { path: "$field>/editMode", formatter: oContentFactory.getMetadata()._oClass._getEnabled },
+				valueState: "{$field>/valueState}",
+				valueStateText: "{$field>/valueStateText}",
+				width: "100%",
+				tooltip: "{$field>/tooltip}",
+				// enableGroupHeaders: false,	// disable the grouping of the options
+				options: vOptions,
+				change: oContentFactory.getHandleContentChange()
+			});
+
+			oContentFactory.setBoundProperty("value");
+			oContentFactory.setAriaLabelledBy(DynamicDateRange);
+
+			return [oDynamicDateRange];
+
+		},
+		createEditForHelp: function(oContentFactory, aControlClasses, sId) {
+			return DefaultContent.createEdit.apply(this, arguments);
+		},
+
+		_getDateRangeOptions: function(aOperators, oContentFactory, OperatorDynamicDateOption) {
+			if (!aOperators || aOperators.length === 0) {
+				aOperators = oContentFactory.getField()._getOperators(); // to use default operators if none given
+			}
+			var aOptions = [];
+
+			for (var i = 0; i < aOperators.length; i++) {
+				var sOperator = aOperators[i];
+				var sOption = this._getDateRangeOption(sOperator, oContentFactory, OperatorDynamicDateOption);
+				if (sOption) {
+					aOptions.push(sOption);
+				}
+			}
+
+			return aOptions;
+		},
+
+		_getDateRangeOption: function(sOperator, oContentFactory, OperatorDynamicDateOption) {
+			var oOperator = FilterOperatorUtil.getOperator(sOperator);
+			var sOption = oOperator.name;
+			if (StandardDynamicDateRangeKeys.indexOf(sOption) === -1 ) {
+				sOption = oOperator.alias || sOption;
+			}
+
+			if (StandardDynamicDateRangeKeys.indexOf(sOption) >= 0 ) {
+				return sOption; // use standard option
+			} else
+				// use OperatorDynamicDateOption
+				if (oOperator) {
+					if (!DynamicDateUtil.getOption(sOption)) {
+						var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
+						var aValueTypes = [];
+
+						for (var j = 0; j < oOperator.valueTypes.length; j++) {
+							if (oOperator.valueTypes[j] && oOperator.valueTypes[j] !== Operator.ValueType.Static) {
+								aValueTypes.push("custom"); // provide value as it is to use type to format and parse // TODO: only if custom control?
+							}
+						}
+
+						DynamicDateUtil.addOption(new OperatorDynamicDateOption({key: sOption, operator: oOperator, type: oType, valueTypes: aValueTypes})); // TODO: use name as key?
+					}
+					return sOption;
+				}
+		},
+
+		_getDateRangeFormatter: function(oContentFactory) {
+			var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
+			var oFormatOptions = oType.getFormatOptions();
+			var oDateRangeFormatOptions = {};
+
+			if (oFormatOptions.style) {
+				oDateRangeFormatOptions.date = {style: oFormatOptions.style};
+			} else if (oFormatOptions.pattern) {
+				oDateRangeFormatOptions.date = {pattern: oFormatOptions.pattern};
+			}
+
+			return DynamicDateFormat.getInstance(oDateRangeFormatOptions);
 		}
 	});
 

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

@@ -1,11 +1,12 @@
 /*
  * ! 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([
+	"sap/ui/mdc/field/content/DefaultContent",
 	"sap/ui/mdc/field/content/DateContent"
-], function(DateContent) {
+], function(DefaultContent, DateContent) {
 	"use strict";
 
 	/**
@@ -26,9 +27,16 @@ sap.ui.define([
 				"EQ": { name: "sap/m/DateTimePicker", create: this._createDatePickerControl }  // as same API as DatePicker
 			};
 		},
+		getEdit: function() {
+			return DefaultContent.getEdit.apply(this, arguments);
+		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.DateTimeContent - createEditMultiLine not defined!");
+		},
+		createEdit: function(oContentFactory, aControlClasses, sId) {
+			return DefaultContent.createEdit.apply(this, arguments);
 		}
+
 	});
 
 	return DateTimeContent;

package/src/sap/ui/mdc/field/content/DefaultContent.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([
@@ -55,7 +55,7 @@ sap.ui.define([
 			return true;
 		},
 		getUseDefaultFieldHelp: function() {
-			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: false };
+			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: false, single: true, multi: true };
 		},
 		/**
 		 * Determines which controls to return for a given {@link sap.ui.mdc.enum.ContentMode}.

package/src/sap/ui/mdc/field/content/LinkContent.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([

package/src/sap/ui/mdc/field/content/SearchContent.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([

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

@@ -1,11 +1,12 @@
 /*
  * ! 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([
+	"sap/ui/mdc/field/content/DefaultContent",
 	"sap/ui/mdc/field/content/DateContent"
-], function(DateContent) {
+], function(DefaultContent, DateContent) {
 	"use strict";
 
 	/**
@@ -26,8 +27,14 @@ sap.ui.define([
 				"EQ": { name: "sap/m/TimePicker", create: this._createDatePickerControl }  // as same API as DatePicker
 			};
 		},
+		getEdit: function() {
+			return DefaultContent.getEdit.apply(this, arguments);
+		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.TimeContent - createEditMultiLine not defined!");
+		},
+		createEdit: function(oContentFactory, aControlClasses, sId) {
+			return DefaultContent.createEdit.apply(this, arguments);
 		}
 	});
 

package/src/sap/ui/mdc/field/content/UnitContent.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([
@@ -26,8 +26,11 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	var UnitContent = Object.assign({}, DefaultContent, {
+		getEdit: function() {
+			return ["sap/ui/mdc/field/FieldInput", "sap/ui/core/InvisibleText"];
+		},
 		getEditMultiValue: function() {
-			return ["sap/ui/mdc/field/FieldMultiInput", "sap/ui/mdc/field/FieldInput", "sap/m/Token"];
+			return ["sap/ui/mdc/field/FieldMultiInput", "sap/ui/mdc/field/FieldInput", "sap/m/Token", "sap/ui/core/InvisibleText"];
 		},
 		getEditMultiLine: function() {
 			return [null];
@@ -38,9 +41,11 @@ sap.ui.define([
 		createEdit: function(oContentFactory, aControlClasses, sId) {
 			oContentFactory.setIsMeasure(true); // FieldHelp only on unit field
 			var Input = aControlClasses[0];
+			var InvisibleText = aControlClasses[1];
 			var oConditionsType = oContentFactory.getConditionsType();
 			this._adjustDataTypeForUnit(oContentFactory);
 
+			var sInvisibleTextId = InvisibleText.getStaticId("sap.ui.mdc", "field.NUMBER");
 			var aControls = [];
 			var oInput1 = new Input(sId, {
 				value: { path: "$field>/conditions", type: oConditionsType },
@@ -58,13 +63,14 @@ sap.ui.define([
 				tooltip: "{$field>/tooltip}",
 				autocomplete: false,
 				fieldGroupIds: [oContentFactory.getField().getId()], // use FieldGroup to fire change only if focus leaved complete Field
+				ariaDescribedBy: [sInvisibleTextId],
 				change: oContentFactory.getHandleContentChange(),
 				liveChange: oContentFactory.getHandleContentLiveChange()
 			});
 			oInput1._setPreferUserInteraction(true);
 			oContentFactory.setAriaLabelledBy(oInput1);
 			aControls.push(oInput1);
-			aControls = this._addUnitControl(oContentFactory, aControls, sId, Input);
+			aControls = this._addUnitControl(oContentFactory, aControls, sId, Input, InvisibleText);
 
 			oContentFactory.setBoundProperty("value");
 
@@ -75,6 +81,7 @@ sap.ui.define([
 			var MultiInput = aControlClasses[0];
 			var Token = aControlClasses[2]; // is loaded by MultiInput
 			var Input = aControlClasses[1];
+			var InvisibleText = aControlClasses[3];
 			var oConditionType = oContentFactory.getConditionType();
 			this._adjustDataTypeForUnit(oContentFactory);
 
@@ -98,6 +105,7 @@ sap.ui.define([
 				}
 			});
 
+			var sInvisibleTextId = InvisibleText.getStaticId("sap.ui.mdc", "field.NUMBER");
 			var oMultiInput = new MultiInput(sId, {
 				placeholder: "{$field>/placeholder}",
 				textAlign: "{$field>/textAlign}",
@@ -111,6 +119,7 @@ sap.ui.define([
 				width: "70%",
 				tooltip: "{$field>/tooltip}",
 				fieldGroupIds: [oContentFactory.getField().getId()], // use FieldGroup to fire change only if focus leaved complete Field
+				ariaDescribedBy: [sInvisibleTextId],
 				tokens: { path: "$field>/conditions", template: oToken, filters: [oFilter] },
 				dependents: [oToken], // to destroy it if MultiInput is destroyed
 				change: oContentFactory.getHandleContentChange(),
@@ -120,7 +129,7 @@ sap.ui.define([
 			oMultiInput._setPreferUserInteraction(true);
 			oContentFactory.setAriaLabelledBy(oMultiInput);
 			aControls.push(oMultiInput);
-			aControls = this._addUnitControl(oContentFactory, aControls, sId, Input);
+			aControls = this._addUnitControl(oContentFactory, aControls, sId, Input, InvisibleText);
 
 			oContentFactory.setBoundProperty("value");
 
@@ -129,7 +138,7 @@ sap.ui.define([
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.UnitContent - createEditMultiLine not defined!");
 		},
-		_addUnitControl: function(oContentFactory, aControls, sId, Input) {
+		_addUnitControl: function(oContentFactory, aControls, sId, Input, InvisibleText) {
 			var oUnitConditionsType = oContentFactory.getUnitConditionsType();
 
 			if (oContentFactory.getField().getEditMode() === EditMode.EditableDisplay) {
@@ -137,6 +146,15 @@ sap.ui.define([
 				aControls[0].setWidth("100%");
 				aControls[0].setFieldWidth("70%");
 			} else {
+				var sInvisibleTextId;
+				var oType = oContentFactory.getUnitOriginalType();
+				var sName = oType && oType.getMetadata().getName();
+				if (sName && sName.indexOf("Currency") >= 0) { // TODO: better solution
+					sInvisibleTextId = InvisibleText.getStaticId("sap.ui.mdc", "field.CURRENCY");
+				} else {
+					sInvisibleTextId = InvisibleText.getStaticId("sap.ui.mdc", "field.UNIT");
+				}
+
 				var oInput = new Input(sId + "-unit", {
 					value: { path: "$field>/conditions", type: oUnitConditionsType },
 					placeholder: "{$field>/placeholder}",
@@ -154,6 +172,7 @@ sap.ui.define([
 					tooltip: "{$field>/tooltip}",
 					autocomplete: false,
 					fieldGroupIds: [oContentFactory.getField().getId()], // use FieldGroup to fire change only if focus leaved complete Field
+					ariaDescribedBy: [sInvisibleTextId],
 					change: oContentFactory.getHandleContentChange(),
 					liveChange: oContentFactory.getHandleContentLiveChange(),
 					valueHelpRequest: oContentFactory.getHandleValueHelpRequest()

package/src/sap/ui/mdc/filterbar/FilterBarBase.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([
@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @class The <code>FilterBarBase</code> control is used as a faceless base class for common functionality of any MDC FilterBar derivation.
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -784,9 +784,7 @@ sap.ui.define([
 			this._bSearchTriggered = true;
 			return Promise.resolve();
 		}
-		return this.validate().then(function(){
-			this.fireSearch();
-		}.bind(this));
+		return this.validate();
 	};
 
 	/**
@@ -799,7 +797,9 @@ sap.ui.define([
 	 * @returns {Promise} Returns a Promise which resolves after the validation of erroneous fields has been propagated.
 	 *
 	 */
-	FilterBarBase.prototype.validate = function() {
+	FilterBarBase.prototype.validate = function(bSuppressSearch) {
+
+		var bFireSearch = !bSuppressSearch;
 
 		return this.initialized().then(function() {
 			if (!this._oValidationPromise) {
@@ -810,7 +810,7 @@ sap.ui.define([
 				}.bind(this));
 
 				var fDelayedFunction = function() {
-					this._validate();
+					this._validate(bFireSearch);
 					this._oValidationPromise = null;
 				};
 				setTimeout(fDelayedFunction.bind(this), 0);
@@ -958,7 +958,7 @@ sap.ui.define([
 		return oFilterField;
 	};
 
-	FilterBarBase.prototype._handleAsyncValidation = function() {
+	FilterBarBase.prototype._handleAsyncValidation = function(bFireSearch) {
 		if (this._aFIChanges && (this._aFIChanges.length > 0)) {
 
 			var aNamePromisesArray = this._aFIChanges.slice();
@@ -977,22 +977,22 @@ sap.ui.define([
 						oFF.setValueState(ValueState.None); //valid existing value -> clear missing required error
 					}
 				}, this);
-				this._validate();
+				this._validate(bFireSearch);
 			}.bind(this), function(aConditionsArray) {
-				this._validate();
+				this._validate(bFireSearch);
 			}.bind(this));
 		}
 	};
 
-	FilterBarBase.prototype._waitForChangeAppliance = function() {
+	FilterBarBase.prototype._waitForChangeAppliance = function(bFireSearch) {
 
 		var aChangePromises = this._aCollectedChangePromises.slice();
 		this._aCollectedChangePromises = null;
 
 		Promise.all(aChangePromises).then(function(aConditionsArray) {
-			this._validate();
+			this._validate(bFireSearch);
 		}.bind(this), function(aConditionsArray) {
-			this._validate();
+			this._validate(bFireSearch);
 		}.bind(this));
 	};
 
@@ -1000,9 +1000,15 @@ sap.ui.define([
 	 * Executes the search.
 	 * @private
 	 */
-	 FilterBarBase.prototype._validate = function() {
+	 FilterBarBase.prototype._validate = function(bFireSearch) {
 		var sErrorMessage, vRetErrorState;
 
+		var fnCheckAndFireSearch = function() {
+			if (bFireSearch) {
+				this.fireSearch();
+			}
+		}.bind(this);
+
 		var fnCleanup = function() {
 			this._fRejectedSearchPromise = null;
 			this._fResolvedSearchPromise = null;
@@ -1017,22 +1023,24 @@ sap.ui.define([
 		vRetErrorState = this._checkFilters();
 
 		if (vRetErrorState === ErrorState.AsyncValidation) {
-			this._handleAsyncValidation();
+			this._handleAsyncValidation(bFireSearch);
 			return;
 		}
 
 		if (this._aCollectedChangePromises && (this._aCollectedChangePromises.length > 0)) {
-			this._waitForChangeAppliance();
+			this._waitForChangeAppliance(bFireSearch);
 			return;
 		}
 
 		if (vRetErrorState === ErrorState.NoError) {
 			if (this._isChangeApplying()) {
 				this._oFlexPromise.then(function() {
-				 this._fResolvedSearchPromise();
-				 fnCleanup();
+					fnCheckAndFireSearch();
+					this._fResolvedSearchPromise();
+					fnCleanup();
 				}.bind(this));
 			} else {
+				fnCheckAndFireSearch();
 				this._fResolvedSearchPromise();
 				fnCleanup();
 			}

package/src/sap/ui/mdc/filterbar/FilterBarBaseRenderer.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/filterbar/IFilterContainer.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/filterbar/PropertyHelper.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.
 */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/filterbar/aligned/FilterContainer.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/filterbar/aligned/FilterItemLayout.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/filterbar/p13n/AdaptationFilterBar.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([
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @constructor
 	 * @private
 	 * @since 1.80.0

package/src/sap/ui/mdc/filterbar/p13n/FilterColumnLayout.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/filterbar/p13n/FilterGroupLayout.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.
  */