@openui5/sap.ui.mdc 1.99.0 → 1.100.0

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -450,7 +450,7 @@ 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.1.34
+Component: SAP Theming Base Content, version: 11.1.36-SNAPSHOT
 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.99.0",
+  "version": "1.100.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.99.0",
-    "@openui5/sap.ui.core": "1.99.0",
-    "@openui5/sap.ui.layout": "1.99.0"
+    "@openui5/sap.m": "1.100.0",
+    "@openui5/sap.ui.core": "1.100.0",
+    "@openui5/sap.ui.layout": "1.100.0"
   }
 }

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

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.99.0</version>
+	<version>1.100.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.99.0
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @since 1.58

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

@@ -23,7 +23,8 @@ sap.ui.define([
         "sap/ui/mdc/p13n/subcontroller/SortController",
         "sap/ui/base/ManagedObjectObserver",
         "sap/ui/mdc/chart/DrillBreadcrumbs",
-        "sap/ui/mdc/actiontoolbar/ActionToolbarAction"
+        "sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+        "sap/ui/thirdparty/jquery"
     ],
     function (
         Core,
@@ -44,7 +45,8 @@ sap.ui.define([
         SortController,
         ManagedObjectObserver,
         Breadcrumbs,
-        ActionToolbarAction
+        ActionToolbarAction,
+        jQuery
     ) {
         "use strict";
 
@@ -58,7 +60,7 @@ sap.ui.define([
          * @class The Chart control creates a chart based on metadata and the configuration specified.
          * @extends sap.ui.mdc.Control
          * @author SAP SE
-         * @version 1.99.0
+         * @version 1.100.0
          * @constructor
          * @experimental As of version ...
          * @private
@@ -134,7 +136,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * Set chart's legend properties.
+                     * Enables the legend of the chart.
                      *
                      * @since 1.88
                      */
@@ -190,11 +192,11 @@ sap.ui.define([
                      * @since 1.99
                      */
                      filterConditions: {
-                        type: "object"
+                        type: "object",
+                        defaultValue: {}
                     },
                     /**
-                     * Controls the visibility of the chart tooltip. If set to <code>true </code>, an instance of sap.viz.ui5.controls.VizTooltip will
-                     * be created and shown when hovering over a data point.
+                     * Controls the visibility of the chart tooltip. If set to <code>true</code>, an instance of {@link sap.viz.ui5.controls.VizTooltip} is created and shown when hovering over a data point.
                      *
                      * @since 1.88
                      */
@@ -204,7 +206,8 @@ sap.ui.define([
                         defaultValue: true
                     },
                     /**
-                     * Binds the chart automatically after the initial creation of the chart
+                     * If set to <code>true</code>, the chart is automatically bound after initialization.
+                     * If set to <code>false</code>, the chart is bound after the first call to <code>rebind</code>.
                      */
                     autoBindOnInit: {
                         type: "boolean",
@@ -213,7 +216,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * Specifies the type of chart to be created by the SmartChart control.
+                     * Specifies the type of chart to be created by the <code>Chart</code> control.
                      */
                     chartType: {
                         type: "string",
@@ -224,6 +227,17 @@ sap.ui.define([
                         type: "boolean",
                         group: "Misc",
                         defaultValue: true
+                    },
+                    /**
+                     * Specifies the filter metadata.<br>
+                     * <b>Note</b>: This property must not be bound.<br>
+                     * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility/ Fiori Elements. Do not use it otherwise.
+                     *
+                     * @since 1.99
+                     */
+                    propertyInfo: {
+                        type: "object",
+                        defaultValue: []
                     }
                 },
                 aggregations: {
@@ -343,6 +357,9 @@ sap.ui.define([
             this.setModel(this._oManagedObjectModel, "$mdcChart");
             this._bNewP13n = true;//TODO: remove with migration
             Control.prototype.init.apply(this, arguments);
+
+            this._setupPropertyInfoStore("propertyInfo");
+            this._setPropertyHelperClass(PropertyHelper);
         };
 
         Chart.prototype.setP13nMode = function(aMode) {
@@ -442,6 +459,7 @@ sap.ui.define([
          * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.applySettings = function (mSettings, oScope) {
+            this._setPropertyHelperClass(PropertyHelper);
             Control.prototype.applySettings.apply(this, arguments);
 
             this.initializedPromise = new Promise(function (resolve, reject) {
@@ -471,6 +489,7 @@ sap.ui.define([
                 aInitPromises.push(this.retrieveInbuiltFilter());
             }
 
+            //TODO: Refactor this so we use awaitPropertyHelper
             Promise.all(aInitPromises).then(function(){
                 this._initInnerControls();
             }.bind(this));
@@ -482,6 +501,7 @@ sap.ui.define([
          * Inner chart is initialized via the delegate
          */
         Chart.prototype._initInnerControls = function () {
+
             this.getControlDelegate().initializeInnerChart(this).then(function (oInnerChart) {
 
                 this.setBusyIndicatorDelay(0);
@@ -491,16 +511,14 @@ sap.ui.define([
 
                 if (this.getAutoBindOnInit()) {
                     this.setBusy(true);
-                    this._createContentfromPropertyInfos();
+                    this._createContentfromPropertyInfos(oInnerChart);
                 }
 
                 this.setAggregation("_innerChart", oInnerChart);
-
                 this._bInnerChartReady = true;
-
                 this._fnResolveInitialized();
-                // eslint-disable-next-line no-empty
                 this.invalidate();
+
             }.bind(this)).catch(function (error) {
                 this._fnRejectInitialized(error);
             }.bind(this));
@@ -517,27 +535,27 @@ sap.ui.define([
          *
          * Is called during init when autoBindOnInit = "true", if "false" then this is called by _rebind()
          */
-        Chart.prototype._createContentfromPropertyInfos = function () {
-            this.initPropertyHelper(PropertyHelper).then(function () {
-                //Create content on inner chart instance
-                this.getControlDelegate().createInnerChartContent(this, this._innerChartDataLoadComplete.bind(this));
-
-                this._createBreadcrumbs();
-                //From now on, listen to changes on Items Aggregation and sync them with inner chart
-                this._oObserver = new ManagedObjectObserver(this._propagateItemChangeToInnerChart.bind(this));
-                this._oObserver.observe(this, {
-                    aggregations: [
-                        "items"
-                    ]
-                });
-
-                //Sync MDC Chart properties with inner chart
-                this._propagatePropertiesToInnerChart();
-
-                this._fnResolveInnerChartBound();
+        Chart.prototype._createContentfromPropertyInfos = function (oInnerChart) {
 
+            //Make sure all MDC Items have the necessary information to create a chart
+            this.getControlDelegate().checkAndUpdateMDCItems(this).then(function(){
+                //Create content on inner chart instance
+                this.getControlDelegate().createInnerChartContent(this, this._innerChartDataLoadComplete.bind(this)).then(function(){
+                    this._createBreadcrumbs();
+                    //From now on, listen to changes on Items Aggregation and sync them with inner chart
+                    this._oObserver = new ManagedObjectObserver(this._propagateItemChangeToInnerChart.bind(this));
+                    this._oObserver.observe(this, {
+                        aggregations: [
+                            "items"
+                        ]
+                    });
+
+                    //Sync MDC Chart properties with inner chart
+                    this._propagatePropertiesToInnerChart();
+
+                    this._fnResolveInnerChartBound();
+                }.bind(this));
             }.bind(this));
-
         };
 
         Chart.prototype.setHeight = function(iHeight) {

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

@@ -31,7 +31,7 @@ sap.ui.define([
      */
 
     /**
-     *Zooms in on the inner chart.
+     * Zooms in on the inner chart.
      * @param {int} iValue Number of steps for zooming in
      *
      * @experimental
@@ -42,7 +42,7 @@ sap.ui.define([
     };
 
     /**
-     *Zooms out of the inner chart.
+     * Zooms out of the inner chart.
      * @param {int} iValue Number of steps for zooming out
      *
      * @experimental
@@ -69,6 +69,64 @@ sap.ui.define([
     ChartDelegate.getZoomState = function () {
     };
 
+    ChartDelegate.getFilterDelegate = function() {
+		return {
+
+			/**
+			 * Creates an instance of a <code>sap.ui.mdc.FilterField</code>.
+			 *
+			 * @param {string} sPropertyName The property name
+			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+			 * @returns {Promise<sap.ui.mdc.FilterField>} <code>Promise</code> that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
+			 * @see sap.ui.mdc.AggregationBaseDelegate#addItem
+			 */
+		    addItem: function (sPropertyName, oControl) {
+				return Promise.resolve();
+		    },
+
+			/**
+			 * This methods is called during the appliance of the add condition change.
+			 * This intention is to update the propertyInfo property.
+			 *
+			 * @param {string} sPropertyName The name of a property.
+			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 */
+			addCondition: function(sPropertyName, oControl, mPropertyBag) {
+				return Promise.resolve();
+		    },
+
+			/**
+			 * This methods is called during the appliance of the remove condition change.
+			 * This intention is to update the propertyInfo property.
+			 *
+			 * @param {string} sPropertyName The name of a property.
+			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 */
+		    removeCondition: function(sPropertyName, oControl, mPropertyBag) {
+				return Promise.resolve();
+		    }
+		};
+	};
+
+    /**
+     * Creates a new MDC chart item for a given property name and updates the inner chart.
+     * <b>Note:</b> This does <b>not</b> add the MDC chart item to the <code>Items</code> aggregation of the MDC chart.
+     * Called and used by <code>p13n</code>.
+     * @param {string} sPropertyName Name of the property added
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart to which the item is added
+     * @returns {Promise<sap.ui.mdc.Chart.Item>} <code>Promise</code> that resolves with new MDC chart item as parameter
+     *
+     * @experimental
+     * @private
+     * @ui5-restricted sap.ui.mdc
+     */
+    ChartDelegate.addItem = function (sPropertyName, oMDCChart, mPropertyBag, sRole) {
+    };
+
     /**
      * @typedef {object} SelectionDetails
      * @property {string} eventId  ID of the selection event
@@ -140,27 +198,14 @@ sap.ui.define([
     ChartDelegate.removeItemFromInnerChart = function (oMDCChartItem) {
     };
 
-    /**
-     * Creates a new MDC chart item for a given property name and updates the inner chart.
-     * <b>Note:</b> This does <b>not</b> add the MDC chart item to the <code>Items</code> aggregation of the MDC chart.
-     * Called and used by <code>p13n</code>.
-     * @param {string} sPropertyName Name of the property added
-     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart to which the item is added
-     * @returns {Promise<sap.ui.mdc.Chart.Item>} <code>Promise</code> that resolves with new MDC chart item as parameter
-     *
-     * @experimental
-     * @private
-     * @ui5-restricted sap.ui.mdc
-     */
-    ChartDelegate.addItem = function (sPropertyName, oMDCChart, mPropertyBag, sRole) {
-    };
+
 
     /**
      * Removes an existing MDC chart item for a given property name and updates the inner chart.
      * Called and used by p13n
-     * @param {string} sPropertyName Name of the property removed
+     * @param {string} oProperty Name of the property removed
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart from which property is removed
-     * @returns {Promise<bool>} Promise containing information whether the item was deleted
+     * @returns {Promise<boolean>} Promise containing information whether the item was deleted
      *
      * @experimental
      * @private
@@ -242,7 +287,7 @@ sap.ui.define([
     /**
      * Gets the available chart types for the current state of the inner chart.
      *
-     * @returns {array<ChartTypeObject>} Array containing the available chart types
+     * @returns {Array<ChartTypeObject>} Array containing the available chart types
      *
      * @experimental
      * @private
@@ -268,7 +313,7 @@ sap.ui.define([
      * Returns all sorted dimensions of an inner chart as property.
      * This is used to determine possible drilldown dimensions in the drill down popover of the MDC chart.
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @returns {Promise<array<sap.ui.mdc.chart.Item>>} <code>Promise</code> containing an array of dimensions that is sorted
+     * @returns {Promise<Array<sap.ui.mdc.chart.Item>>} <code>Promise</code> containing an array of dimensions that is sorted
      *
      * @experimental
      * @private
@@ -282,7 +327,7 @@ sap.ui.define([
      * This function is used by the breadcrumb navigation.
      *
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @returns {array<sap.ui.mdc.chart.Item>} Array of MDC items that are drillable
+     * @returns {Array<sap.ui.mdc.chart.Item>} Array of MDC items that are drillable
      *
      * @experimental
      * @private

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

@@ -28,7 +28,7 @@ sap.ui.define(['./library'],
          * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
          *
          * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-         * @param {sap.ui.mdc.Chart} oInnerChart An object representation of the control that should be rendered
+         * @param {sap.ui.mdc.Chart} oMDCChart An object representation of the control that should be rendered
          */
         ChartRenderer.render = function(oRm, oMDCChart) {
                 oRm.openStart("div", oMDCChart);

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Control",  "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/AdaptationMixin"
-], function(CoreControl, DelegateMixin, AdaptationMixin) {
+	"sap/ui/core/Control",  "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/PropertyHelperMixin", "sap/ui/mdc/mixin/AdaptationMixin"
+], function(CoreControl, DelegateMixin, PropertyHelperMixin, AdaptationMixin) {
 	"use strict";
 
 	/**
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
@@ -28,9 +28,12 @@ sap.ui.define([
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPayload as getPayload
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeUtil as getTypeUtil
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initControlDelegate as initControlDelegate
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initPropertyHelper as initPropertyHelper
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitPropertyHelper as awaitPropertyHelper
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPropertyHelper as getPropertyHelper
+	 *
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.initPropertyHelper as initPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.awaitPropertyHelper as awaitPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.getPropertyHelper as getPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.finalizePropertyHelper as finalizePropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.isPropertyHelperFinal as isPropertyHelperFinal
 	 *
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getEngine as getInstance
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.retrieveInbuiltFilter as retrieveInbuiltFilter
@@ -61,8 +64,10 @@ sap.ui.define([
 		renderer: CoreControl.renderer
 	});
 
+
 	DelegateMixin.call(Control.prototype);
 	AdaptationMixin.call(Control.prototype);
+	PropertyHelperMixin.call(Control.prototype);
 
 	return Control;
 });

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

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Element", "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/AdaptationMixin"
-], function(CoreElement, DelegateMixin, AdaptationMixin) {
+	"sap/ui/core/Element", "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/PropertyHelperMixin", "sap/ui/mdc/mixin/AdaptationMixin"
+], function(CoreElement, DelegateMixin, PropertyHelperMixin, AdaptationMixin) {
 	"use strict";
 
 	/**
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
@@ -28,10 +28,13 @@ sap.ui.define([
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPayload as getPayload
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeUtil as getTypeUtil
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initControlDelegate as initControlDelegate
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initPropertyHelper as initPropertyHelper
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitPropertyHelper as awaitPropertyHelper
-	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPropertyHelper as getPropertyHelper
 	 *
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.initPropertyHelper as initPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.awaitPropertyHelper as awaitPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.getPropertyHelper as getPropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.finalizePropertyHelper as finalizePropertyHelper
+	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.isPropertyHelperFinal as isPropertyHelperFinal
+     *
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getEngine as getInstance
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.retrieveInbuiltFilter as retrieveInbuiltFilter
  	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getInbuiltFilter as getInbuiltFilter
@@ -63,6 +66,7 @@ sap.ui.define([
 
 	DelegateMixin.call(Element.prototype);
 	AdaptationMixin.call(Element.prototype);
+	PropertyHelperMixin.call(Element.prototype);
 
 	return Element;
 });

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

@@ -46,12 +46,12 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.54.0
 	 * @experimental As of version 1.54
 	 *
@@ -188,7 +188,9 @@ sap.ui.define([
 				this._oBindingContext = oBindingContext;
 				this._oContentFactory.updateConditionType();
 				if (this._bParseError || this.getFieldHelp()) { // In FieldHelp case InParameters might need an update
-					this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates
+					if (this._oManagedObjectModel) {
+						this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates
+					}
 					this._bParseError = false;
 				}
 			}
@@ -216,7 +218,9 @@ sap.ui.define([
 
 		if (sPropertyName === "value" && this._bParseError && deepEqual(this.getValue(), this.validateProperty(sPropertyName, oValue))) {
 			// in parse error and same value - no update on property - so remove error here
-			this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates (additionalValue will follow)
+			if (this._oManagedObjectModel) {
+				this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates (additionalValue will follow)
+			}
 			this._bParseError = false;
 		}
 
@@ -532,6 +536,17 @@ sap.ui.define([
 		return false;
 
 	}
+
+	Field.prototype._checkCreateInternalContent = function() {
+
+		if (!this.bIsDestroyed && this._oContentFactory.getDataType() && !this._isPropertyInitial("editMode") && !this._isPropertyInitial("multipleLines")) {
+			// If DataType is provided via Binding and EditMode is set the internal control can be created
+			// TODO: no control needed if just template for cloning
+			FieldBase.prototype._checkCreateInternalContent.apply(this, arguments);
+		}
+
+	};
+
 	/**
 	 * Sets conditions to the property <code>conditions</code>.
 	 *

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.99.0
+	 * @version 1.100.0
 	 * @constructor
 	 * @experimental As of version 1.61
 	 * @private

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

@@ -33,5 +33,31 @@ sap.ui.define(["sap/ui/mdc/AggregationBaseDelegate"], function(AggregationBaseDe
 		return Promise.resolve(true);
 	};
 
+	/**
+	 * This methods is called during the appliance of the add condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	FilterBarDelegate.addCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return Promise.resolve();
+    };
+
+	/**
+	 * This methods is called during the appliance of the remove condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	FilterBarDelegate.removeCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return Promise.resolve();
+    };
+
 	return FilterBarDelegate;
 });

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

@@ -6,11 +6,13 @@
 sap.ui.define([
 	'sap/ui/mdc/field/FieldBase',
 	'sap/ui/mdc/field/FieldBaseRenderer',
+	'sap/ui/mdc/enum/FieldDisplay',
 	'sap/base/util/merge',
 	'sap/base/util/deepEqual'
 ], function(
 		FieldBase,
 		FieldBaseRenderer,
+		FieldDisplay,
 		merge,
 		deepEqual
 	) {
@@ -31,12 +33,12 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.48.0
 	 *
 	 * @experimental As of version 1.48
@@ -141,7 +143,9 @@ sap.ui.define([
 			// As ConditionModel triggers checkUpdate in forced mode on addCondition, setConditions... also unchanged conditions will be updated
 			// So e.g. if a variant is applied an error will be removed.
 			if (this._oContentFactory.getBoundProperty()) { // single value case
-				this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates (additionalValue will follow)
+				if (this._oManagedObjectModel) {
+					this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates (additionalValue will follow)
+				}
 			} else { // Multi value case - don't update tokens, initialize value
 				var oContent = this._getContent()[0];
 				if (oContent && oContent.setValue) {
@@ -341,6 +345,40 @@ sap.ui.define([
 		return this;
 	};
 
+	FilterField.prototype._checkCreateInternalContent = function() {
+
+		if (!this.bIsDestroyed && !this.isPropertyInitial("dataType")) {
+			// If DataType is set in applySettings we can assume it is final and DataTypeFormatOptions and DataTypeContraints are set too
+			// EditMode is not relevant as non editable FilterFields are not a use case in the moment.
+			// MultipleLines is also not used for FilterFields in the moment.
+			// MaxConditions should also be set on applySettings
+
+			var sId = this.getFieldHelp();
+			var oFieldHelp = sap.ui.getCore().byId(sId);
+			var oBindingInfo = this.getBindingInfo("conditions");
+			var oBinding = this.getBinding("conditions");
+			if (this.getDisplay() !== FieldDisplay.Value && sId && (!oFieldHelp || (oBindingInfo && !oBinding))) {
+				// FieldHelp might need ConditionModel to determine value of InParameters to get the description.
+				// So if FieldHelp not exists right now or binding to ConditionModel not already created, wait.
+				return;
+			}
+
+			this._oContentFactory.retrieveDataType();
+			FieldBase.prototype._checkCreateInternalContent.apply(this, arguments);
+		}
+
+	};
+
+	FilterField.prototype._handleModelContextChange = function(oEvent) {
+
+		FieldBase.prototype._handleModelContextChange.apply(this, arguments);
+
+		if (this._getContent().length === 0) {
+			// inner control not created, maybe it can be created bow (maybe ConditionModel assignment changed)
+			this._triggerCheckCreateInternalContent();
+		}
+
+	};
 
 	return FilterField;