@openui5/sap.ui.mdc 1.100.0 → 1.102.1

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/mdc/filterbar/p13n/GroupContainer", "sap/ui/mdc/filterbar/p13n/FilterColumnLayout", "sap/ui/mdc/filterbar/p13n/FilterGroupLayout","sap/ui/mdc/filterbar/p13n/TableContainer", "sap/ui/mdc/filterbar/FilterBarBase", "sap/ui/mdc/filterbar/FilterBarBaseRenderer", "sap/base/util/merge", "sap/base/util/UriParameters", "sap/ui/core/Core"
-], function( GroupContainer, FilterColumnLayout, FilterGroupLayout, TableContainer, FilterBarBase, FilterBarBaseRenderer, merge, SAPUriParameters, Core) {
+	"sap/ui/mdc/filterbar/p13n/GroupContainer", "sap/ui/mdc/filterbar/p13n/FilterColumnLayout", "sap/ui/mdc/filterbar/p13n/FilterGroupLayout","sap/ui/mdc/filterbar/p13n/TableContainer", "sap/ui/mdc/filterbar/FilterBarBase", "sap/ui/mdc/filterbar/FilterBarBaseRenderer", "sap/base/util/merge", "sap/base/util/UriParameters", "sap/ui/core/Core", "sap/ui/mdc/enum/PersistenceMode"
+], function( GroupContainer, FilterColumnLayout, FilterGroupLayout, TableContainer, FilterBarBase, FilterBarBaseRenderer, merge, SAPUriParameters, Core, PersistenceMode) {
 	"use strict";
 
 	/**
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.80.0
@@ -52,7 +52,7 @@ sap.ui.define([
 		FilterBarBase.prototype.init.apply(this,arguments);
 		this.addStyleClass("sapUIAdaptationFilterBar");
 		this._bPersistValues = true;
-
+		this.getEngine().defaultProviderRegistry.attach(this, PersistenceMode.Transient);
 		this._fnResolveAdaptationControlPromise = null;
 		this._oAdaptationControlPromise = new Promise(function(resolve, reject) {
 			this._fnResolveAdaptationControlPromise = resolve;
@@ -65,6 +65,26 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	// FIXME: currently the FilterBar key handling is tightly coupled to the path
+	// as the FilterFields themselves are referenced through the path in the conditions binding path
+	// of the according FilterField. In use cases as for the AdaptationFilterBar, the Table's propertyinfo
+	// is being propagated to the FilterBar, where the name does not neessarily need to reflect the technical
+	// path in the model. Once the key reference between FilterFields, Columns and property info object has been aligned,
+	// the below fallback logic will become obsolete.
+	AdaptationFilterBar.prototype._getPropertyByName = function(sName) {
+		var oPropertyHelper = this.getPropertyHelper();
+		if (oPropertyHelper) {
+			var oProperty = oPropertyHelper.getProperties().find(function(oProp){
+				return oProp.path === sName;
+			});
+
+			if (!oProperty) {
+				oProperty = oPropertyHelper.getPropertyMap()[sName] || null;
+			}
+			return oProperty;
+		}
+	};
+
 	AdaptationFilterBar.prototype._waitForAdaptControlAndPropertyHelper = function(){
 		return this._oAdaptationControlPromise.then(function() {
 			return this._getAdaptationControlInstance().awaitPropertyHelper().then(function(oPropertyHelper) {
@@ -81,12 +101,22 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	AdaptationFilterBar.prototype.getControlDelegate = function() {
+		return this._getAdaptationControlInstance().getControlDelegate();
+	};
+
 	AdaptationFilterBar.prototype.initControlDelegate = function() {
 		return this._oAdaptationControlPromise.then(function() {
 			return this._getAdaptationControlInstance().initControlDelegate();
 		}.bind(this));
 	};
 
+	AdaptationFilterBar.prototype.initPropertyHelper = function() {
+		return this._oAdaptationControlPromise.then(function() {
+			return this._getAdaptationControlInstance().initPropertyHelper();
+		}.bind(this));
+	};
+
 	AdaptationFilterBar.prototype.getTypeUtil = function() {
 		if (!this._getAdaptationControlInstance()) {
 			throw new Error("No adaptation control assigned yet.");
@@ -102,11 +132,6 @@ sap.ui.define([
 	AdaptationFilterBar.prototype.setLiveMode = function(bLive, bSuppressInvalidate) {
 		FilterBarBase.prototype.setLiveMode.apply(this, arguments);
 
-		//Dialog
-		if (!bLive) {
-			this._oConditionModel.detachPropertyChange(this._handleConditionModelPropertyChange, this);
-		}
-
 		//update adaptationModel while dialog is open
 		this._oConditionModel.attachPropertyChange(function(oEvt){
 			var sKey = oEvt.getParameter("path").substring(12);
@@ -182,9 +207,11 @@ sap.ui.define([
 		return this.getEngine().waitForChanges(this._getAdaptationControlInstance());
 	};
 
-	AdaptationFilterBar.prototype.applyConditionsAfterChangesApplied = function() {
+	AdaptationFilterBar.prototype.applyConditionsAfterChangesApplied = function(oControl) {
 		FilterBarBase.prototype.applyConditionsAfterChangesApplied.apply(this, arguments);
-		this.triggerSearch();
+		if (oControl === this._getAdaptationControlInstance()) {
+			this.triggerSearch();
+		}
 	};
 
 	/**
@@ -195,6 +222,8 @@ sap.ui.define([
 	AdaptationFilterBar.prototype.createFilterFields = function(){
 		return this.initialized().then(function(){
 			var mConditions = this._bPersistValues ? this._getAdaptationControlInstance().getFilterConditions() : this._getAdaptationControlInstance()._getXConditions();
+
+			this.setFilterConditions(mConditions);
 			this._setXConditions(mConditions, true);
 
 			if (this._bFilterFieldsCreated) {
@@ -379,6 +408,7 @@ sap.ui.define([
 	};
 
 	AdaptationFilterBar.prototype.exit = function() {
+		this.getEngine().defaultProviderRegistry.detach(this);
 		FilterBarBase.prototype.exit.apply(this, arguments);
 		for (var sKey in this._mOriginalsForClone) {
 			this._mOriginalsForClone[sKey].destroy();

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -10,7 +10,8 @@ sap.ui.define(
 		"sap/ui/mdc/filterbar/FilterBarBaseRenderer",
 		"sap/ui/mdc/filterbar/aligned/FilterItemLayout",
 		"sap/ui/mdc/filterbar/vh/FilterContainer",
-		"sap/m/Button"
+		"sap/m/Button",
+		"sap/ui/mdc/enum/PersistenceMode"
 	],
 	function (
 		mLibrary,
@@ -18,9 +19,31 @@ sap.ui.define(
 		FilterBarBaseRenderer,
 		FilterItemLayout,
 		FilterContainer,
-		Button
+		Button,
+		PersistenceMode
 	) {
 		"use strict";
+		/**
+		 * Modules for different filterbars
+		 * @namespace
+		 * @name sap.ui.mdc.filterbar
+		 * @since 1.80.0
+		 * @private
+		 * @experimental As of version 1.80
+		 * @ui5-restricted sap.ui.mdc
+		 */
+
+		/**
+		 * Base-modules for {@link sap.ui.mdc.filterbar.vh.FiterBar FilterBar}
+		 *
+		 * These modules are not to be used stand-alone.
+		 * @namespace
+		 * @name sap.ui.mdc.filterbar.vh
+		 * @since 1.84.0
+		 * @private
+		 * @experimental As of version 1.84
+		 * @ui5-restricted sap.ui.mdc
+		 */
 
 		/**
 		 * Constructor for a new FilterBar.
@@ -33,7 +56,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.100.0
+		 * @version 1.102.1
 		 * @constructor
 		 * @private
 		 * @ui5-restricted sap.fe
@@ -123,7 +146,6 @@ sap.ui.define(
 				press: this._onShowAllFilters.bind(this),
 				text: this._oRb.getText("valuehelp.SHOWALLFILTERS")
 			});
-
 			this._oFilterBarLayout.addEndContent(this._oShowAllFiltersBtn);
 		};
 
@@ -133,11 +155,19 @@ sap.ui.define(
 		};
 
 		FilterBar.prototype._handleConditionModelPropertyChange = function() {
+			FilterBarBase.prototype._handleConditionModelPropertyChange.apply(this, arguments);
 			this.fireFiltersChanged({conditionsBased: true});
 		};
 
 
+		FilterBar.prototype.init = function() {
+			FilterBarBase.prototype.init.apply(this, arguments);
+			this._bPersistValues = true;
+			this.getEngine().defaultProviderRegistry.attach(this, PersistenceMode.Transient);
+		};
+
 		FilterBar.prototype.exit = function() {
+			this.getEngine().defaultProviderRegistry.detach(this);
 			if (this._oCollectiveSearch) { // do not destroy CollectiveSearch as it is owned by value help and might be reused there
 				this._oFilterBarLayout.removeControl(this._oCollectiveSearch);
 				this._oCollectiveSearch = null;
@@ -219,7 +249,9 @@ sap.ui.define(
 			this._oBasicSearchField = oBasicSearchField;
 
 			if (oBasicSearchField) {
-				this.setExpandFilterFields(false);
+				if (this.isPropertyInitial("expandFilterFields")) {
+					this.setExpandFilterFields(false);
+				}
 
 				if (this._oFilterBarLayout) {
 					this._oFilterBarLayout.insertControl(oBasicSearchField, this._oCollectiveSearch ? 1 : 0);

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

@@ -4,58 +4,21 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'./SortFlex', './ChartItemFlex', './ConditionFlex'
-], function(SortFlex, ChartItemFlex, ConditionFlex) {
+	'./SortFlex', './ChartItemFlex', './ConditionFlex', './ChartTypeFlex'
+], function(SortFlex, ChartItemFlex, ConditionFlex, ChartTypeFlex) {
 	"use strict";
 	/**
 	 * Chart-control-specific change handler that enables the storing of changes in the layered repository of the flexibility services.
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,
 		removeItem: ChartItemFlex.removeItem,
 		moveItem: ChartItemFlex.moveItem,
-		"setChartType": {
-			layers: {
-				USER: true
-			},
-			changeHandler: {
-				createChange: function(mPropertyBag) {
-					if (!mPropertyBag.control) {
-						throw new Error("Invalid control. The existing control object is mandatory");
-					}
-					return {
-						selectorElement: mPropertyBag.control,
-						changeSpecificData: {
-							changeType: "setChartType",
-							content: {
-								chartType: mPropertyBag.chartType
-							}
-						}
-					};
-				},
-				completeChangeContent: function(oChange, mSpecificChangeInfo) {
-				},
-				applyChange: function(oChange, oChart, mPropertyBag) {
-					var oModifier = mPropertyBag.modifier;
-					return Promise.resolve()
-						.then(oModifier.getProperty.bind(oModifier, oChart, "chartType"))
-						.then(function(vOldValue) {
-							// First store the old value for revert
-							oChange.setRevertData(vOldValue);
-							// Then set the new value
-							oModifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
-						});
-				},
-				revertChange: function(oChange, oChart, mPropertyBag) {
-					mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());
-					oChange.resetRevertData();
-				}
-			}
-		},
+		setChartType: ChartTypeFlex.setChartType,
 		removeSort: SortFlex.removeSort,
 		addSort: SortFlex.addSort,
 		moveSort: SortFlex.moveSort,

package/src/sap/ui/mdc/flexibility/ChartTypeFlex.js

@@ -0,0 +1,54 @@
+/*
+ * ! OpenUI5
+ * (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([
+], function() {
+	"use strict";
+
+
+
+	var oChartTypeFlex = {};
+
+	oChartTypeFlex.setChartType = {
+		layers: {
+			USER: true
+		},
+		changeHandler: {
+			createChange: function(mPropertyBag) {
+				if (!mPropertyBag.control) {
+					throw new Error("Invalid control. The existing control object is mandatory");
+				}
+				return {
+					selectorElement: mPropertyBag.control,
+					changeSpecificData: {
+						changeType: "setChartType",
+						content: {
+							chartType: mPropertyBag.chartType
+						}
+					}
+				};
+			},
+			completeChangeContent: function(oChange, mSpecificChangeInfo) {
+			},
+			applyChange: function(oChange, oChart, mPropertyBag) {
+				var oModifier = mPropertyBag.modifier;
+				return Promise.resolve()
+					.then(oModifier.getProperty.bind(oModifier, oChart, "chartType"))
+					.then(function(vOldValue) {
+						// First store the old value for revert
+						oChange.setRevertData(vOldValue);
+						// Then set the new value
+						oModifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
+					});
+			},
+			revertChange: function(oChange, oChart, mPropertyBag) {
+				mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());
+				oChange.resetRevertData();
+			}
+		}
+	};
+
+	return oChartTypeFlex;
+});

package/src/sap/ui/mdc/flexibility/ConditionFlex.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		var oFilterControl = fDetermineFilterControl(oControl);
 
 		if (oFilterControl && oFilterControl.applyConditionsAfterChangesApplied) {
-			oFilterControl.applyConditionsAfterChangesApplied();
+			oFilterControl.applyConditionsAfterChangesApplied(oControl);
 		}
 
 		return fnQueueChange(oControl, function(){
@@ -116,7 +116,7 @@ sap.ui.define([
 		var oFilterControl = fDetermineFilterControl(oControl);
 
 		if (oFilterControl && oFilterControl.applyConditionsAfterChangesApplied) {
-			oFilterControl.applyConditionsAfterChangesApplied();
+			oFilterControl.applyConditionsAfterChangesApplied(oControl);
 		}
 
 		return fnQueueChange(oControl, function(){

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex', './PropertyInfoFlex'], fun
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);

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

@@ -7,15 +7,30 @@
 /**
  * Initialization Code and shared classes of library sap.ui.mdc.
  */
-sap.ui.define([
+ sap.ui.define([
 	"sap/ui/core/Core", // provides sap.ui.getCore()
 	"sap/ui/core/library", // library dependency
 	"sap/m/library" // library dependency
 ], function () {
 	"use strict";
 
-	sap.ui.getCore().initLibrary({
-		version: "1.100.0",
+	/**
+	 * The SAPUI5 library that contains the metadata-driven controls and other entities.
+	 *
+	 * SAP Internal
+	 * This library is restricted to use by SAP internal projects only.
+	 *
+	 * @namespace
+	 * @alias sap.ui.mdc
+	 * @author SAP SE
+	 * @version 1.102.1
+	 * @since 1.80
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @experimental As of version 1.54 Disclaimer: Usage Restrictions: The components of this library are under development and documented as private. Their APIs are subject to change and should not be used in productive scenarios without further agreement. A general availability of sap.ui.mdc will be announced via the usual channels.
+	 */
+	 var thisLib = sap.ui.getCore().initLibrary({
+		version: "1.102.1",
 		name: "sap.ui.mdc",
 		dependencies: ["sap.ui.core", "sap.m"],
 		designtime: "sap/ui/mdc/designtime/library.designtime",
@@ -23,9 +38,9 @@ sap.ui.define([
 			"sap.ui.mdc.TableType",
 			"sap.ui.mdc.TableP13Mode",
 			"sap.ui.mdc.GrowingMode",
+			"sap.ui.mdc.RowAction",
 			"sap.ui.mdc.RowCountMode",
 			"sap.ui.mdc.SelectionMode",
-			"sap.ui.mdc.TableRowAction",
 			"sap.ui.mdc.FilterExpression",
 			"sap.ui.mdc.MultiSelectMode"
 			],
@@ -111,6 +126,7 @@ sap.ui.define([
 				"sap.ui.mdc.Chart": "sap/ui/mdc/flexibility/Chart",
 				"sap.ui.mdc.FilterBar": "sap/ui/mdc/flexibility/FilterBar",
 				"sap.ui.mdc.filterbar.p13n.AdaptationFilterBar": "sap/ui/mdc/flexibility/FilterBar",
+				"sap.ui.mdc.filterbar.vh.FilterBar": "sap/ui/mdc/flexibility/FilterBar",
 				"sap.ui.mdc.link.PanelItem": "sap/ui/mdc/flexibility/PanelItem",
 				"sap.ui.mdc.link.Panel": "sap/ui/mdc/flexibility/Panel",
 				"sap.ui.mdc.ActionToolbar": "sap/ui/mdc/flexibility/ActionToolbar",
@@ -121,30 +137,10 @@ sap.ui.define([
 		noLibraryCSS: false
 	});
 
-	/* eslint-disable no-undef */
-	/**
-	 * The SAPUI5 library that contains the metadata-driven controls and other entities.
-	 *
-	 * SAP Internal
-	 * This library is restricted to use by SAP internal projects only.
-	 *
-	 * @namespace
-	 * @alias sap.ui.mdc
-	 * @author SAP SE
-	 * @version 1.100.0
-	 * @since 1.80
-	 * @private
-	 * @ui5-restricted sap.fe
-	 * @experimental As of version 1.54 Disclaimer: Usage Restrictions: The components of this library are under development and documented as private. Their APIs are subject to change and should not be used in productive scenarios without further agreement. A general availability of sap.ui.mdc will be announced via the usual channels.
-	 */
-	 var thisLib = sap.ui.mdc;
-	 /* eslint-enable no-undef */
-
 	 /**
 	 *
 	 * Interface for valuehelp containers / contents supporting typeahead functionality
 	 *
-	 *
 	 * @since 1.95
 	 * @name sap.ui.mdc.valuehelp.ITypeaheadContent
 	 * @interface
@@ -267,7 +263,7 @@ sap.ui.define([
 	 * @param {sap.ui.base.Event} oControlEvent
 	 * @param {sap.ui.base.EventProvider} oControlEvent.getSource
 	 * @param {object} oControlEvent.getParameters
-	 * @param {boolean} oControlEvent.getParameters.bLeaveFocus Indicates that the source control should be focused again
+	 * @param {boolean} oControlEvent.getParameters.leaveFocus Indicates that the source control should be focused again
 	 * @param {object} oControlEvent.getParameters.condition Provides the target condition of the navigation
 	 * @param {string} oControlEvent.getParameters.value When no condition is given this can be used to create a default condition
 	 * @param {string} oControlEvent.getParameters.key When no condition is given this can be used to create a default condition

package/src/sap/ui/mdc/link/ContactDetails.js

@@ -4,7 +4,17 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/core/XMLComposite', 'sap/m/Text', 'sap/m/Link', 'sap/m/Label'], function(XMLComposite, Text, Link, Label) {
+sap.ui.define([
+	"sap/ui/core/Control",
+	"./ContactDetailsRenderer",
+	"sap/ui/core/Title",
+	"sap/m/VBox",
+	"sap/m/Text",
+	"sap/m/Link",
+	"sap/m/Label",
+	"sap/m/Image",
+	"sap/ui/layout/form/SimpleForm"
+], function(Control, ContactDetailsRenderer, Title, VBox, Text, Link, Label, Image, SimpleForm) {
 	"use strict";
 
 	/**
@@ -13,40 +23,114 @@ sap.ui.define(['sap/ui/core/XMLComposite', 'sap/m/Text', 'sap/m/Link', 'sap/m/La
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The ContactDetails control is used to show additional information like for example 'contact details'.
-	 * @extends sap.ui.core.XMLComposite
+	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.mdc.link.ContactDetails
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var ContactDetails = XMLComposite.extend("sap.ui.mdc.link.ContactDetails", /** @lends sap.ui.mdc.link.ContactDetails.prototype */
-		{
-			metadata: {
-				library: "sap.ui.mdc",
-				defaultAggregation: "items",
-				aggregations: {
-					items: {
-						type: "sap.ui.mdc.link.ContactDetailsItem",
-						multiple: true,
-						singularName: "item"
-					}
+	var ContactDetails = Control.extend("sap.ui.mdc.link.ContactDetails", /** @lends sap.ui.mdc.link.ContactDetails.prototype */ {
+		metadata: {
+			library: "sap.ui.mdc",
+			defaultAggregation: "items",
+			aggregations: {
+				items: {
+					type: "sap.ui.mdc.link.ContactDetailsItem",
+					multiple: true,
+					singularName: "item"
+				},
+				_content: {
+					type: "sap.m.VBox",
+					visibility: "hidden",
+					multiple: false
 				}
 			}
-		});
+		},
+		renderer: ContactDetailsRenderer
+	});
 
+	var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 	ContactDetails.prototype.applySettings = function() {
-		XMLComposite.prototype.applySettings.apply(this, arguments);
+		Control.prototype.applySettings.apply(this, arguments);
 
-		var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
-		var oVBox = this._getCompositeAggregation();
-		oVBox.getItems().forEach(function(oSimpleForm, iIndex) {
-			this._addEmailsToSimpleForm(this.getItems()[iIndex], oSimpleForm, oRB);
-			this._addPhonesToSimpleForm(this.getItems()[iIndex], oSimpleForm, oRB);
-			this._addAddressesToSimpleForm(this.getItems()[iIndex], oSimpleForm, oRB);
-		}, this);
+		this._createContent();
+	};
+	ContactDetails.prototype._createContent = function() {
+		var aSimpleForms = [];
+		this.getItems().forEach(function(oContactDetailsItem) {
+			var oTitle = new Title({
+				text: oContactDetailsItem.getSectionTitle()
+			});
+			var oImage = new Image({
+				src: oContactDetailsItem.getPhoto(),
+				visible: !!oContactDetailsItem.getPhoto(),
+				decorative: false,
+				width: "5rem",
+				height: "5rem"
+			});
+			var oLabelImage = new Label({
+				text: "",
+				labelFor: oImage,
+				visible: !!oContactDetailsItem.getPhoto()
+			});
+			var oTextName = new Text({
+				text: oContactDetailsItem.getFormattedName(),
+				visible: !!oContactDetailsItem.getFormattedName()
+			});
+			var oLabelName = new Label({
+				text: oRB.getText("info.POPOVER_CONTACT_SECTION_NAME"),
+				labelFor: oTextName,
+				visible: !!oContactDetailsItem.getFormattedName()
+			});
+			var oTextRole = new Text({
+				text: oContactDetailsItem.getRole(),
+				visible: !!oContactDetailsItem.getRole()
+			});
+			var oLabelRole = new Label({
+				text: oRB.getText("info.POPOVER_CONTACT_SECTION_ROLE"),
+				labelFor: oTextRole,
+				visible: !!oContactDetailsItem.getRole()
+			});
+			var oTextTitle = new Text({
+				text: oContactDetailsItem.getTitle(),
+				visible: !!oContactDetailsItem.getTitle()
+			});
+			var oLabelTitle = new Label({
+				text: oRB.getText("info.POPOVER_CONTACT_SECTION_JOBTITLE"),
+				labelFor: oTextTitle,
+				visible: !!oContactDetailsItem.getTitle()
+			});
+			var oTextOrg = new Text({
+				text: oContactDetailsItem.getOrg(),
+				visible: !!oContactDetailsItem.getOrg()
+			});
+			var oLabelOrg = new Label({
+				text: oRB.getText("info.POPOVER_CONTACT_SECTION_DEPARTMENT"),
+				labelFor: oTextOrg,
+				visible: !!oContactDetailsItem.getOrg()
+			});
+
+			var oSimpleForm = new SimpleForm({
+				editable: false,
+				layout: "ColumnLayout",
+				content: [
+					oTitle, oLabelImage, oImage, oLabelName, oTextName, oLabelRole, oTextRole, oLabelTitle, oTextTitle, oLabelOrg, oTextOrg
+				]
+			});
+			this._addEmailsToSimpleForm(oContactDetailsItem, oSimpleForm, oRB);
+			this._addPhonesToSimpleForm(oContactDetailsItem, oSimpleForm, oRB);
+			this._addAddressesToSimpleForm(oContactDetailsItem, oSimpleForm, oRB);
+
+			aSimpleForms.push(oSimpleForm);
+		}.bind(this));
+
+		this.setAggregation("_content", new VBox({
+			//ariaLabelledBy: aSimpleForms.length ? aSimpleForms[0].getContent()[0] : undefined,
+			items: aSimpleForms
+		}));
 	};
 	ContactDetails.prototype._addEmailsToSimpleForm = function(oContactDetailsItem, oSimpleForm, oRB) {
 		// Show email(s) annotated with 'preferred' on top (independent on type e.g. 'work' or 'home' etc) and then non 'preferred' email(s) below.

package/src/sap/ui/mdc/link/ContactDetailsAddressItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsEmailItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/ui/mdc/link/ContactDetailsPhoneItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.56.0