@openui5/sap.ui.mdc 1.96.2 → 1.98.0

package/src/sap/ui/mdc/util/TypeUtil.js

@@ -1,13 +1,14 @@
 /*!
  * 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/enum/BaseType',
-		'sap/base/util/ObjectPath'
-	], function(BaseType, ObjectPath) {
+		'sap/base/util/ObjectPath',
+		'sap/ui/model/SimpleType'
+	], function(BaseType, ObjectPath, SimpleType) {
 	"use strict";
 
 	/**
@@ -154,7 +155,7 @@ sap.ui.define([
 
 			var oType, sDataType;
 
-			if (vType instanceof sap.ui.model.SimpleType) {
+			if (vType instanceof SimpleType) {
 				oType = vType;
 			} else {
 				var sDataTypeClass = this.getDataTypeClassName(vType);
@@ -172,4 +173,4 @@ sap.ui.define([
 
 	return TypeUtil;
 
-}, /* bExport= */ true);
+});

package/src/sap/ui/mdc/util/loadModules.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/valuehelp/Dialog.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.
  */
 
@@ -37,12 +37,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the <code>sap.ui.mdc.ValueHelp</code> element showing a dialog.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.Dialog
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -210,7 +211,7 @@ sap.ui.define([
 					oDialog.addStyleClass("sapMdcValueHelpTitle");
 					oDialog.addStyleClass("sapMdcValueHelpTitleShadow");
 
-					var oVBox = new VBox({ fitContainer: true});
+					var oVBox = new VBox(this.getId() + "-Content", { fitContainer: true});
 					oVBox.addStyleClass("sapMdcValueHelpPanel");
 					oDialog.addContent(oVBox);
 
@@ -350,7 +351,7 @@ sap.ui.define([
 				var BackgroundDesign = MLibrary.BackgroundDesign;
 				var ButtonType = MLibrary.ButtonType;
 
-				this.oTokenizerPanel = new Panel( {
+				this.oTokenizerPanel = new Panel(this.getId() + "-TokenPanel", {
 					backgroundDesign: BackgroundDesign.Transparent,
 					expanded: true,
 					visible: { parts: ['$valueHelp>/_config/maxConditions', '$help>/content'], formatter:
@@ -385,20 +386,22 @@ sap.ui.define([
 				});
 				this.oTokenizerPanel.addStyleClass("sapMdcTokenizerPanel");
 
-				var oHBox = new HBox({fitContainer: true, width: "100%"});
+				var oHBox = new HBox(this.getId() + "-TokenBox", {fitContainer: true, width: "100%"});
 
 				var oFilter = new Filter({path:'isEmpty', operator:'NE', value1:true});
 
 				var oValueHelpModel = this.getModel("$valueHelp");
 				var oConfig = oValueHelpModel ? oValueHelpModel.getProperty("/_config") : {};
+				var oParent = this.getParent();
 				var oFormatOptions = { // TODO: is more needed?
 							maxConditions: -1, // as for tokens there should not be a limit on type side
 							valueType: oConfig.dataType,
 							operators: oConfig.operators,
-							display: oConfig.display
+							display: oConfig.display,
+							fieldHelpID: oParent && oParent.getId() // needed to get description for Token (if not provided)
 						};
-				var oTokenTemplate = new Token({text: {path: '$valueHelp>', type: new ConditionType(oFormatOptions)}});
-				this.oTokenizer = new Tokenizer({
+				var oTokenTemplate = new Token(this.getId() + "-Token", {text: {path: '$valueHelp>', type: new ConditionType(oFormatOptions)}});
+				this.oTokenizer = new Tokenizer(this.getId() + "-Tokenizer", {
 					width: "100%",
 					tokenDelete: function(oEvent) {
 						if (oEvent.getParameter("tokens")) {
@@ -419,9 +422,10 @@ sap.ui.define([
 					tokens: {path: '/conditions', model: "$valueHelp", templateShareable: false, template: oTokenTemplate, filters: oFilter},
 					layoutData: new FlexItemData({growFactor: 1, maxWidth: "calc(100% - 2rem)"})
 				});
+				this.oTokenizer.addAriaDescribedBy( this.oTokenizer.getTokensInfoId());
 				this.oTokenizer.addStyleClass("sapMdcTokenizer");
 
-				this.oRemoveAllBtn = new Button({
+				this.oRemoveAllBtn = new Button(this.getId() + "-TokenRemoveAll", {
 					press: function(oEvent) {
 						this.fireSelect({type: SelectType.Set, conditions: []});
 

package/src/sap/ui/mdc/valuehelp/Popover.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.
  */
 
@@ -24,12 +24,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the <code>sap.ui.mdc.ValueHelp</code> element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.Popover
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -153,6 +154,10 @@ sap.ui.define([
 		}
 	};
 
+	Popover.prototype.providesScrolling = function () {
+		return true;
+	};
+
 	Popover.prototype._observeChanges = function (oChanges) {
 		if (oChanges.name === "content") {
 			var oContent = oChanges.child;
@@ -205,7 +210,7 @@ sap.ui.define([
 		}
 
 		var oControl = this._getControl();
-		var oTarget = oControl && oControl.getFocusElementForValueHelp && oControl.getFocusElementForValueHelp(this.isTypeahead());
+		var oTarget = oControl && oControl.getFocusElementForValueHelp ? oControl.getFocusElementForValueHelp(this.isTypeahead()) : oControl;
 
 		if (oTarget && oTarget.getDomRef()) {
 			oPopover.setContentMinWidth(jQuery(oTarget.getDomRef()).outerWidth() + "px");
@@ -348,6 +353,13 @@ sap.ui.define([
 
 	};
 
+	Popover.prototype.isTypeaheadSupported = function () {
+
+		var oContent = this._getContent();
+		return oContent && oContent.isSearchSupported();
+
+	};
+
 	Popover.prototype.exit = function () {
 		if (this._oCurrentContent) {
 			if (!this._oCurrentContent.bIsDestroyed) {

package/src/sap/ui/mdc/valuehelp/base/Container.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.
  */
 
@@ -24,12 +24,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the <code>ValueHelp</code> element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.Container
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -438,6 +439,37 @@ sap.ui.define([
 		return oValueHelp && oValueHelp.getTypeahead() === this;
 	};
 
+	/**
+	 * Determines if the content of the container supports typeahead
+	 *
+	 * <b>Note:</b> This function is used by the container and content and must not be used from outside
+	 *
+	 * @returns {boolean} Flag if searching is supported
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.ValueHelp, sap.ui.mdc.valueHelp.base.Content
+	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	Container.prototype.isTypeaheadSupported = function () {
+		return false;
+	};
+
+	/**
+	 * Determines if the container provides a own scroll functionality.
+	 * If not, the <code>Content</code> needs to provide a scrolling solution like a <code>ScrollContainer</code>.
+	 *
+	 * <b>Note:</b> This function is used by the container and content and must not be used from outside
+	 *
+	 * @returns {boolean} True if scrolling is provided
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
+	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	Container.prototype.providesScrolling = function () {
+		return false;
+	};
+
 	/**
 	 * Determines the delegate of the value help
 	 *

package/src/sap/ui/mdc/valuehelp/base/Content.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.
  */
 
@@ -32,12 +32,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.Content
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -184,6 +185,8 @@ sap.ui.define([
 			properties: ["filterValue", "conditions", "config"]
 		});
 
+		this._oOperator = FilterOperatorUtil.getEQOperator(); // use as default if no configuartion
+
 	};
 
 	Content.prototype.exit = function() {
@@ -415,6 +418,37 @@ sap.ui.define([
 		return oContainer && oContainer.isTypeahead();
 	};
 
+	/**
+	 * Determines if the content supports search
+	 *
+	 * <b>Note:</b> This function is used by the container and content and must not be used from outside
+	 *
+	 * @returns {boolean} Flag if searching is supported
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Container
+	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	Content.prototype.isSearchSupported = function () {
+		return false;
+	};
+
+	/**
+	 * Determines if the the content needs to provide a scrolling mechanism like a
+	 * <code>ScrollContainer</code>
+	 *
+	 * <b>Note:</b> This function is used by the content and must not be used from outside
+	 *
+	 * @returns {boolean} True a scrolling mechanism is needed
+	 *
+	 * @private
+	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	Content.prototype.provideScrolling = function () {
+		var oContainer = this.getParent();
+		return !oContainer || !oContainer.providesScrolling();
+	};
+
 	Content.prototype.isContainerOpen = function () {
 		var oContainer = this.getParent();
 		return oContainer && oContainer.isOpen();
@@ -568,10 +602,7 @@ sap.ui.define([
 	}
 
 	function _determineOperator(aOperators) {
-		this._oOperator = undefined;
-		if (aOperators) {
-			this._oOperator = FilterOperatorUtil.getEQOperator(aOperators);
-		}
+		this._oOperator = FilterOperatorUtil.getEQOperator(aOperators); // if no operators provided use default EQ operator
 	}
 
 	function _getOperator() {

package/src/sap/ui/mdc/valuehelp/base/DialogTab.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,12 +20,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.DialogTab
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.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,12 +34,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.FilterableListContent
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -149,7 +150,9 @@ sap.ui.define([
 
 	FilterableListContent.prototype._handleFilterValueUpdate = function (oChanges) {
 		_addFilterValueToFilterBar.call(this, this._getPriorityFilterBar(), oChanges.current);
-		this.applyFilters(oChanges.current);
+		if (this.isContainerOpen()) { // TODO: only visible content if multiple contens on dialog
+			this.applyFilters(oChanges.current);
+		}
 	};
 
 	FilterableListContent.prototype.applyFilters = function (sSearch) {
@@ -420,21 +423,25 @@ sap.ui.define([
 
 			if (["_defaultFilterBar", "filterBar"].indexOf(oChanges.name) !== -1) {
 				var oFilterBar = oChanges.child;
+				var oExistingBasicSearchField = oFilterBar.getBasicSearchField();
 				if (oChanges.mutation === "insert") {
 					var sFilterFields =  this.getFilterFields();
-					var oExistingBasicSearchField = oFilterBar.getBasicSearchField();
-					if (!oExistingBasicSearchField && sFilterFields) {
+					if (!oExistingBasicSearchField && sFilterFields) { // TODO: use isSearchSupported but here Delegate needs to be loaded
 						return loadModules([
 							"sap/ui/mdc/FilterField"
 						]).then(function (aModules){
-							var FilterField = aModules[0];
-							oFilterBar.setBasicSearchField(new FilterField(this.getId() + "-search", {
-								conditions: "{$filters>/conditions/" + sFilterFields + "}",
-								placeholder:"{$i18n>filterbar.SEARCH}",
-								label:"{$i18n>filterbar.SEARCH}", // TODO: do we want a label?
-								maxConditions: 1,
-								width: "50%"
-							}));
+							if (!oFilterBar.bIsDestroyed) {
+								var FilterField = aModules[0];
+								var oSearchField = new FilterField(this.getId() + "-search", {
+									conditions: "{$filters>/conditions/" + sFilterFields + "}",
+									placeholder:"{$i18n>filterbar.SEARCH}",
+									label:"{$i18n>filterbar.SEARCH}", // TODO: do we want a label?
+									maxConditions: 1,
+									width: "50%"
+								});
+								oSearchField._bCreatedByValueHelp = true;
+								oFilterBar.setBasicSearchField(oSearchField);
+							}
 						}.bind(this));
 					} else if (oExistingBasicSearchField) {
 						oExistingBasicSearchField.setConditions([]);
@@ -442,6 +449,11 @@ sap.ui.define([
 					this._assignCollectiveSearch();
 					_addInParameterToFilterBar.call(this, oFilterBar, this.getProperty("inConditions"));
 					_addFilterValueToFilterBar.call(this, oFilterBar, this.getFilterValue());
+				} else if (oChanges.name === "filterBar") {
+					if (oExistingBasicSearchField && oExistingBasicSearchField._bCreatedByValueHelp) {
+						oExistingBasicSearchField.destroy(); // TODO: reuse for default FilterBar?
+					}
+					this._createDefaultFilterBar();
 				}
 			}
 		}
@@ -528,9 +540,11 @@ sap.ui.define([
 
 		if (oFilterBar && sFilterFields) {
 			var oConditions = oFilterBar.getInternalConditions();
-			var oCondition = Condition.createCondition("StartsWith", [sFilterValue], undefined, undefined, ConditionValidated.NotValidated);
-			oConditions[sFilterFields] = [oCondition];
-			oFilterBar.setInternalConditions(oConditions);
+			if (!oConditions[sFilterFields] || oConditions[sFilterFields].length !== 1 || oConditions[sFilterFields][0].values[0] !== sFilterValue) {
+				var oCondition = Condition.createCondition("Contains", [sFilterValue], undefined, undefined, ConditionValidated.NotValidated);
+				oConditions[sFilterFields] = [oCondition];
+				oFilterBar.setInternalConditions(oConditions);
+			}
 		}
 
 	}
@@ -551,6 +565,20 @@ sap.ui.define([
 		return sShortTitle;
 	};
 
+	FilterableListContent.prototype.isSearchSupported = function () {
+
+		var sFilterFields =  this.getFilterFields();
+		var bSearchSupported = !!sFilterFields;
+		if (sFilterFields === "$search") {
+			var oListBinding = this._getListBinding();
+			var oDelegate = this._getValueHelpDelegate();
+			var oDelegatePayload = this._getValueHelpDelegatePayload();
+			bSearchSupported = oDelegate && oDelegate.isSearchSupported(oDelegatePayload, oListBinding);
+		}
+
+		return bSearchSupported;
+
+	};
 
 	return FilterableListContent;
 

package/src/sap/ui/mdc/valuehelp/base/ListContent.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,12 +20,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.ListContent
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/content/Bool.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,12 +22,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.Bool
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/content/Conditions.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.
  */
 
@@ -25,12 +25,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element showing a condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.Conditions
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -61,11 +62,6 @@ sap.ui.define([
 					}
 				},
 				aggregations: {
-					_defineConditionPanel: {
-						type: "sap.ui.mdc.field.DefineConditionPanel",
-						multiple: false,
-						visibility: "hidden"
-					}
 				},
 				events: {}
 			}
@@ -90,16 +86,19 @@ sap.ui.define([
 
 	Conditions.prototype.getContent = function () {
 		return this._retrievePromise("content", function () {
-			return loadModules([
+			var aModules = [
 				"sap/ui/mdc/field/DefineConditionPanel",
-				"sap/ui/model/base/ManagedObjectModel", // TODO use on ValueHelp level? But then how to bind local properties?
+				"sap/ui/model/base/ManagedObjectModel" // TODO use on ValueHelp level? But then how to bind local properties?
 //				"sap/ui/mdc/condition/FilterOperatorUtil"
-				"sap/m/ScrollContainer"
-			]).then(function (aModules) {
+			];
+			if (this.provideScrolling()) {
+				aModules.push("sap/m/ScrollContainer");
+			}
+			return loadModules(aModules).then(function (aModules) {
 					var DefineConditionPanel = aModules[0];
 					var ManagedObjectModel = aModules[1];
 //					FilterOperatorUtil = aModules[2];
-					var ScrollContainer = aModules[2];
+					var ScrollContainer = aModules.length > 2 && aModules[2];
 
 					this._oManagedObjectModel = new ManagedObjectModel(this);
 					this._oDefineConditionPanel = new DefineConditionPanel(
@@ -112,26 +111,22 @@ sap.ui.define([
 							conditionProcessed: _handleConditionProcessed.bind(this)
 						}
 					).setModel(this._oManagedObjectModel, "$help");
-					this.setAggregation("_defineConditionPanel", this._oDefineConditionPanel, true); // to have in control tree
-
-					this._oScrollContainer = new ScrollContainer(this.getId() + "-SC", {
-						height: "100%",
-						width: "100%",
-						vertical: true
-					});
-
-					this._oScrollContainer._oWrapper = this;
-					this._oScrollContainer.getContent = function() {
-						var aContent = [];
-						var oDefineConditionPanel = this._oWrapper && this._oWrapper._oDefineConditionPanel;
-						if (oDefineConditionPanel) {
-							aContent.push(oDefineConditionPanel);
-						}
-						return aContent;
-					};
-					this.setAggregation("displayContent", this._oScrollContainer);
-					return this._oScrollContainer;
-				}.bind(this));
+
+					if (ScrollContainer) {
+						this._oScrollContainer = new ScrollContainer(this.getId() + "-SC", {
+							height: "100%",
+							width: "100%",
+							vertical: true,
+							content: [this._oDefineConditionPanel]
+						});
+
+						this.setAggregation("displayContent", this._oScrollContainer);
+						return this._oScrollContainer;
+					} else {
+						this.setAggregation("displayContent", this._oDefineConditionPanel);
+						return this._oDefineConditionPanel;
+					}
+			}.bind(this));
 		}.bind(this));
 	};
 
@@ -233,7 +228,7 @@ sap.ui.define([
 //		FilterOperatorUtil.updateConditionsValues(aConditions); // to remove static text from static conditions
 //
 //		this.fireSetConditions({conditions: aConditions});
-		this.fireConfirm();
+		this.fireConfirm({close: true});
 	}
 
 	function _handleConditionProcessed(oEvent) {
@@ -266,6 +261,7 @@ sap.ui.define([
 			oFormatOptions.payload = oConfig.payload;
 			oFormatOptions.operators = oConfig.operators;
 			oFormatOptions.display = oConfig.display;
+			oFormatOptions.defaultOperatorName = oConfig.defaultOperatorName;
 		}
 
 		return oFormatOptions;