@sapui5/sap.suite.ui.commons 1.145.1 → 1.147.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.commons",
-  "version": "1.145.1",
+  "version": "1.147.0",
   "description": "SAPUI5 Library sap.suite.ui.commons",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/suite/ui/commons/.library

@@ -7,7 +7,7 @@
 		SAP UI development toolkit for HTML5 (SAPUI5)
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.145.1</version>
+	<version>1.147.0</version>
 
 	<documentation>SAP UI library: sap.suite.ui.commons</documentation>
 

package/src/sap/suite/ui/commons/AriaProperties.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.65.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilder.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -345,7 +345,19 @@ sap.ui.define([
 				/**
 				 * This event is fired after the expression is validated.
 				 */
-				afterValidation: {}
+				afterValidation: {},
+				/**
+				 * This event is triggered when the focus leaves the input field.
+				 * @param {string} value The current expression value
+				 * @param {int} position The cursor position in the expression
+				 * @since 1.146
+				 */
+				focusChange: {
+					parameters: {
+						value: "String",
+						position: "int"
+					}
+				}
 			}
 		},
 		renderer: {
@@ -441,6 +453,11 @@ sap.ui.define([
 					aItems = this._oInput._stringToItems(sText),
 					iPosition = oEvent.getParameter("position");
 
+				// Preserve manually-set Literal types when items move positions
+				// Only for unique keys (not duplicates) to avoid the bug where
+				// all items with same key become Literals
+				this._preserveUniqueLiteralTypes(aItems);
+
 				this._oExpressionBuilder._smartRender(aItems);
 				this._setExpression(this._oInput._convertEmptyHashes(sText));
 
@@ -456,11 +473,65 @@ sap.ui.define([
 
 				this._enableOrDisableExpandAllButton();
 				this.fireChange();
+			}.bind(this),
+			focusChange: function (oEvent) {
+				this.fireFocusChange({
+					value: oEvent.getParameter("value"),
+					position: oEvent.getParameter("position")
+				});
 			}.bind(this)
 		});
 		this.addDependent(this._oInput);
 	};
 
+	/**
+	 * Preserves manually-set Literal types when items move positions (e.g., adding brackets).
+	 * Only applies to keys that appear EXACTLY ONCE in both existing and new items.
+	 * This prevents the bug where multiple items with the same key all become Literals
+	 * when only one of them was manually converted.
+	 * @param {array} aNewItems Array of new items to process
+	 * @private
+	 */
+	CalculationBuilder.prototype._preserveUniqueLiteralTypes = function (aNewItems) {
+		var aExistingItems = this._oExpressionBuilder.getItems();
+
+		// Count occurrences of each key in existing and new items
+		var mExistingKeyCounts = {};
+		var mNewKeyCounts = {};
+		var mLiteralKeys = {}; // Track which keys are manually-set Literals
+
+		aExistingItems.forEach(function (oItem) {
+			var sKey = oItem.getKey();
+			mExistingKeyCounts[sKey] = (mExistingKeyCounts[sKey] || 0) + 1;
+
+			// Track manually-set Literals
+			if (oItem._sType === ItemType.Literal) {
+				mLiteralKeys[sKey] = true;
+			}
+		});
+
+		aNewItems.forEach(function (oItem) {
+			var sKey = oItem.getKey();
+			mNewKeyCounts[sKey] = (mNewKeyCounts[sKey] || 0) + 1;
+		});
+
+		// Only preserve Literal type for keys that:
+		// 1. Appear exactly ONCE in existing items as a Literal
+		// 2. Appear exactly ONCE in new items
+		// This ensures we're preserving the same logical item that moved, not duplicates
+		aNewItems.forEach(function (oNewItem) {
+			var sKey = oNewItem.getKey();
+
+			if (mLiteralKeys[sKey] &&
+				mExistingKeyCounts[sKey] === 1 &&
+				mNewKeyCounts[sKey] === 1 &&
+				(!oNewItem._sType || oNewItem._sType === "")) {
+				// This is a unique item that was manually set as Literal and has moved position
+				oNewItem._sType = ItemType.Literal;
+			}
+		});
+	};
+
 	CalculationBuilder.prototype._expressionChanged = function () {
 		var sPlainText = "";
 
@@ -501,7 +572,8 @@ sap.ui.define([
 		this._oInput._aVariables = this.getVariables();
 
 		if (this._bExpressionSet) {
-			this._oExpressionBuilder._setItems(this._oInput._stringToItems(this._sExpressionDirectValue));
+			var aItems = this._oInput._stringToItems(this._sExpressionDirectValue);
+			this._oExpressionBuilder._setItems(aItems);
 		}
 		this._bExpressionSet = false;
 		this._sExpressionDirectValue = "";
@@ -868,10 +940,17 @@ sap.ui.define([
 			return ItemType.Variable;
 		}
 
-		if (this._isFunction(sKey)) {
+		// Check if default function exists and is not disabled
+		var bDefaultExistsInMap = this._findInArray(sKey, Object.keys(FunctionType));
+		var bIsDefaultDisabled = !!this._mDisabledTokens[sKey];
+
+		// If default function exists and is NOT disabled, return Function type
+		// (enabled defaults take precedence over custom functions with same key)
+		if (bDefaultExistsInMap && !bIsDefaultDisabled) {
 			return ItemType.Function;
 		}
 
+		// If default is disabled or doesn't exist, check for custom function
 		if (this._findInChildren(sKey, "Function")) {
 			return ItemType.CustomFunction;
 		}

package/src/sap/suite/ui/commons/CalculationBuilderExpression.js

@@ -148,7 +148,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -1109,7 +1109,8 @@ sap.ui.define([
 			bIsTemplate = this._oCurrentItem && !this._oCurrentItem.getKey(),
 			oParent = this.getParent(),
 			oFunction = mArguments.functionObject,
-			aItems = this.getItems();
+			aItems = this.getItems(),
+			aNewItems;
 
 		var fnProcessFunction = function () {
 			var aItems = mArguments.type === ItemType.Function ? oFunction.template : oParent._convertToTemplate(oFunction.getItems());
@@ -1134,7 +1135,11 @@ sap.ui.define([
 		}.bind(this);
 
 		if (bIsNewItem) {
-			var aNewItems = [mArguments.key];
+			// For literals, pass type information to preserve it during re-render
+			// For other types, keep existing behavior (pass as string)
+			aNewItems = (mArguments.type === ItemType.Literal) ?
+				[{ key: mArguments.key, _sType: mArguments.type }] :
+				[mArguments.key];
 
 			if (oFunction) {
 				fnProcessFunction();
@@ -1142,18 +1147,34 @@ sap.ui.define([
 
 			fnRender();
 		} else {
-			// updating current item or creating new item from function "empty" item
-			this._oCurrentItem.setKey(mArguments.key);
+			var oCurrentItem = this._oCurrentItem;
 
-			if (mArguments.type) {
-				this._oCurrentItem._sType = mArguments.type;
-			}
+			// Pass type as third parameter to preserve it after _reset()
+			oCurrentItem.setKey(mArguments.key, false, mArguments.type);
 
 			if (bIsTemplate && oFunction) {
-				var aNewItems = [];
+				aNewItems = [];
 				this._iCurrentIndex = fnFindCurrentItem();
 				fnProcessFunction();
 				fnRender();
+			} else {
+				// For non-template items, manually update the DOM to reflect changes
+				var oRm = new RenderManager();
+				var $item = oCurrentItem.$();
+
+				if ($item && $item[0]) {
+					// Update InvisibleText with new label (no destroy/recreate needed)
+					var sCurrentLabel = oCurrentItem._getLabel();
+					if (oCurrentItem._oCalculationBuilderItemText) {
+						oCurrentItem._oCalculationBuilderItemText.setText(sCurrentLabel);
+					}
+
+					oCurrentItem._innerRender(oRm, $item[0]);
+					$item.attr("class", oCurrentItem._getClass(null, oRm, true));
+
+					// Re-attach event handlers after DOM update
+					oCurrentItem._setEvents();
+				}
 			}
 		}
 
@@ -1280,6 +1301,11 @@ sap.ui.define([
 
 	CalculationBuilderExpression.prototype._getKeys = function () {
 		return this.getItems().map(function (oItem) {
+			// Preserve type information for literals to prevent re-evaluation
+			// when items are re-rendered (e.g., when adding an operator after a literal)
+			if (oItem._sType === ItemType.Literal) {
+				return { key: oItem.getKey(), _sType: oItem._sType };
+			}
 			return oItem.getKey();
 		});
 	};
@@ -2046,10 +2072,26 @@ sap.ui.define([
 	};
 
 	CalculationBuilderExpression.prototype._convertFromNewItem = function (oItem) {
-		return typeof oItem === "object" ? oItem :
-			new CalculationBuilderItem({
+		if (typeof oItem === "object") {
+			// Check if it's already a CalculationBuilderItem
+			if (oItem.getKey) {
+				return oItem;
+			}
+			// Plain object with key and optional _sType (for literals only)
+			var oNewItem = new CalculationBuilderItem({
+				key: oItem.key
+			});
+			// Only transfer type for literals (consistent with _smartRender)
+			if (oItem._sType !== undefined && oItem._sType === ItemType.Literal) {
+				oNewItem._sType = oItem._sType;
+			}
+			return oNewItem;
+		} else {
+			// String key (existing behavior for non-literals)
+			return new CalculationBuilderItem({
 				key: oItem
 			});
+		}
 	};
 
 	CalculationBuilderExpression.prototype._showErrorIcon = function () {
@@ -2101,15 +2143,46 @@ sap.ui.define([
 		for (var i = 0; i < aNewItems.length; i++) {
 			var oItem = aItems[i],
 				oNewItem = aNewItems[i],
-				sKey = typeof oNewItem === "object" && oNewItem.getKey ? oNewItem.getKey() : oNewItem,
+				sKey, sType;
+
+			// Extract key (standard logic for all types)
+			if (typeof oNewItem === "object" && oNewItem.getKey) {
+				sKey = oNewItem.getKey();
+			} else if (typeof oNewItem === "object" && oNewItem.key) {
+				sKey = oNewItem.key; // For literal plain objects: {key: "1000", _sType: "Literal"}
+			} else {
+				sKey = oNewItem; // String
+			}
+
+			// Extract type: only preserve when explicitly passed in new item
+			if (oNewItem._sType !== undefined && oNewItem._sType === ItemType.Literal) {
+				// Literal with explicit type (from popup submission)
+				sType = oNewItem._sType;
+			} else {
+				// All other cases - let natural type detection happen
 				sType = oNewItem._sType ? oNewItem._sType : "";
+			}
 
 			if (!oItem) {
 				fnAddNew(aNewItems[i]);
 			} else if (oItem.getKey() !== sKey || oItem._sType !== sType) {
-				oItem.setKey(sKey, true);
+				// CRITICAL: Preserve manually-set Literal type when keys match
+				// This handles the case where user manually converts a variable to literal,
+				// then types additional characters in text input (e.g., "1000" -> "+")
+				// Without this, the literal would revert to variable on re-parse
+				if (oItem.getKey() === sKey &&
+					oItem._sType === ItemType.Literal &&
+					(!sType || sType === "")) {
+					// Keep existing literal type when:
+					// 1. Keys match (same value)
+					// 2. Existing item is a Literal (manually set)
+					// 3. New item has no explicit type (from text input parser)
+					sType = ItemType.Literal;
+				}
 
-				oItem._sType = sType;
+				// Pass type as third parameter to setKey to preserve it after _reset()
+				// This is critical for literals to avoid auto-conversion to variables
+				oItem.setKey(sKey, true, sType);
 
 				var $item = oItem.$();
 

package/src/sap/suite/ui/commons/CalculationBuilderFunction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.60.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderInput.js

@@ -110,6 +110,12 @@ sap.ui.define([
 						position: "integer",
 						validate: "boolean"
 					}
+				},
+				focusChange: {
+					parameters: {
+						value: "String",
+						position: "int"
+					}
 				}
 			}
 		},
@@ -987,6 +993,11 @@ sap.ui.define([
 		} else {
 			this._showErrorText(false);
 			this._validate(false);
+			var sCurrentValue = fnGetNodesText(this.$("input")[0], true);
+			this.fireFocusChange({
+				value: sCurrentValue,
+				position: this._iCarretPosition
+			});
 		}
 	};
 

package/src/sap/suite/ui/commons/CalculationBuilderItem.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -261,11 +261,18 @@ sap.ui.define([
 		oRm.attr("tabindex", sTabIndexAttr);
 		oRm.attr("title", sTooltipAttr);
 		oRm.attr("role", "button");
+		// Always update label text to reflect current state
+		var sCurrentLabel = this._getLabel();
+
 		if (!this._oCalculationBuilderItemText) {
 			this._oCalculationBuilderItemText = new InvisibleText();
 			this._oCalculationBuilderItemText.toStatic();
-			this._oCalculationBuilderItemText.setText(this._getLabel());
+			// Make it a dependent so it's managed by control lifecycle
+			this.addDependent(this._oCalculationBuilderItemText);
 		}
+		// Update text every time to reflect label changes
+		this._oCalculationBuilderItemText.setText(sCurrentLabel);
+
 		oRm.attr("aria-labelledby", this._oCalculationBuilderItemText.getId());
 		oRm.attr("aria-describedby", this._oArrowNavigtionInvisibleText.getId());
 		oRm.openEnd();
@@ -600,11 +607,17 @@ sap.ui.define([
 		this._sType = "";
 		this._sLabel = "";
 		this._oVariable = "";
+		// InvisibleText is now a dependent - no need to destroy, just update text later
 	};
 
-	CalculationBuilderItem.prototype.setKey = function (sKey, bSuppressInvalidation) {
+	CalculationBuilderItem.prototype.setKey = function (sKey, bSuppressInvalidation, sType) {
 		this._reset();
 
+		// Restore type after reset if explicitly provided (for literal preservation)
+		if (sType !== undefined) {
+			this._sType = sType;
+		}
+
 		this.setProperty("key", this._sanitizeKey(sKey), bSuppressInvalidation);
 
 		// api change after all rendered, we need to recreate all items and input

package/src/sap/suite/ui/commons/CalculationBuilderValidationResult.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderVariable.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CloudFilePicker.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @class
 	 * @public
 	 * @internal
-	 * @version 1.145.1
+	 * @version 1.147.0
 	*/
 	var CloudFilePicker = Dialog.extend("sap.suite.ui.commons.CloudFilePicker", {
 		metadata: {

package/src/sap/suite/ui/commons/ControlProxy.js

@@ -30,11 +30,14 @@ sap.ui.define([
 				}
 			}
 		},
-		renderer: function (oRm, oProxy) {
-			var sItem = oProxy.getAssociation("control"),
-				oItem = Element.getElementById(sItem);
+		renderer: {
+			apiVersion: 2,
+			render (oRm, oProxy) {
+				var sItem = oProxy.getAssociation("control"),
+					oItem = Element.getElementById(sItem);
 
-			oRm.renderControl(oItem);
+				oRm.renderControl(oItem);
+			}
 		}
 	});
 

package/src/sap/suite/ui/commons/MicroProcessFlow.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/suite/ui/commons/MicroProcessFlowItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/suite/ui/commons/ProcessFlowRenderer.js

@@ -72,6 +72,9 @@ sap.ui.define([
 			aLanePositionNodes = oControl._getOrCreateLaneMap();
 			aConnectionsBetweenNodes = oControl._getConnectionsMap();
 		} catch (exc) {
+			oRm.close("div"); //Scroll content.
+			oRm.close("div"); //Scroll container.
+			oRm.close("div"); //Whole control.
 			oControl._handleException(exc);
 			return;
 		}

package/src/sap/suite/ui/commons/collaboration/ContactHelper.js

@@ -14,13 +14,14 @@ sap.ui.define([
 	"sap/ui/core/Fragment",
 	"sap/ui/model/json/JSONModel",
 	"sap/m/library",
+	"sap/m/MessageToast",
 	"sap/ui/core/Lib",
 	"sap/ui/core/Core",
 	"sap/ui/model/resource/ResourceModel",
 	"./CollaborationContactInfoHelper",
 	"sap/ui/performance/trace/FESRHelper",
 	"sap/ui/core/Element"
-], function(Controller, Fragment, JSONModel, mLibrary, Library, Core, ResourceModel, CollaborationContactInfoHelper, FESRHelper, Element) {
+], function(Controller, Fragment, JSONModel, mLibrary, MessageToast, Library, Core, ResourceModel, CollaborationContactInfoHelper, FESRHelper, Element) {
 	"use strict";
 
 	var I18_BUNDLE = Library.getResourceBundleFor("sap.suite.ui.commons");
@@ -335,6 +336,9 @@ sap.ui.define([
 		handleCopyEmailPress: function() {
 			if (typeof window !== "undefined" && window.navigator && window.navigator.clipboard && window.navigator.clipboard.writeText) {
 				window.navigator.clipboard.writeText(this.sEmail);
+				MessageToast.show(I18_BUNDLE.getText("POPOVER_CONTACT_COPY_EMAIL_SUCCESS"));
+			} else {
+				MessageToast.show(I18_BUNDLE.getText("POPOVER_CONTACT_COPY_EMAIL_ERROR"));
 			}
 		}
 	});

package/src/sap/suite/ui/commons/collaboration/ContactPopover.fragment.xml

@@ -8,8 +8,8 @@
 		placement="Auto"
         showHeader="false"
         contentWidth="21.875rem"
-        afterClose="afterClose"
-        afterOpen="afterOpen">
+        afterClose=".afterClose"
+        afterOpen=".afterOpen">
         <VBox visible="{userData>/isUserExistsInTeams}">
             <HBox>
                 <Avatar id="avatar" src="{= ${userData>/photo} ? ${userData>/photo} : 'sap-icon://person-placeholder' }"
@@ -24,7 +24,7 @@
 				<Title text="{i18n>COLLABORATION_MSTEAMS_SHARE}" level="H5"/>
 				<ToolbarSpacer/>
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="chat"
                     tooltip="{i18n>CHAT_BUTTON_TOOLTIP}"
@@ -34,7 +34,7 @@
                     fesr:press="MST:ContactAction"
                 />
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="videoCall"
                     tooltip="{i18n>VIDEOCALL_BUTTON_TOOLTIP}"
@@ -44,7 +44,7 @@
                     fesr:press="MST:ContactAction"
                 />
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="call"
                     tooltip="{i18n>CALL_BUTTON_TOOLTIP}"
@@ -71,9 +71,9 @@
 
                 <VBox visible="{= !!${userData>/mail}}"  class="sapUiTinyMarginTop sapUiTinyMarginBottom" >
                     <Label id="UserEmail" text="{i18n>POPOVER_CONTACT_SECTION_EMAIL}:" />
-					<HBox>
-						<Link text="{userData>/mail}" href="{path: 'userData>/mail', formatter: '.formatUri'}" ariaLabelledBy="UserEmail" class="sapUiTinyMarginEnd"/>
-						<core:Icon src="sap-icon://copy" press="handleCopyEmailPress" decorative="false" tooltip="{i18n>POPOVER_CONTACT_COPY_EMAIL}"/>
+					<HBox alignItems="Center" justifyContent="SpaceBetween">
+						<Link text="{userData>/mail}" href="{path: 'userData>/mail', formatter: '.formatUri'}" ariaLabelledBy="UserEmail"/>
+						<core:Icon src="sap-icon://copy" press=".handleCopyEmailPress" decorative="false" tooltip="{i18n>POPOVER_CONTACT_COPY_EMAIL}" class="sapThemeHighlight-asColor"/>
 					</HBox>
                 </VBox>
 
@@ -87,8 +87,8 @@
             <IllustratedMessage illustrationType="tnt-NoUsers" illustrationSize="Dialog" title="{i18n>POPOVER_NO_CONTACT_TITLE}"
                 description="{i18n>POPOVER_NO_CONTACT_DESCRIPTION}" >
 			    <additionalContent>
-					<Button id="mail" text="{i18n>POPOVER_CONTINUE}" press="afterContinue" type="Emphasized" class="sapUiTinyMarginEnd"/>
-					<Button text="{i18n>POPOVER_CANCEL}" press="afterClose"/>
+					<Button id="mail" text="{i18n>POPOVER_CONTINUE}" press=".afterContinue" type="Emphasized" class="sapUiTinyMarginEnd"/>
+					<Button text="{i18n>POPOVER_CANCEL}" press=".afterClose"/>
 				</additionalContent>
 			</IllustratedMessage >
         </HBox>

package/src/sap/suite/ui/commons/collaboration/MinimalContactPopover.fragment.xml

@@ -10,12 +10,12 @@
         initialFocus="action"
         showHeader="false"
         contentWidth="25rem"
-        afterClose="afterClose">
+        afterClose=".afterClose">
         <VBox>
             <HBox>
 				<Title text="{i18n>COLLABORATION_MSTEAMS_SHARE}" level="H5" class="sapUiTinyMarginTop"/>
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="chat"
                     tooltip="{i18n>CHAT_BUTTON_TOOLTIP}"
@@ -25,7 +25,7 @@
                     fesr:press="MST:ContactAction"
                 />
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="videoCall"
                     tooltip="{i18n>VIDEOCALL_BUTTON_TOOLTIP}"
@@ -35,7 +35,7 @@
                     fesr:press="MST:ContactAction"
                 />
                 <Button
-                    press="handleMSTeamsPress"
+                    press=".handleMSTeamsPress"
                     macrodata:email="{userData>/mail}"
                     macrodata:type="call"
                     tooltip="{i18n>CALL_BUTTON_TOOLTIP}"
@@ -46,12 +46,14 @@
                 />
             </HBox>
 
-            <HBox class="sapUiTinyMarginTop">
-                <core:Icon
-                    src="sap-icon://email">
-                </core:Icon>
-                <Link text="{userData>/mail}" href="{parts: [{path: 'userData>/mail'}, {path: 'userData>/params'}], formatter: '.formatUri'}" class="sapUiSmallMarginBegin sapUiTinyMarginBottom sapUiTinyMarginEnd" />
-				<core:Icon src="sap-icon://copy" press="handleCopyEmailPress" decorative="false" tooltip="{i18n>POPOVER_CONTACT_COPY_EMAIL}"/>
+            <HBox class="sapUiTinyMarginTop" alignItems="Center" justifyContent="SpaceBetween">
+                <HBox alignItems="Center">
+                    <core:Icon
+                        src="sap-icon://email">
+                    </core:Icon>
+                    <Link text="{userData>/mail}" href="{parts: [{path: 'userData>/mail'}, {path: 'userData>/params'}], formatter: '.formatUri'}" class="sapUiSmallMarginBegin sapUiTinyMarginBottom" />
+                </HBox>
+				<core:Icon src="sap-icon://copy" press=".handleCopyEmailPress" decorative="false" tooltip="{i18n>POPOVER_CONTACT_COPY_EMAIL}" class="sapThemeHighlight-asColor"/>
             </HBox>
         </VBox>
 	</Popover>