@openui5/sap.ui.mdc 1.94.0 → 1.97.0

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

@@ -4,8 +4,9 @@
  * 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

@@ -4,9 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/m/library"
+	"sap/m/library",
+	"sap/ui/mdc/enum/ContentMode"
 ], function(
-	mLibrary
+	mLibrary,
+	ContentMode
 ) {
 	"use strict";
 
@@ -28,13 +30,16 @@ sap.ui.define([
 		getDisplay: function() {
 			return ["sap/m/Text"];
 		},
+		getDisplayMultiValue: function() {
+			return this.getDisplayMultiLine();
+		},
 		getDisplayMultiLine: function() {
 			return ["sap/m/ExpandableText"];
 		},
 		getEdit: function() {
 			return ["sap/ui/mdc/field/FieldInput"];
 		},
-		getEditMulti: function() {
+		getEditMultiValue: function() {
 			return ["sap/ui/mdc/field/FieldMultiInput", "sap/m/Token"];
 		},
 		getEditMultiLine: function() {
@@ -43,11 +48,14 @@ sap.ui.define([
 		getEditOperator: function() {
 			return [null];
 		},
+		getEditForHelp: function() {
+			return this.getEdit();
+		},
 		getUseDefaultEnterHandler: function() {
 			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}.
@@ -58,25 +66,31 @@ sap.ui.define([
 		getControlNames: function(sContentMode, sOperator) {
 			var aControlNames;
 			switch (sContentMode) {
-				case "Display":
+				case ContentMode.Display:
 					aControlNames = this.getDisplay();
 					break;
-				case "DisplayMultiLine":
+				case ContentMode.DisplayMultiValue:
+					aControlNames = this.getDisplayMultiValue();
+					break;
+				case ContentMode.DisplayMultiLine:
 					aControlNames = this.getDisplayMultiLine();
 					break;
-				case "EditMulti":
-					aControlNames = this.getEditMulti();
+				case ContentMode.EditMultiValue:
+					aControlNames = this.getEditMultiValue();
 					break;
-				case "EditMultiLine":
+				case ContentMode.EditMultiLine:
 					aControlNames = this.getEditMultiLine();
 					break;
-				case "EditOperator":
+				case ContentMode.EditOperator:
 					if (this.getEditOperator()) {
 						aControlNames = this.getEditOperator()[sOperator] ? this.getEditOperator()[sOperator].name : [null];
 					} else {
 						aControlNames = [null];
 					}
 					break;
+				case ContentMode.EditForHelp:
+					aControlNames = this.getEditForHelp();
+					break;
 				default:
 					aControlNames = this.getEdit();
 			}
@@ -96,25 +110,29 @@ sap.ui.define([
 		 */
 		create: function(oContentFactory, sContentMode, sOperator, aControls, sId) {
 			switch (sContentMode) {
-				case "Display":
+				case ContentMode.Display:
 					return this.createDisplay(oContentFactory, aControls, sId);
-				case "DisplayMultiLine":
+				case ContentMode.DisplayMultiValue:
+					return this.createDisplayMultiValue(oContentFactory, aControls, sId);
+				case ContentMode.DisplayMultiLine:
 					return this.createDisplayMultiLine(oContentFactory, aControls, sId);
-				case "EditMulti":
-					return this.createEditMulti(oContentFactory, aControls, sId);
-				case "EditMultiLine":
+				case ContentMode.EditMultiValue:
+					return this.createEditMultiValue(oContentFactory, aControls, sId);
+				case ContentMode.EditMultiLine:
 					return this.createEditMultiLine(oContentFactory, aControls, sId);
-				case "EditOperator":
+				case ContentMode.EditOperator:
 					if (this.getEditOperator()) {
 						return this.getEditOperator()[sOperator] ? this.getEditOperator()[sOperator].create.call(this, oContentFactory, aControls, sId) : [null];
 					}
 					return [null];
+				case ContentMode.EditForHelp:
+					return this.createEditForHelp(oContentFactory, aControls, sId);
 				default:
 					return this.createEdit(oContentFactory, aControls, sId);
 			}
 		},
 		/**
-		 * Creates the suitable controls for content mode "Edit".
+		 * Creates the suitable controls for content mode <code>Edit</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
 		 * @param {String} sId ID of the field control
@@ -151,13 +169,13 @@ sap.ui.define([
 			return [oInput];
 		},
 		/**
-		 * Creates the suitable controls for content mode "EditMulti".
+		 * Creates the suitable controls for content mode <code>EditMultiValue</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
 		 * @param {String} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
-		createEditMulti: function(oContentFactory, aControlClasses, sId) {
+		createEditMultiValue: function(oContentFactory, aControlClasses, sId) {
 			var Input = aControlClasses[0];
 			var Token = aControlClasses[1];
 			var oConditionType = oContentFactory.getConditionType();
@@ -185,6 +203,7 @@ sap.ui.define([
 				tokens: { path: "$field>/conditions", template: oToken },
 				dependents: [oToken], // to destroy it if MultiInput is destroyed
 				autocomplete: false,
+				showSuggestion: false, // as true by default
 				change: oContentFactory.getHandleContentChange(),
 				liveChange: oContentFactory.getHandleContentLiveChange(),
 				tokenUpdate: oContentFactory.getHandleTokenUpdate(),
@@ -197,7 +216,7 @@ sap.ui.define([
 			return [oMultiInput];
 		},
 		/**
-		 * Creates the suitable controls for content mode "EditMultiLine".
+		 * Creates the suitable controls for content mode <code>EditMultiLine</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
 		 * @param {String} sId ID of the field control
@@ -230,7 +249,7 @@ sap.ui.define([
 			return [oTextArea];
 		},
 		/**
-		 * Creates the suitable controls for content mode "Display".
+		 * Creates the suitable controls for content mode <code>Display</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
 		 * @param {String} sId ID of the field control
@@ -253,7 +272,7 @@ sap.ui.define([
 			return [oText];
 		},
 		/**
-		 * Creates the suitable controls for content mode "DisplayMultiLine".
+		 * Creates the suitable controls for content mode <code>DisplayMultiLine</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
 		 * @param {String} sId ID of the field control
@@ -267,12 +286,34 @@ sap.ui.define([
 				text: { path: "$field>/conditions", type: oConditionsType },
 				textAlign: "{$field>/textAlign}",
 				textDirection: "{$field>/textDirection}",
-				tooltip: "{$field>/tooltip}"//,
-//				emptyIndicatorMode: EmptyIndicatorMode.Auto
+				tooltip: "{$field>/tooltip}",
+				emptyIndicatorMode: EmptyIndicatorMode.Auto
 			});
 			oContentFactory.setBoundProperty("text");
 
 			return [oExpandableText];
+		},
+		/**
+		 * Creates the suitable controls for content mode <code>DisplayMultiValue</code>.
+		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
+		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
+		 * @param {String} sId ID of the field control
+		 * @returns {sap.ui.core.Control[]} Array containing the created controls
+		 * @since 1.96
+		 */
+		createDisplayMultiValue: function(oContentFactory, aControlClasses, sId) {
+			return this.createDisplayMultiLine(oContentFactory, aControlClasses, sId); // for now just return the same asl in MultiLine mode
+		},
+		/**
+		 * Creates the suitable controls for content mode <code>EditForHelp</code>.
+		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
+		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
+		 * @param {String} sId ID of the field control
+		 * @returns {sap.ui.core.Control[]} Array containing the created controls
+		 * @since 1.96
+		 */
+		createEditForHelp: function(oContentFactory, aControlClasses, sId) {
+			return this.createEdit(oContentFactory, aControlClasses, sId); // In normal cases there is no difference between EditForHelp and Edit.
 		}
 	};
 

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

@@ -24,6 +24,9 @@ sap.ui.define([
 		getDisplay: function() {
 			return ["sap/m/Link"];
 		},
+		getDisplayMultiValue: function() {
+			return [null];
+		},
 		getDisplayMultiLine: function() {
 			return ["sap/m/Link"]; // render Link too, it wraps in Multiline
 		},
@@ -54,6 +57,9 @@ sap.ui.define([
 
 			return [oLink];
 		},
+		createDisplayMultiValue: function() {
+			throw new Error("sap.ui.mdc.field.content.LinkContent - createDisplayMultiValue not defined!");
+		},
 		createDisplayMultiLine: function(oContentFactory, aControlClasses, sId) {
 			return LinkContent.createDisplay(oContentFactory, aControlClasses, sId);
 		}

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

@@ -22,15 +22,24 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	var SearchContent = Object.assign({}, DefaultContent, {
+		getDisplayMultiValue: function() {
+			return [null];
+		},
+		getDisplayMultiLine: function() {
+			return [null];
+		},
 		getEdit: function() {
 			return ["sap/m/SearchField"];
 		},
-		getEditMulti: function() {
+		getEditMultiValue: function() {
 			return [null];
 		},
 		getEditMultiLine: function() {
 			return [null];
 		},
+		getEditForHelp: function() {
+			return [null];
+		},
 		getUseDefaultEnterHandler: function() {
 			return false;
 		},
@@ -58,11 +67,20 @@ sap.ui.define([
 
 			return [oControl];
 		},
-		createEditMulti: function() {
-			throw new Error("sap.ui.mdc.field.content.SearchContent - createEditMulti not defined!");
+		createEditMultiValue: function() {
+			throw new Error("sap.ui.mdc.field.content.SearchContent - createEditMultiValue not defined!");
 		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.SearchContent - createEditMultiLine not defined!");
+		},
+		createDisplayMultiValue: function() {
+			throw new Error("sap.ui.mdc.field.content.SearchContent - createDisplayMultiValue not defined!");
+		},
+		createDisplayMultiLine: function() {
+			throw new Error("sap.ui.mdc.field.content.SearchContent - createDisplayMultiLine not defined!");
+		},
+		createEditForHelp: function() {
+			throw new Error("sap.ui.mdc.field.content.SearchContent - createEditForHelp not defined!");
 		}
 	});
 

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

@@ -4,8 +4,9 @@
  * 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

@@ -26,8 +26,11 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	var UnitContent = Object.assign({}, DefaultContent, {
-		getEditMulti: function() {
-			return ["sap/ui/mdc/field/FieldMultiInput", "sap/ui/mdc/field/FieldInput", "sap/m/Token"];
+		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", "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,23 +63,25 @@ 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");
 
 			return aControls;
 		},
-		createEditMulti: function(oContentFactory, aControlClasses, sId) {
+		createEditMultiValue: function(oContentFactory, aControlClasses, sId) {
 			oContentFactory.setIsMeasure(true); // FieldHelp only on unit field
 			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

@@ -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.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -72,6 +72,7 @@ sap.ui.define([
 	{
 		metadata: {
 			library: "sap.ui.mdc",
+			designtime: "sap/ui/mdc/designtime/filterbar/FilterBarBase.designtime",
 			defaultAggregation: "filterItems",
 			interfaces : [
 				"sap.ui.mdc.IFilter",
@@ -783,9 +784,7 @@ sap.ui.define([
 			this._bSearchTriggered = true;
 			return Promise.resolve();
 		}
-		return this.validate().then(function(){
-			this.fireSearch();
-		}.bind(this));
+		return this.validate();
 	};
 
 	/**
@@ -798,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) {
@@ -809,7 +810,7 @@ sap.ui.define([
 				}.bind(this));
 
 				var fDelayedFunction = function() {
-					this._validate();
+					this._validate(bFireSearch);
 					this._oValidationPromise = null;
 				};
 				setTimeout(fDelayedFunction.bind(this), 0);
@@ -900,7 +901,9 @@ sap.ui.define([
 				} else {
 					this.triggerSearch();
 				}
-			}.bind(this));
+			}.bind(this)).catch(function(oEx) {
+				Log.error(oEx);
+			});
 		}
 	};
 
@@ -955,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();
@@ -974,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));
 	};
 
@@ -997,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;
@@ -1014,18 +1023,27 @@ 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) {
-			this._fResolvedSearchPromise();
-			fnCleanup();
+			if (this._isChangeApplying()) {
+				this._oFlexPromise.then(function() {
+					fnCheckAndFireSearch();
+					this._fResolvedSearchPromise();
+					fnCleanup();
+				}.bind(this));
+			} else {
+				fnCheckAndFireSearch();
+				this._fResolvedSearchPromise();
+				fnCleanup();
+			}
 		} else {
 			if (vRetErrorState === ErrorState.RequiredHasNoValue) {
 				sErrorMessage = this._oRb.getText("filterbar.REQUIRED_CONDITION_MISSING");
@@ -1052,8 +1070,9 @@ sap.ui.define([
 
 	/**
 	 * Assigns conditions to the inner condition model.
-	 * This method is only called for filling the in parameters for value help scenarios.
-	 * @protected
+	 * <br><b>Note:</b>This method is only called for filling the in parameters for value help scenarios.
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @param {map} mConditions A map containing the conditions
 	 */
 	FilterBarBase.prototype.setInternalConditions = function(mConditions) {
@@ -1064,9 +1083,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the conditions of the inner condition model.<br>
-	 * <b>Note:</b>This method must only be used for value help scenarios.
-	 * @protected
+	 * Returns the conditions of the inner condition model.
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @returns {map} A map containing the conditions
 	 */
 	FilterBarBase.prototype.getInternalConditions = function() {
@@ -1503,7 +1522,7 @@ sap.ui.define([
 
 	FilterBarBase.prototype._cleanUpFilterFieldInErrorState = function(oFilterField) {
 
-		if (oFilterField.getRequired() && (oFilterField.getValueState() !== ValueState.None)) {
+		if (oFilterField && (oFilterField.getValueState() !== ValueState.None)) {
 			oFilterField.setValueState(ValueState.None);
 		}
 

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @since 1.80.0

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

@@ -33,7 +33,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.94.0
+		 * @version 1.97.0
 		 * @constructor
 		 * @private
 		 * @since 1.84.0

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

@@ -0,0 +1,22 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'./ItemBaseFlex'
+], function(ItemBaseFlex) {
+	"use strict";
+
+    var oActionFlex = Object.assign({}, ItemBaseFlex);
+    oActionFlex.findItem = function(oModifier, aActions, sName) {
+		return sap.ui.getCore().byId(sName);
+	};
+
+	return {
+        "moveControls": "default",
+        moveAction: oActionFlex.createMoveChangeHandler()
+	};
+
+});