@openui5/sap.ui.mdc 1.93.0 → 1.93.4

package/.reuse/dep5

@@ -464,3 +464,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

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.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -462,6 +462,15 @@ 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
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.mdc",
-  "version": "1.93.0",
+  "version": "1.93.4",
   "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.93.0",
-    "@openui5/sap.ui.core": "1.93.0",
-    "@openui5/sap.ui.layout": "1.93.0"
+    "@openui5/sap.m": "1.93.4",
+    "@openui5/sap.ui.core": "1.93.4",
+    "@openui5/sap.ui.layout": "1.93.4"
   }
 }

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

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.93.0</version>
+	<version>1.93.4</version>
 
 	<documentation>UI5 library: sap.ui.mdc</documentation>
 

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

@@ -21,7 +21,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.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @experimental

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

@@ -69,7 +69,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.93.0
+		 * @version 1.93.4
 		 * @constructor
 		 * @experimental As of version 1.61
 		 * @private

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

@@ -57,7 +57,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.93.0
+         * @version 1.93.4
          * @constructor
          * @experimental As of version ...
          * @private

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

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

@@ -46,12 +46,12 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @since 1.54.0
 	 * @experimental As of version 1.54
 	 *

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

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

@@ -29,12 +29,12 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @since 1.48.0
 	 *
 	 * @experimental As of version 1.48

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @since 1.93.0
 	 *
 	 * @private

package/src/sap/ui/mdc/chartNew/ChartSelectionDetailsNew.js

@@ -33,7 +33,7 @@ sap.ui.define([
          * @class The ChartSelectionDetailsNew control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.93.0
+         * @version 1.93.4
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chartNew/ChartToolbarNew.js

@@ -41,7 +41,7 @@ sap.ui.define([
          * @class The ChartToolbarNew control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
          * @extends sap.m.OverflowToolbar
          * @author SAP SE
-         * @version 1.93.0
+         * @version 1.93.4
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chartNew/PropertyHelperNew.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/condition/Condition.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *

package/src/sap/ui/mdc/condition/ConditionConverter.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 * @experimental As of version 1.74

package/src/sap/ui/mdc/condition/ConditionModel.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.json.JSONModel
 		 *
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *

package/src/sap/ui/mdc/condition/FilterConverter.js

@@ -24,7 +24,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @since 1.78.0
 	 * @alias sap.ui.mdc.condition.FilterConverter
 	 *

package/src/sap/ui/mdc/condition/FilterOperatorUtil.js

@@ -50,7 +50,7 @@ function(
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *

package/src/sap/ui/mdc/condition/Operator.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 * @param {string} [oConfiguration.additionalInfo] additionalInfo text for the operator. Will be shown in the operator suggest as second column. If not used (undefined) the Include or Exclude information of the operator is used.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.93.0
+		 * @version 1.93.4
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that shows a list for Boolean values.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls to show a popover of conditions.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -62,6 +62,7 @@ sap.ui.define([
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
 	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
 	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. // TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
 	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it
@@ -114,12 +115,10 @@ sap.ui.define([
 		}
 
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
 		var bIsUnit = _isUnit(oType);
 		var bPreventGetDescription = this.oFormatOptions.preventGetDescription;
 
-		_attachCurrentValueAtType.call(this, oCondition, oOriginalDateType); // use original condition
-		_attachCurrentValueAtType.call(this, oCondition, oType);
+		_attachCurrentValueAtType.call(this, oCondition, oType); // use original condition
 
 		switch (this.getPrimitiveType(sInternalType)) {
 			case "string":
@@ -267,7 +266,7 @@ sap.ui.define([
 		var sDisplay = _getDisplay.call(this);
 		var bInputValidationEnabled = _isInputValidationEnabled.call(this);
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
+		var oOriginalType = _getOriginalType.call(this);
 		var aOperators = _getOperators.call(this);
 		var bIsUnit = _isUnit(oType);
 		var sDefaultOperator;
@@ -279,8 +278,6 @@ sap.ui.define([
 		}
 
 		_initCurrentValueAtType.call(this, oType);
-		_initCurrentValueAtType.call(this, oOriginalDateType);
-		_useCurrentValueFromOriginalType.call(this, oType, oOriginalDateType);
 
 		switch (this.getPrimitiveType(sInternalType)) {
 			case "string":
@@ -349,12 +346,12 @@ sap.ui.define([
 							}
 						} catch (oException) {
 							var oMyException = oException;
-							if (oMyException instanceof ParseException && oOriginalDateType) {
+							if (oMyException instanceof ParseException && oOriginalType) {
 								// As internal yyyy-MM-dd is used as pattern for dates (times similar) the
 								// parse exception might contain this as pattern. The user should see the pattern thats shown
 								// So try to parse date with the original type to get parseException with right pattern.
 								try {
-									oOriginalDateType.parseValue(vValue, "string", oOriginalDateType._aCurrentValue);
+									oOriginalType.parseValue(vValue, "string", oOriginalType._aCurrentValue);
 								} catch (oOriginalException) {
 									oMyException = oOriginalException;
 								}
@@ -395,7 +392,6 @@ sap.ui.define([
 	function _finishParseFromString(oCondition, oType) {
 
 		var bIsUnit = _isUnit(oType);
-		var oOriginalDateType = _getOriginalDateType.call(this);
 
 		if (oCondition && !bIsUnit) {
 			var sName = oType.getMetadata().getName();
@@ -413,7 +409,6 @@ sap.ui.define([
 		}
 
 		_attachCurrentValueAtType.call(this, oCondition, oType);
-		_attachCurrentValueAtType.call(this, oCondition, oOriginalDateType);
 
 		return oCondition;
 
@@ -570,7 +565,10 @@ sap.ui.define([
 		// Field accepts values that are not found -> must be checked by caller
 		// if user input fits to the type, let the caller validate it
 		var oOperator;
-		if (aOperators.length === 1) {
+		if (_isUnit(oType)) {
+			// in unit case just use EQ operator
+			oOperator = FilterOperatorUtil.getEQOperator("EQ");
+		} else if (aOperators.length === 1) {
 			// just use the one supported type
 			oOperator = FilterOperatorUtil.getOperator(aOperators[0]);
 		} else {
@@ -589,6 +587,10 @@ sap.ui.define([
 
 		if (oCondition) {
 			oCondition.validated = ConditionValidated.NotValidated;
+			if (_isUnit(oType) && Array.isArray(oCondition.values[0])) {
+				// user input is valid for type -> just return unit for further processing
+				oCondition.values[0] = oCondition.values[0][1];
+			}
 		}
 
 		return oCondition;
@@ -598,7 +600,7 @@ sap.ui.define([
 	ConditionType.prototype.validateValue = function(oCondition) {
 
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
+		var oOriginalType = _getOriginalType.call(this);
 		var aOperators = _getOperators.call(this);
 		var bIsUnit = _isUnit(oType);
 
@@ -647,11 +649,11 @@ sap.ui.define([
 		try {
 			oOperator.validate(oCondition.values, oType);
 		} catch (oException) {
-			if (oException instanceof ValidateException && oOriginalDateType) {
+			if (oException instanceof ValidateException && oOriginalType) {
 				// As internal yyyy-MM-dd is used as pattern for dates (times similar) the
 				// ValidateException might contain this as pattern. The user should see the pattern thats shown
 				// So try to validate date with the original type to get ValidateException with right pattern.
-				oOperator.validate(oCondition.values, oOriginalDateType);
+				oOperator.validate(oCondition.values, oOriginalType);
 			}
 			throw oException;
 		}
@@ -691,12 +693,18 @@ sap.ui.define([
 
 	}
 
-	function _getOriginalDateType() {
+	function _getOriginalType() {
 
 		return this.oFormatOptions.originalDateType;
 
 	}
 
+	function _getAdditionalType() {
+
+		return this.oFormatOptions.additionalType;
+
+	}
+
 	function _getOperators() {
 
 		var aOperators = this.oFormatOptions.operators;
@@ -746,23 +754,32 @@ sap.ui.define([
 	function _attachCurrentValueAtType(oCondition, oType) {
 
 		if (_isCompositeType.call(this, oType) && oCondition && oCondition.values[0]) {
-				oType._aCurrentValue = oCondition.values[0];
-		}
-
-	}
+			oType._aCurrentValue = oCondition.values[0];
 
-	function _initCurrentValueAtType(oType) {
+			var oAdditionalType = _getAdditionalType.call(this);
+			if (_isCompositeType.call(this, oAdditionalType)) { // store in corresponding unit or measure type too
+				oAdditionalType._aCurrentValue = oCondition.values[0];
+			}
 
-		if (_isCompositeType.call(this, oType) && !oType._aCurrentValue) {
-				oType._aCurrentValue = [];
+			var oOriginalType = _getOriginalType.call(this);
+			if (_isCompositeType.call(this, oOriginalType)) { // store in original type too (Currently not used in Unit/Currency type, but basically in CompositeType for parsing)
+				oOriginalType._aCurrentValue = oCondition.values[0];
+			}
 		}
 
 	}
 
-	function _useCurrentValueFromOriginalType(oType, oOriginalDateType) {
+	function _initCurrentValueAtType(oType) {
+
+		if (_isCompositeType.call(this, oType)) {
+			var oAdditionalType = _getAdditionalType.call(this);
+			if (_isCompositeType.call(this, oAdditionalType)) {
+				if (!oAdditionalType._aCurrentValue) {
+					oAdditionalType._aCurrentValue = [];
+				}
 
-		if (_isCompositeType.call(this, oType) && _isCompositeType.call(this, oOriginalDateType) && oOriginalDateType._aCurrentValue) {
-				oType._aCurrentValue = oOriginalDateType._aCurrentValue;
+				oType._aCurrentValue = oAdditionalType._aCurrentValue; // to use before entered corresponding number or unit
+			}
 		}
 
 	}

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -52,6 +52,7 @@ sap.ui.define([
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
 	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
 	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
 	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel

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

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -2813,6 +2813,7 @@ sap.ui.define([
 		return {
 			valueType: this._oContentFactory.retrieveDataType(),
 			originalDateType: this._oContentFactory.getDateOriginalType() || this._oContentFactory.getUnitOriginalType(),
+			additionalType: this._oContentFactory.getUnitType(), // only set if unit
 			display: this._oContentFactory.isMeasure() ? FieldDisplay.Value : this.getDisplay(),
 			fieldHelpID: this._oContentFactory.isMeasure() ? undefined : this.getFieldHelp() || this._sDefaultFieldHelp,
 			operators: this._getOperators(),
@@ -2886,7 +2887,8 @@ sap.ui.define([
 
 		return {
 			valueType: this._oContentFactory.getUnitType(),
-			originalDateType: this._oContentFactory.retrieveDataType(), // use type of measure for currentValue
+			originalDateType: this._oContentFactory.getDateOriginalType() || this._oContentFactory.getUnitOriginalType(),
+			additionalType: this._oContentFactory.retrieveDataType(), // use type of measure for currentValue
 			display: this.getDisplay(),
 			fieldHelpID: this.getFieldHelp() || this._sDefaultFieldHelp,
 			operators: ["EQ"],

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.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -27,7 +27,7 @@ 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.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

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.93.0
+	 * @version 1.93.4
 	 * @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.93.0
+	 * @version 1.93.4
 	 * @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.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private