@openui5/sap.ui.mdc 1.96.5 → 1.99.0

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

@@ -91,7 +91,7 @@ sap.ui.define([
 	 * Creates the suitable controls for the given content type and mode and returns the control instances.
 	 * @param {sap.ui.mdc.field.content.DefaultContent} oContentType The content type object
 	 * @param {sap.ui.mdc.enum.ContentMode} sContentMode A given content mode
-	 * @param {String} sId ID of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {string} sId ID of the {@link sap.ui.mdc.field.FieldBase}
 	 * @returns {sap.ui.core.Control[]} Array containing the created controls
 	 */
 	ContentFactory.prototype.createContent = function(oContentType, sContentMode, sId) {
@@ -132,9 +132,9 @@ sap.ui.define([
 	 * Determines in which {@link sap.ui.mdc.enum.ContentMode} the given content type is displayed.
 	 * @param {sap.ui.mdc.field.content.DefaultContent} oContentType The content type object
 	 * @param {sap.ui.mdc.enum.EditMode} sEditMode The display mode of the {@link sap.ui.mdc.field.FieldBase}
-	 * @param {Integer} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {int} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
 	 * @param {boolean} bMultipleLines Determines if the content type has a multiple line input
-	 * @param {String[]} aOperators Names of the operators if the <code>EditOperator</code> content mode is used
+	 * @param {string[]} aOperators Names of the operators if the <code>EditOperator</code> content mode is used
 	 * @returns {sap.ui.mdc.enum.ContentMode} sContentMode A given content mode
 	 */
 	ContentFactory.prototype.getContentMode = function(oContentType, sEditMode, iMaxConditions, bMultipleLines, aOperators) {
@@ -163,7 +163,7 @@ sap.ui.define([
 	/**
 	 * Determines which content type object to use.
 	 * @param {sap.ui.mdc.enum.BaseType} sBaseType Base type determined by {@link sap.ui.mdc.field.FieldBase}
-	 * @param {Integer} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
+	 * @param {int} iMaxConditions Maximum number of conditions of the {@link sap.ui.mdc.field.FieldBase}
 	 * @param {boolean} bIsTriggerable Checks if the {@link sap.ui.mdc.field.FieldBase} is triggerable or not - needed for link content type
 	 * @returns {sap.ui.mdc.field.content.DefaultContent} oContentType Content type object
 	 */
@@ -242,7 +242,7 @@ sap.ui.define([
 
 	/**
 	 * Defines to which property the field value is bound.
-	 * @param {String} sBoundProperty the name of the property.
+	 * @param {string} sBoundProperty the name of the property.
 	 */
 	ContentFactory.prototype.setBoundProperty = function(sBoundProperty) {
 		this._sBoundProperty = sBoundProperty;
@@ -271,28 +271,36 @@ sap.ui.define([
 		return this._bHideOperator;
 	};
 
-	ContentFactory.prototype.getConditionType = function(bSkipConditionTypeGeneration) {
-		if (!bSkipConditionTypeGeneration && !this._oConditionType) {
-			var oFormatOptions = this.getField()._getFormatOptions();
-			this._oConditionType = new ConditionType(oFormatOptions);
-			this._oConditionType._bCreatedByField = true;
+	function _getCondType(sCondType, CondType, fnGetFormatOptions, bSkipTypeGeneration) {
+
+		if (!bSkipTypeGeneration) {
+			if (this[sCondType] && this[sCondType].getMetadata().getName() !== CondType.getMetadata().getName()) {
+				// ConditionsType changed
+				this[sCondType].destroy();
+				this[sCondType] = undefined;
+			}
+
+			if (!this[sCondType]) {
+				var oFormatOptions = fnGetFormatOptions();
+				this[sCondType] = new CondType(oFormatOptions);
+				this[sCondType]._bCreatedByField = true;
+			}
 		}
+		return this[sCondType];
+
+	}
 
-		return this._oConditionType;
+	ContentFactory.prototype.getConditionType = function(bSkipConditionTypeGeneration) {
+		return _getCondType.call(this, "_oConditionType", ConditionType, this.getField()._getFormatOptions.bind(this.getField()), bSkipConditionTypeGeneration);
 	};
 
 	ContentFactory.prototype.setConditionType = function(oConditionType) {
 		this._oConditionType = oConditionType;
 	};
 
-	ContentFactory.prototype.getConditionsType = function(bSkipConditionsTypeGeneration) {
-		if (!bSkipConditionsTypeGeneration && !this._oConditionsType) {
-			var oFormatOptions = this.getField()._getFormatOptions();
-			this._oConditionsType = new ConditionsType(oFormatOptions);
-			this._oConditionsType._bCreatedByField = true;
-		}
-
-		return this._oConditionsType;
+	ContentFactory.prototype.getConditionsType = function (bSkipConditionsTypeGeneration, CustomConditionsType) {
+		var UsedConditionType = CustomConditionsType || ConditionsType; // CustomConditionsType used for DynamicDateRange
+		return _getCondType.call(this, "_oConditionsType", UsedConditionType, this.getField()._getFormatOptions.bind(this.getField()), bSkipConditionsTypeGeneration);
 	};
 
 	ContentFactory.prototype.setConditionsType = function(oConditionsType) {
@@ -300,13 +308,7 @@ sap.ui.define([
 	};
 
 	ContentFactory.prototype.getUnitConditionsType = function(bSkipConditionsTypeGeneration) {
-		if (!bSkipConditionsTypeGeneration && !this._oUnitConditionsType) {
-			var oFormatOptions = this.getField()._getUnitFormatOptions();
-			this._oUnitConditionsType = new ConditionsType(oFormatOptions);
-			this._oUnitConditionsType._bCreatedByField = true;
-		}
-
-		return this._oUnitConditionsType;
+		return _getCondType.call(this, "_oUnitConditionsType", ConditionsType, this.getField()._getUnitFormatOptions.bind(this.getField()), bSkipConditionsTypeGeneration);
 	};
 
 	ContentFactory.prototype.getContentConditionTypes = function() {

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

@@ -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[sOption]) {
+				sOption = oOperator.alias || sOption;
+			}
+
+			if (StandardDynamicDateRangeKeys[sOption]) {
+				return sOption; // use standard option
+			} else
+				// use OperatorDynamicDateOption
+				if (oOperator) {
+					if (!DynamicDateUtil.getOption(sOption)) {
+						var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
+						var aValueTypes = [];
+
+						for (var j = 0; j < oOperator.valueTypes.length; j++) {
+							if (oOperator.valueTypes[j] && oOperator.valueTypes[j] !== Operator.ValueType.Static) {
+								aValueTypes.push("custom"); // provide value as it is to use type to format and parse // TODO: only if custom control?
+							}
+						}
+
+						DynamicDateUtil.addOption(new OperatorDynamicDateOption({key: sOption, operator: oOperator, type: oType, valueTypes: aValueTypes})); // TODO: use name as key?
+					}
+					return sOption;
+				}
+		},
+
+		_getDateRangeFormatter: function(oContentFactory) {
+			var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
+			var oFormatOptions = oType.getFormatOptions();
+			var oDateRangeFormatOptions = {};
+
+			if (oFormatOptions.style) {
+				oDateRangeFormatOptions.date = {style: oFormatOptions.style};
+			} else if (oFormatOptions.pattern) {
+				oDateRangeFormatOptions.date = {pattern: oFormatOptions.pattern};
+			}
+
+			return DynamicDateFormat.getInstance(oDateRangeFormatOptions);
 		}
 	});
 

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

@@ -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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"use strict";
 
 	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
+	var TokenizerRenderMode = mLibrary.TokenizerRenderMode;
 
 	/**
 	 * Object-based definition of the default content type that is used in the {@link sap.ui.mdc.field.content.ContentFactory}.
@@ -31,7 +32,7 @@ sap.ui.define([
 			return ["sap/m/Text"];
 		},
 		getDisplayMultiValue: function() {
-			return this.getDisplayMultiLine();
+			return ["sap/ui/mdc/field/TokenizerDisplay", "sap/ui/mdc/field/TokenDisplay"];
 		},
 		getDisplayMultiLine: function() {
 			return ["sap/m/ExpandableText"];
@@ -55,13 +56,13 @@ sap.ui.define([
 			return true;
 		},
 		getUseDefaultFieldHelp: function() {
-			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: false };
+			return { name: "defineConditions", oneOperatorSingle: false, oneOperatorMulti: false, single: true, multi: true };
 		},
 		/**
 		 * Determines which controls to return for a given {@link sap.ui.mdc.enum.ContentMode}.
 		 * @param {sap.ui.mdc.enum.ContentMode} sContentMode The given content mode
-		 * @param {String} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
-		 * @returns {String[]} aControlNames Names of the determined controls
+		 * @param {string} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
+		 * @returns {string[]} aControlNames Names of the determined controls
 		 */
 		getControlNames: function(sContentMode, sOperator) {
 			var aControlNames;
@@ -103,9 +104,9 @@ sap.ui.define([
 		 * Creates the suitable controls for the given content mode and returns the control instances.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls this function
 		 * @param {sap.ui.mdc.enum.ContentMode} sContentMode a given content mode
-		 * @param {String} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
+		 * @param {string} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
 		 * @param {Object[]} aControls Array containing the control classes that are to be created
-		 * @param {String} sId ID of the {@link sap.ui.mdc.field.FieldBase}
+		 * @param {string} sId ID of the {@link sap.ui.mdc.field.FieldBase}
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		create: function(oContentFactory, sContentMode, sOperator, aControls, sId) {
@@ -135,7 +136,7 @@ sap.ui.define([
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEdit: function(oContentFactory, aControlClasses, sId) {
@@ -172,7 +173,7 @@ sap.ui.define([
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEditMultiValue: function(oContentFactory, aControlClasses, sId) {
@@ -219,7 +220,7 @@ sap.ui.define([
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEditMultiLine: function(oContentFactory, aControlClasses, sId) {
@@ -252,7 +253,7 @@ sap.ui.define([
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createDisplay: function(oContentFactory, aControlClasses, sId) {
@@ -275,7 +276,7 @@ sap.ui.define([
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 * @since 1.91
 		 */
@@ -297,18 +298,39 @@ sap.ui.define([
 		 * 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
+		 * @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
+			var Tokenizer = aControlClasses[0];
+			var Token = aControlClasses[1];
+			var oConditionType = oContentFactory.getConditionType();
+			var oToken = new Token(sId + "-token", {
+				text: {
+					path: '$field>',
+					type: oConditionType
+				}
+			});
+
+			var oTokenizer = new Tokenizer(sId, {
+				editable: false,
+				// textAlign: "{$field>/textAlign}",
+				emptyIndicatorMode: EmptyIndicatorMode.Auto,
+				renderMode: TokenizerRenderMode.Narrow,
+				width: "100%",
+				tooltip: "{$field>/tooltip}",
+				tokens: { path: "$field>/conditions", template: oToken },
+				dependents: [oToken] // to destroy it if Control is destroyed
+			});
+
+			return [oTokenizer];
 		},
 		/**
 		 * 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
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 * @since 1.96
 		 */

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

@@ -43,7 +43,7 @@ sap.ui.define([
 				textDirection: "{$field>/textDirection}",
 				tooltip: "{$field>/tooltip}",
 				press: oContentFactory.getHandleContentPress(),
-				wrapping: true
+				wrapping: "{$field>/multipleLines}"
 			});
 			var oFieldInfo = oContentFactory.getField().getFieldInfo();
 			if (oFieldInfo) {

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