@openui5/sap.m 1.84.20 → 1.84.23

package/src/sap/m/MessageListItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessageListItemRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["./StandardListItemRenderer", "sap/ui/core/Renderer"],

package/src/sap/m/MessagePage.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -69,7 +69,7 @@ sap.ui.define([
 		 * @see {@link fiori:https://experience.sap.com/fiori-design-web/message-page/ Message Page}
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePageRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/MessagePopover.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -91,7 +91,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopoverItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -19,7 +19,7 @@ sap.ui.define(["./library", "./MessageItem"],
 		 * @extends sap.m.MessageItem
 		 *
 		 * @author SAP SE
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopoverRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/MessageStrip.js

@@ -1,6 +1,6 @@
 /*!
 * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 
@@ -78,7 +78,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MessageStripRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/MessageStripUtilities.js

@@ -1,6 +1,6 @@
 /*!
 * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 

package/src/sap/m/MessageToast.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -70,7 +70,7 @@ sap.ui.define([
 		 * The message toast has the same behavior on all devices. However, you can adjust the width of the control, for example, for use on a desktop device.
 		 *
 		 * @author SAP SE
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @namespace
 		 * @public

package/src/sap/m/MessageView.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -112,7 +112,7 @@ sap.ui.define([
 	 * The responsiveness of the <code>MessageView</code> is determined by the container in which it is embedded. For that reason the control could not be visualized if the
 	 * container’s sizes are not defined.
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor

package/src/sap/m/MessageViewRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/MultiComboBox.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -142,7 +142,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase
@@ -1189,7 +1189,7 @@ function(
 		ComboBoxBase.prototype.onBeforeRendering.apply(this, arguments);
 		this._bInitialSelectedKeysSettersCompleted = true;
 		this.getAggregation("tokenizer").setEnabled(this.getEnabled());
-		if (this._getList()) {
+		if (this._getList() && !this.getPicker().isOpen()) {
 			this.syncPickerContent(true);
 		}
 		this._deregisterResizeHandler();
@@ -3507,10 +3507,24 @@ function(
 
 		var oInfo = ComboBoxBase.prototype.getAccessibilityInfo.apply(this, arguments);
 		oInfo.type = core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_MULTICOMBO");
-		oInfo.description = ((oInfo.description || "") + " " + sText).trim();
+		oInfo.description = (this.getValueDescriptionInfo() + " " + sText).trim();
 		return oInfo;
 	};
 
+	/**
+	 * Gets the value of the accessibility description info field.
+	 *
+	 * @protected
+	 * @override
+	 * @returns {string} The value of the accessibility description info
+	 */
+	MultiComboBox.prototype.getValueDescriptionInfo = function () {
+		if (this.getValue()) {
+			return this.getValue();
+		}
+		return this._hasTokens() ? "" : sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("INPUTBASE_VALUE_EMPTY");
+	};
+
 	/**
 	 * Indicates if selection is triggered by a click
 	 *
@@ -3541,7 +3555,7 @@ function(
 	MultiComboBox.prototype._calculateSpaceForTokenizer = function () {
 		if (this.getDomRef()) {
 			var iSpace,
-				iControlWidth = this.getDomRef().offsetWidth,
+				iControlWidth = this.getDomRef().getBoundingClientRect().width,
 				iSummedIconsWidth = this._calculateIconsSpace(),
 				oInputRef = this.$().find(".sapMInputBaseInner"),
 				aInputRelevantCss = ["min-width", "padding-right", "padding-left"],

package/src/sap/m/MultiComboBoxRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/Core'],

package/src/sap/m/MultiEditField.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], function(XMLComposite, library, Item) {
@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], fun
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -120,7 +120,7 @@ function(
 	* @extends sap.m.Input
 	*
 	* @author SAP SE
-	* @version 1.84.20
+	* @version 1.84.23
 	*
 	* @constructor
 	* @public
@@ -1381,27 +1381,46 @@ function(
 
 		var oInfo = Input.prototype.getAccessibilityInfo.apply(this, arguments);
 		oInfo.type = oRb.getText("ACC_CTR_TYPE_MULTIINPUT");
-		oInfo.description = ((oInfo.description || "") + " " + sText).trim();
+		oInfo.description = (this.getValueDescriptionInfo() + " " + sText).trim();
 		return oInfo;
 	};
 
-	MultiInput.prototype._modifyPopupInput = function (oPopupInput) {
-		var that = this;
+	/**
+	 * Gets the value of the accessibility description info field.
+	 *
+	 * @protected
+	 * @override
+	 * @returns {string} The value of the accessibility description info
+	 */
+	MultiInput.prototype.getValueDescriptionInfo = function () {
+		var iTokensLength = this.getTokens().length;
+		var sDescriptionText = this.getDescription() || "";
+		var sValue = this.getValue();
 
-		oPopupInput.addEventDelegate({
-			oninput: that._manageListsVisibility.bind(that, false),
-			onsapenter: function (oEvent) {
-				if (oPopupInput.getValue()) {
-					that._closeSuggestionPopup();
-				}
+		if (sValue) {
+			return sValue;
+		}
 
-				that._validateCurrentText();
-				that._setValueVisible(false);
+		// Empty string or the description text should be set as acc description in case there are no tokens and no value.
+		// This way the tokens will be announced as the control's value.
+		if (iTokensLength > 0) {
+			return sDescriptionText;
+		} else {
+			// "Empty" or the description text should be set as acc description in case there are no tokens and no value.
+			return sDescriptionText ? sDescriptionText : sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("INPUTBASE_VALUE_EMPTY");
+		}
+	};
 
-				// Fire through the MultiInput Popup's input value and save it
-				that.onChange(oEvent, null, oPopupInput.getValue());
-			}
-		});
+	MultiInput.prototype._modifyPopupInput = function (oPopupInput) {
+
+		if (!this._oPopupInputDelegate) {
+			this._oPopupInputDelegate = {
+				oninput: this._manageListsVisibility.bind(this, false),
+				onsapenter: this._handleConfirmation.bind(this, false)
+			};
+		}
+
+		oPopupInput.addEventDelegate(this._oPopupInputDelegate, this);
 
 		return oPopupInput;
 	};
@@ -1412,12 +1431,32 @@ function(
 
 
 	MultiInput.prototype.forwardEventHandlersToSuggPopover = function (oSuggPopover) {
-
-		Input.prototype.forwardEventHandlersToSuggPopover.apply(this, arguments);
 		oSuggPopover.setShowSelectedPressHandler(this._handleShowSelectedPress.bind(this));
+		oSuggPopover.setOkPressHandler(this._handleConfirmation.bind(this, true));
+		oSuggPopover.setCancelPressHandler(this._handleCancelPress.bind(this));
+	};
+
+	// Handles "Enter" key press and OK button press
+	MultiInput.prototype._handleConfirmation = function (bOkButtonPressed, oEvent) {
+		var oPopupInput = this._getSuggestionsPopoverInstance()._oPopupInput;
+
+		if (bOkButtonPressed || (!bOkButtonPressed && oPopupInput.getValue())) {
+			this._closeSuggestionPopup();
+		}
+
+		this._validateCurrentText();
+		this._setValueVisible(false);
+
+		// Fire through the MultiInput Popup's input value and save it
+		this.onChange(oEvent, null, oPopupInput.getValue());
+	};
+
+	MultiInput.prototype._handleCancelPress  = function (oEvent) {
+		this._getSuggestionsPopoverInstance()._oPopupInput.setDOMValue(this.getLastValue());
+		this._closeSuggestionPopup();
 	};
 
-	MultiInput.prototype._handleShowSelectedPress  = function (oEvent) {
+	MultiInput.prototype._handleShowSelectedPress = function (oEvent) {
 		this._bShowListWithTokens = oEvent.getSource().getPressed();
 		this._manageListsVisibility(this._bShowListWithTokens);
 	};

package/src/sap/m/MultiInputRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(['./InputRenderer', 'sap/ui/core/Renderer', "sap/ui/core/Core"],

package/src/sap/m/NavContainer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NavContainerRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NewsContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NewsContentRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NotificationListBase.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -80,7 +80,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.84.20
+		 * @version 1.84.23
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListGroupRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NotificationListItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -72,7 +72,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListItemRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NumericContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -105,7 +105,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.84.20
+	 * @version 1.84.23
 	 * @since 1.34
 	 *
 	 * @public
@@ -121,37 +121,37 @@ sap.ui.define([
 				/**
 				 * If set to true, the change of the value will be animated.
 				 */
-				"animateTextChange": {type: "boolean", group: "Behavior", defaultValue: true},
+				"animateTextChange": { type: "boolean", group: "Behavior", defaultValue: true },
 
 				/**
 				 * If set to true, the value parameter contains a numeric value and scale. If set to false (default), the value parameter contains a numeric value only.
 				 */
-				"formatterValue": {type: "boolean", group: "Data", defaultValue: false},
+				"formatterValue": { type: "boolean", group: "Data", defaultValue: false },
 
 				/**
 				 * The icon to be displayed as a graphical element within the control. This can be an image or an icon from the icon font.
 				 */
-				"icon": {type: "sap.ui.core.URI", group: "Appearance", defaultValue: null},
+				"icon": { type: "sap.ui.core.URI", group: "Appearance", defaultValue: null },
 
 				/**
 				 * Description of an icon that is used in the tooltip.
 				 */
-				"iconDescription": {type: "string", group: "Accessibility", defaultValue: null},
+				"iconDescription": { type: "string", group: "Accessibility", defaultValue: null },
 
 				/**
 				 * The indicator arrow that shows value deviation.
 				 */
-				"indicator": {type: "sap.m.DeviationIndicator", group: "Appearance", defaultValue: "None"},
+				"indicator": { type: "sap.m.DeviationIndicator", group: "Appearance", defaultValue: "None" },
 
 				/**
 				 * If set to true, the omitted value property is set to 0.
 				 */
-				"nullifyValue": {type: "boolean", group: "Behavior", defaultValue: true},
+				"nullifyValue": { type: "boolean", group: "Behavior", defaultValue: true },
 
 				/**
 				 * The scaling prefix. Financial characters can be used for currencies and counters. The SI prefixes can be used for units. If the scaling prefix contains more than three characters, only the first three characters are displayed.
 				 */
-				"scale": {type: "string", group: "Appearance", defaultValue: null},
+				"scale": { type: "string", group: "Appearance", defaultValue: null },
 
 				/**
 				 * Updates the size of the control. If not set, then the default size is applied based on the device tile.
@@ -165,32 +165,32 @@ sap.ui.define([
 				 * <b>Note</b> If <code>adaptiveFontSize</code> is set to <code>true</code> the default value of this property will vary between languages.
 				 * If <code>adaptiveFontSize</code> is set to <code>false</code> the default value of this property is <code>4</code>.
 				 */
-				"truncateValueTo": {type: "int", group: "Appearance"},
+				"truncateValueTo": { type: "int", group: "Appearance" },
 
 				/**
 				 * The actual value.
 				 */
-				"value": {type: "string", group: "Data", defaultValue: null},
+				"value": { type: "string", group: "Data", defaultValue: null },
 
 				/**
 				 * The semantic color of the value.
 				 */
-				"valueColor": {type: "sap.m.ValueColor", group: "Appearance", defaultValue: "Neutral"},
+				"valueColor": { type: "sap.m.ValueColor", group: "Appearance", defaultValue: "Neutral" },
 
 				/**
 				 * The width of the control. If it is not set, the size of the control is defined by the 'size' property.
 				 */
-				"width": {type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: null},
+				"width": { type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: null },
 
 				/**
 				 * If the value is set to false, the content is adjusted to the whole size of the control.
 				 */
-				"withMargin": {type: "boolean", group: "Appearance", defaultValue: true},
+				"withMargin": { type: "boolean", group: "Appearance", defaultValue: true },
 
 				/**
 				 * Indicates the load status.
 				 */
-				"state": {type: "sap.m.LoadState", group: "Behavior", defaultValue: "Loaded"},
+				"state": { type: "sap.m.LoadState", group: "Behavior", defaultValue: "Loaded" },
 
 				/**
 				 * If set to its default value true this property applies the appropriate font style class based on the language. When set to false the font size will always be large
@@ -198,7 +198,7 @@ sap.ui.define([
 				 * @experimental As of version 1.73 Disclaimer: this property is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
 				 * @since 1.73
 				 */
-				"adaptiveFontSize": {type: "boolean", group: "Appearance", defaultValue: true}
+				"adaptiveFontSize": { type: "boolean", group: "Appearance", defaultValue: true }
 
 
 			},
@@ -234,8 +234,8 @@ sap.ui.define([
 
 	NumericContent.prototype._getMaxDigitsData = function () {
 		var sFontClass = null,
-		  sLang = sap.ui.getCore().getConfiguration().getLanguage().toLowerCase(),
-		  iMaxLength = LANG_MAP[sLang] || 4;
+			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLowerCase(),
+			iMaxLength = LANG_MAP[sLang] || 4;
 
 		if (this.getAdaptiveFontSize()) {
 			switch (iMaxLength) {
@@ -298,7 +298,7 @@ sap.ui.define([
 	 * Shows/hides icon depending if it fits or not.
 	 * @private
 	 */
-	NumericContent.prototype._checkIfIconFits = function() {
+	NumericContent.prototype._checkIfIconFits = function () {
 		//first check if parent tile is going to resize in the future so resize it now for our calculation
 		var oParentTile = this._getParentTile();
 		if (oParentTile && (oParentTile.isA("sap.m.GenericTile") || oParentTile.isA("sap.m.SlideTile"))) {
@@ -503,9 +503,17 @@ sap.ui.define([
 		// remove the invisible unicode character LTR and RTL mark before processing the regular expression.
 		var sTrimmedValue = sValue.replace(String.fromCharCode(8206), "").replace(String.fromCharCode(8207), "");
 
+		// extract value and scale information from string using regex.
+		var aValueMatches = sTrimmedValue.match(/([+-., \d]*)/g) || [];
+		var aScaleMatches = sTrimmedValue.match(/[^+-., \d]/g) || [];
+
 		return {
-			scale: sTrimmedValue.replace(/[+-., \d]*(.*)$/g, "$1").trim().replace(/\.$/, ""),
-			value: sTrimmedValue.replace(/([+-., \d]*).*$/g, "$1").trim()
+			value: aValueMatches.reduce(function (acc, curVal){
+						return acc + curVal;
+					}, '').trim(),
+			scale: aScaleMatches.reduce(function (acc, curVal){
+						return acc + curVal;
+					}, '').trim()
 		};
 	};