@openui5/sap.ui.mdc 1.94.0 → 1.97.0

package/src/sap/ui/mdc/field/FieldHelpBase.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Base type for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -712,7 +712,7 @@ sap.ui.define([
 
 	/**
 	 * Calls initialization of the FieldHelp before the FieldHelp is really opened.
-	 * This is called in typeahead on first letter before the FieldHelp is opened with a delay. So the
+	 * This is called in Typeahead on first letter before the FieldHelp is opened with a delay. So the
 	 * content can be determined in the delegate coding early.
 	 *
 	 * <b>Note:</b> This function must only be called by the control the <code>FieldHelp</code> element
@@ -1091,7 +1091,7 @@ sap.ui.define([
 	 */
 	FieldHelpBase.prototype.isValidationSupported = function() {
 		// to be implemented by the concrete FieldHelp
-		return true;
+		return this.isUsableForValidation();
 	};
 
 	/**
@@ -1122,7 +1122,28 @@ sap.ui.define([
 	 */
 	FieldHelpBase.prototype.getItemForValue = function(vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
 
-		return _getItemForValue.call(this, vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst && bCheckKey, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+		if (typeof vValue !== "object" || !vValue.hasOwnProperty("value")) {
+			// not new config object -> map old properties to config
+			vValue = {
+					value: vValue,
+					parsedValue: vParsedValue,
+					inParameters: oInParameters, // TODO: needed?
+					outParameters: oOutParameters, // TODO: needed?
+					bindingContext: oBindingContext,
+					checkKeyFirst: bCheckKeyFirst, // TODO: not longer needed?
+					checkKey: bCheckKey,
+					checkDescription: bCheckDescription,
+					conditionModel: oConditionModel,
+					conditionModelName: sConditionModelName
+			};
+		}
+
+		if (vValue && typeof vValue === "object" && vValue.hasOwnProperty("value")) {
+			// map new Config to old API
+			return _getItemForValue.call(this, vValue.value, vValue.parsedValue, vValue.inParameters, vValue.outParameters, vValue.bindingContext, vValue.checkKeyFirst && vValue.checkKey, vValue.checkKey, vValue.checkDescription, vValue.conditionModel, vValue.conditionModelName);
+		} else {
+			return _getItemForValue.call(this, vValue, vParsedValue, oInParameters, oOutParameters, oBindingContext, bCheckKeyFirst && bCheckKey, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+		}
 
 	};
 
@@ -1476,6 +1497,45 @@ sap.ui.define([
 
 	}
 
+	/// renaming of functions -> call original ones
+	FieldHelpBase.prototype.isTypeaheadSupported = function() {
+		return this.openByTyping();
+	};
+	FieldHelpBase.prototype.shouldOpenOnClick = function() {
+		return this.openByClick();
+	};
+	FieldHelpBase.prototype.onControlChange = function() {
+		return this.onFieldChange();
+	};
+
+	FieldHelpBase.prototype.getAriaAttributes = function(iMaxConditions) {
+
+		return {
+			contentId: this.getContentId(),
+			ariaHasPopup: this.getAriaHasPopup(),
+			role: "combobox",
+			roleDescription: this.getRoleDescription(iMaxConditions),
+			valueHelpEnabled: this.getValueHelpEnabled()
+		};
+
+	};
+
+	FieldHelpBase.prototype.attachEvent = function(sEventId, oData, fnFunction, oListener) {
+		if (sEventId === "navigated") {
+			return Element.prototype.attachEvent.apply(this, ["navigate", oData, fnFunction, oListener]);
+		} else {
+			return Element.prototype.attachEvent.apply(this, arguments);
+		}
+	};
+
+	FieldHelpBase.prototype.detachEvent = function(sEventId, fnFunction, oListener) {
+		if (sEventId === "navigated") {
+			return Element.prototype.detachEvent.apply(this, ["navigate", fnFunction, oListener]);
+		} else {
+			return Element.prototype.detachEvent.apply(this, arguments);
+		}
+	};
+
 	return FieldHelpBase;
 
 });

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -27,10 +27,12 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0
+	 * @experimental As of version 1.54
+	 * @ui5-restricted sap.ui.mdc
 	 * @alias sap.ui.mdc.field.FieldInfoBase
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -39,7 +41,13 @@ sap.ui.define([
 		metadata: {
 			library: "sap.ui.mdc",
 			events: {
+				/**
+				 * This event is fired if the data was updated.
+				 */
 				dataUpdate: {},
+				/**
+				 * This event is fired after the popover is opened.
+				 */
 				popoverAfterOpen: {}
 			}
 		}

package/src/sap/ui/mdc/field/FieldInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Input
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

package/src/sap/ui/mdc/field/FieldMultiInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.MultiInput
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldValueHelp.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a value help dialog.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -648,11 +648,11 @@ sap.ui.define([
 
 				if (oWrapper) {
 					oWrapper.fieldHelpOpen(false);
-						_updateSelectedItems.call(this);
-					}
-					this._aOldConditions = this.getConditions();
-					oDialog.open();
-					this._bDialogOpen = true; // to know already during opening animation
+					_updateSelectedItems.call(this);
+				}
+				this._aOldConditions = this.getConditions();
+				oDialog.open();
+				this._bDialogOpen = true; // to know already during opening animation
 			} else {
 				this._bOpen = true;
 			}
@@ -1369,6 +1369,10 @@ sap.ui.define([
 				if (oWrapper) {
 					var oValueHelpPanel = oDialog.getContent()[0];
 					_setContentOnValueHelpPanel.call(this, oValueHelpPanel, oWrapper.getDialogContent());
+					if (!this._bApplyFilter && !this._bClosing && (this.isOpen() || this._bOpen) && !oWrapper.isSuspended()) {
+						// in case ListBinding changed or is not longer suspended
+						this._bApplyFilter = true;
+          }
 				}
 			}
 		}
@@ -2601,6 +2605,8 @@ sap.ui.define([
 					liveMode: !oWrapper.isSuspended(), // if suspended, no live search
 					showGoButton: false
 				});
+				oFilterBar.setInternalConditions(this._oConditions); // if already InParameter or SearchValue set, move it to FilterBar
+				this._oConditions = {};
 				this.setAggregation("_filterBar", oFilterBar, true);
 			}
 

package/src/sap/ui/mdc/field/FieldValueHelpContentWrapperBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>FieldValueHelp</code> content control wrapper.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldValueHelpDelegate.js

@@ -75,6 +75,26 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Changes the search string.
+	 *
+	 * If <code>$search</code> is used, depending on which back-end service is used, the search string might need to be escaped.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {boolean} bTypeahead <code>true</code> if the search is called for a type-ahead
+	 * @param {string} sSearch Search string
+	 * @returns {string} Search string to use
+	 * @since 1.97.0
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	 FieldValueHelpDelegate.adjustSearch = function(oPayload, bTypeahead, sSearch) {
+
+		return sSearch;
+
+	};
+
 	/**
 	 * Executes a filter in a <code>ListBinding</code>.
 	 *

package/src/sap/ui/mdc/field/FieldValueHelpMTableWrapper.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/FieldValueHelpMdcTableWrapper.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/FieldValueHelpTableWrapperBase.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a table control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpContentWrapperBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @experimental As of version 1.88
@@ -561,6 +561,7 @@ sap.ui.define([
 				oListBinding.suspend();
 			}
 
+			sSearch = oDelegate.delegate.adjustSearch(oDelegate.payload, this._bSuggestion, sSearch);
 			oDelegate.delegate.executeSearch(oDelegate.payload, oListBinding, sSearch);
 			Log.info("ValueHelp-Search: " + sSearch);
 		}

package/src/sap/ui/mdc/field/FieldValueHelpUITableWrapper.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/field/InParameter.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>InParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ListFieldHelp.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a list of items.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/OutParameter.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>OutParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.mdc.field.InParameter
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ValueHelpPanel.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel
@@ -124,6 +124,7 @@ sap.ui.define([
 
 			if (!this._oTokenizer) {
 				this._oTokenizer = this.byId("VHPTokenizer");
+				this._oTokenizer.addAriaDescribedBy( this._oTokenizer.getTokensInfoId());
 				this._oTokenizer._oScroller.setHorizontal(true);
 			}
 			this._oTokenizerPanel = this.byId("VHPTokenizerPanel");

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

@@ -21,20 +21,32 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	var BooleanContent = Object.assign({}, DefaultContent, {
-		getEditMulti: function() {
+		getDisplayMultiValue: function() {
+			return [null];
+		},
+		getDisplayMultiLine: function() {
+			return [null];
+		},
+		getEditMultiValue: function() {
 			return [null];
 		},
 		getEditMultiLine: function() {
 			return [null];
 		},
 		getUseDefaultFieldHelp: function() {
-			return { name: "bool", oneOperatorSingle: true, oneOperatorMulti: true };
+			return { name: "bool", oneOperatorSingle: true, oneOperatorMulti: true, single: true, multi: true };
 		},
-		createEditMulti: function() {
-			throw new Error("sap.ui.mdc.field.content.BooleanContent - createEditMulti not defined!");
+		createEditMultiValue: function() {
+			throw new Error("sap.ui.mdc.field.content.BooleanContent - createEditMultiValue not defined!");
 		},
 		createEditMultiLine: function() {
 			throw new Error("sap.ui.mdc.field.content.BooleanContent - createEditMultiLine not defined!");
+		},
+		createDisplayMultiValue: function() {
+			throw new Error("sap.ui.mdc.field.content.BooleanContent - createDisplayMultiValue not defined!");
+		},
+		createDisplayMultiLine: function() {
+			throw new Error("sap.ui.mdc.field.content.BooleanContent - createDisplayMultiLine not defined!");
 		}
 	});
 

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

@@ -140,14 +140,22 @@ sap.ui.define([
 	ContentFactory.prototype.getContentMode = function(oContentType, sEditMode, iMaxConditions, bMultipleLines, aOperators) {
 		var sContentMode = ContentMode.Edit;
 		if (sEditMode === EditMode.Display) {
-			sContentMode = bMultipleLines ? ContentMode.DisplayMultiLine : ContentMode.Display;
+			if (iMaxConditions !== 1) {
+				sContentMode = ContentMode.DisplayMultiValue;
+			} else if (bMultipleLines) {
+				sContentMode = ContentMode.DisplayMultiLine;
+			} else {
+				sContentMode = ContentMode.Display;
+			}
 		} else if (iMaxConditions !== 1) {
-			sContentMode = ContentMode.EditMulti;
+			sContentMode = ContentMode.EditMultiValue;
 		} else if (bMultipleLines) {
 			sContentMode = ContentMode.EditMultiLine;
 		} else if (aOperators.length === 1 && oContentType.getEditOperator() && oContentType.getEditOperator()[aOperators[0]]) {
 			this._sOperator = aOperators[0];
 			sContentMode = ContentMode.EditOperator;
+		} else if (this.getField().getFieldHelp()) { // if FieldHelp assigned use control supporting help
+			sContentMode = ContentMode.EditForHelp;
 		}
 		return sContentMode;
 	};
@@ -263,42 +271,44 @@ sap.ui.define([
 		return this._bHideOperator;
 	};
 
-	ContentFactory.prototype.getConditionType = function() {
-		if (!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() {
-		if (!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) {
 		this._oConditionsType = oConditionsType;
 	};
 
-	ContentFactory.prototype.getUnitConditionsType = function() {
-		if (!this._oUnitConditionsType) {
-			var oFormatOptions = this.getField()._getUnitFormatOptions();
-			this._oUnitConditionsType = new ConditionsType(oFormatOptions);
-			this._oUnitConditionsType._bCreatedByField = true;
-		}
-
-		return this._oUnitConditionsType;
+	ContentFactory.prototype.getUnitConditionsType = function(bSkipConditionsTypeGeneration) {
+		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

@@ -7,11 +7,22 @@ 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);
 		}
 	});