@openui5/sap.ui.mdc 1.103.0 → 1.105.0

package/.reuse/dep5

@@ -137,6 +137,11 @@ Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit 2
 
+Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.*
+Copyright: jQuery Foundation and other contributors
+License: MIT
+Comment: these files belong to: QUnit 2.18
+
 Files: src/sap.ui.core/src/sap/ui/thirdparty/jquery-compat.js
 Copyright: OpenJS Foundation and other contributors
 License: MIT
@@ -154,7 +159,7 @@ Copyright:
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite*
+Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit Composite
@@ -234,6 +239,11 @@ Copyright: 2010-2017, Christian Johansen, christian@cjohansen.no
 License: BSD-3-Clause
 Comment: these files belong to: SinonJS
 
+Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.*
+Copyright: 2010-2022, Christian Johansen, christian@cjohansen.no
+License: BSD-3-Clause
+Comment: these files belong to: SinonJS 14
+
 Files: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 Copyright: 2010-2011, Christian Johansen
 License: BSD-3-Clause
@@ -339,6 +349,13 @@ Copyright:
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
 
+Files: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
+Copyright:
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    Arthur David Olson, Paul Eggert and other contributors
+License: Apache-2.0 and LicenseRef-tzdata-PublicDomain
+Comment: these files contain content from SAP and Time Zone Database: _timezones.js is overall written by SAP, but the list of IANA timezone IDs is taken from the Timezone Database
+
 
 # Library: sap.ui.documentation:
 

package/LICENSES/LicenseRef-tzdata-PublicDomain.txt

@@ -0,0 +1,5 @@
+Unless specified below, all files in the tz code and data (including
+this LICENSE file) are in the public domain.
+
+If the files date.c, newstrftime.3, and strftime.c are present, they
+contain material derived from BSD and use the BSD 3-clause license.

package/THIRDPARTY.txt

@@ -76,6 +76,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.*
 
+Component: QUnit 2.18, version: 2.18.0
+Copyright: jQuery Foundation and other contributors
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.*
+
 Component: jQuery-Migrate, version: 3.3.1
 Copyright: OpenJS Foundation and other contributors
 License: MIT
@@ -98,7 +104,7 @@ Component: QUnit Composite, version: 1.0.2-pre
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite*
+Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
 
 Component: JUnit Reporter for QUnit, version: 1.1.1
 Copyright: jQuery Foundation and other contributors
@@ -191,13 +197,19 @@ 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-4.js
 
+Component: SinonJS 14, version: 14.0.0
+Copyright: 2010-2022, Christian Johansen, christian@cjohansen.no
+License: BSD-3-Clause
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
+Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.*
+
 Component: Sinon-qunit, version: 2.0.0
 Copyright: 2010-2011, Christian Johansen
 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.10
+Component: URI.js, version: 1.19.11
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -315,6 +327,12 @@ License: ISC
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/ISC.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 
+Component: Time Zone Database, version: 2022a
+Copyright: Arthur David Olson, Paul Eggert and other contributors
+License: LicenseRef-tzdata-PublicDomain
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-tzdata-PublicDomain.txt
+Contained in: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
+
 
 Library: sap.ui.documentation:
 
@@ -450,7 +468,7 @@ 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.39
+Component: SAP Theming Base Content, version: 11.1.40
 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
@@ -980,6 +998,21 @@ END of license: LicenseRef-JSONinJSPublicDomain
 =================================
 
 
+=================================
+BEGIN of license: LicenseRef-tzdata-PublicDomain
+=================================
+
+Unless specified below, all files in the tz code and data (including
+this LICENSE file) are in the public domain.
+
+If the files date.c, newstrftime.3, and strftime.c are present, they
+contain material derived from BSD and use the BSD 3-clause license.
+
+=================================
+END of license: LicenseRef-tzdata-PublicDomain
+=================================
+
+
 =================================
 BEGIN of license: MIT
 =================================

package/package.json

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

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

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

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -31,7 +31,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.103.0
+	 * @version 1.105.0
 	 * @constructor
 	 * @private
 	 * @since 1.58

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

@@ -104,7 +104,7 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 		},
 
 		/**
-		 * Hook that will be executed is called when changes are done applying to controls during the XML flexibility change appliance process.
+		 * Hook that will be executed when changes are done applying to controls during the XML flexibility change appliance process.
 		 *
 		 * @param {Object<sap.ui.mdc.Control>} oControl Instance of an MDC control
 		 * @param {Object} mPropertyBag Property bag from SAPUI5 flexibility

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

@@ -12,7 +12,6 @@ sap.ui.define([
         "./ChartRenderer",
         "sap/ui/mdc/library",
         "sap/m/Text",
-        "sap/m/VBox",
         "sap/base/Log",
         "./chart/ChartToolbar",
         "./chart/PropertyHelper",
@@ -25,7 +24,8 @@ sap.ui.define([
         "sap/ui/base/ManagedObjectObserver",
         "sap/ui/mdc/chart/DrillBreadcrumbs",
         "sap/ui/mdc/actiontoolbar/ActionToolbarAction",
-        "sap/ui/thirdparty/jquery"
+        "sap/ui/thirdparty/jquery",
+        "sap/ui/core/library"
     ],
     function (
         Core,
@@ -35,7 +35,6 @@ sap.ui.define([
         ChartRenderer,
         MDCLib,
         Text,
-        VBox,
         Log,
         ChartToolbar,
         PropertyHelper,
@@ -48,11 +47,13 @@ sap.ui.define([
         ManagedObjectObserver,
         Breadcrumbs,
         ActionToolbarAction,
-        jQuery
+        jQuery,
+        coreLibrary
     ) {
         "use strict";
 
         var DrillStackHandler;
+        var TitleLevel = coreLibrary.TitleLevel;
 
         /**
          * Constructor for a new Chart.
@@ -62,7 +63,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.103.0
+         * @version 1.105.0
          * @constructor
          * @experimental As of version ...
          * @private
@@ -242,6 +243,17 @@ sap.ui.define([
                     propertyInfo: {
                         type: "object",
                         defaultValue: []
+                    },
+                    /**
+                    * Semantic level of the header.
+                    * For more information, see {@link sap.m.Title#setLevel}.
+                    *
+                    * @since 1.104
+                    */
+                    headerLevel: {
+                        type: "sap.ui.core.TitleLevel",
+                        group: "Appearance",
+                        defaultValue: TitleLevel.Auto
                     }
                 },
                 aggregations: {
@@ -585,37 +597,12 @@ sap.ui.define([
             }.bind(this));
         };
 
-        /**
-         * Defines the height of the chart.
-         * @param {sap.ui.core.CSSSize} iHeight New height for the chart.
-         * @returns {sap.ui.mdc.Chart} Reference to <code>this</code> for method chaining
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted Fiori Elements
-         */
-        Chart.prototype.setHeight = function(iHeight) {
-            try {
-                this.getControlDelegate().adjustChartHeight(this);
-            } catch (oError) {
-                //No need to do anything as correct height will be calculated anyways once inner chart is ready
-            }
-
-            this.setProperty("height", iHeight);
-
-            return this;
-        };
-
         Chart.prototype._createBreadcrumbs = function () {
-            this._oBreadcrumbs = new Breadcrumbs(this.getId() + "--breadcrumbs");
-            this._oBreadcrumbs.updateDrillBreadcrumbs(this, this.getControlDelegate().getDrillableItems(this));
-            this.setAggregation("_breadcrumbs", this._oBreadcrumbs);
-
-            this._oBreadcrumbs.addEventDelegate({
-                onAfterRendering: function() {
-                    this.getControlDelegate().adjustChartHeight(this);
-                }.bind(this)
-            });
+            if (!this._oBreadcrumbs){
+                this._oBreadcrumbs = new Breadcrumbs(this.getId() + "--breadcrumbs");
+                this._oBreadcrumbs.updateDrillBreadcrumbs(this, this.getControlDelegate().getDrillableItems(this));
+                this.setAggregation("_breadcrumbs", this._oBreadcrumbs);
+            }
         };
 
         /**
@@ -1068,6 +1055,7 @@ sap.ui.define([
          * @private
          */
         Chart.prototype._innerChartDataLoadComplete = function (mArguments) {
+            this._checkStyleClassesForDimensions();
             this.setBusy(false);
             this._renderOverlay(false);
 
@@ -1078,6 +1066,18 @@ sap.ui.define([
             });
         };
 
+        Chart.prototype._checkStyleClassesForDimensions = function() {
+            var bHasDimension = this.getItems().some(function(oItem){ return oItem.getType() === "groupable"; });
+
+            if (!bHasDimension && this.hasStyleClass("sapUiMDCChartGrid")) {
+                this.removeStyleClass("sapUiMDCChartGrid");
+                this.addStyleClass("sapUiMDCChartGridNoBreadcrumbs");
+            } else if (bHasDimension && this.hasStyleClass("sapUiMDCChartGridNoBreadcrumbs")) {
+                this.removeStyleClass("sapUiMDCChartGridNoBreadcrumbs");
+                this.addStyleClass("sapUiMDCChartGrid");
+            }
+        };
+
         /**
          * Fetches the current state of the chart (as a JSON)
          * Needed for P13n to fetch current state
@@ -1251,5 +1251,19 @@ sap.ui.define([
             return Control.prototype.addAggregation.apply(this, ["actions", oControl]);
         };
 
+        /**
+         * Specifies the header level for the title of the chart.
+         * @param {sap.ui.core.TitleLevel} sHeaderLevel Header level
+         * @returns {sap.ui.mdc.Chart} Reference to <code>this</code> in order to allow method chaining
+         */
+        Chart.prototype.setHeaderLevel = function(sHeaderLevel) {
+            if (this.getAggregation("_toolbar")) {
+                this.getAggregation("_toolbar")._setHeaderLevel(sHeaderLevel);
+            }
+
+            this.setProperty("headerLevel", sHeaderLevel);
+            return this;
+        };
+
         return Chart;
     });

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (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/ui/mdc/ChartRenderer.js

@@ -63,7 +63,7 @@ sap.ui.define(['./library'],
 
             if (oToolbar) {
                 oRm.openStart("div");
-                oRm.class("sapUiFixFlexFixed");
+                //oRm.class("sapUiFixFlexFixed");
                 oRm.openEnd();
                 oRm.renderControl(oToolbar);
                 oRm.close("div");

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.103.0
+	 * @version 1.105.0
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (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/ui/mdc/Element.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @since 1.54.0
 	 * @experimental As of version 1.54
 	 *

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -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.103.0
+	 * @version 1.105.0
 	 * @constructor
 	 * @experimental As of version 1.61
 	 * @private

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (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/ui/mdc/FilterField.js

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

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

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -40,12 +40,12 @@ sap.ui.define([
 	 * @class
 	 * A <code>Link</code> control can be used to handle navigation scenarios with one or more targets through direct navigation or by opening a <code>Panel</code>.<br>
 	 * It can also be used to display additional content, such as <code>ContactDetails</code> on the <code>Panel</code>.
-	 * <b>Note:</b> Navigation targets are determined by the implementation of a {@link sap.ui.mdc.LinkDelegate}.
+	 * <b>Note:</b> Navigation targets are determined by the implementation of a {@link module:sap/ui/mdc/LinkDelegate LinkDelegate}.
 	 *
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link
@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @experimental As of version 1.74
 	 * @private
 	 * @ui5-restricted sap.fe
-     * @MDC_PUBLIC_CANDIDATE
+	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	var Link = FieldInfoBase.extend("sap.ui.mdc.Link", /** @lends sap.ui.mdc.Link.prototype */ {
 		metadata: {
@@ -106,13 +106,25 @@ sap.ui.define([
 		oModel.setSizeLimit(1000);
 		this.setModel(oModel, "$sapuimdcLink");
 		this.attachEvent("modelContextChange", this.fireDataUpdate, this);
+		this._oLinkType = null;
 		this._bLinkItemsFetched = false;
 		this._aLinkItems = [];
-		this._oLinkType = null;
 
 		FieldInfoBase.prototype.init.apply(this, arguments);
 	};
 
+	Link.prototype.exit = function() {
+		this._aLinkItems = undefined;
+		this._bLinkItemsFetched = undefined;
+		this._oLinkType = undefined;
+		this._oUseDelegateItemsPromise = undefined;
+
+		this._aAdditionalContent = undefined;
+		this._oUseDelegateAdditionalContentPromise = undefined;
+
+		FieldInfoBase.prototype.exit.apply(this, arguments);
+	};
+
 	// ----------------------- Implementation of 'FieldInfoBase' interface --------------------------------------------
 
 	/**
@@ -224,7 +236,17 @@ sap.ui.define([
 
 					var oPanelAdditionalContent = !aAdditionalContent.length && !aMLinkItems.length ? this._getNoContent() : aAdditionalContent;
 
-					var oPanel = new Panel(this._createPanelId(Utils, FlexRuntimeInfoAPI), {
+					var sPanelId = this._createPanelId(Utils, FlexRuntimeInfoAPI);
+					var oExistingPanel = sap.ui.getCore().byId(sPanelId);
+					if (oExistingPanel) {
+						// close Popover if existing
+						if (oExistingPanel.getParent() && oExistingPanel.getParent().close) {
+							oExistingPanel.getParent().close();
+						}
+						oExistingPanel.destroy();
+					}
+
+					var oPanel = new Panel(sPanelId, {
 						enablePersonalization: this.getEnablePersonalization(), // brake the binding chain
 						items: aMBaselineLinkItems.map(function(oMLinkItem) {
 							return new PanelItem(oMLinkItem.key, {
@@ -251,11 +273,13 @@ sap.ui.define([
 						beforeNavigationCallback: this._beforeNavigationCallback.bind(this),
 						metadataHelperPath: "sap/ui/mdc/Link"
 					});
-
 					oPanel.setModel(new JSONModel({
 						metadata: jQuery.extend(true, [], this._getInternalModel().getProperty("/linkItems")),
 						baseline: jQuery.extend(true, [], this._getInternalModel().getProperty("/baselineLinkItems"))
 					}), "$sapuimdcLink");
+					// reset _aAdditionalContent as the additionalContent gets forwarded to the Panel and will be destroyed when the Popover is closed
+					this._setAdditionalContent(undefined);
+
 					return resolve(oPanel);
 				}.bind(this));
 			}.bind(this));
@@ -339,7 +363,7 @@ sap.ui.define([
 		if (this.getParent()) {
 			oField = this.getParent();
 		}
-		var oControl = typeof this.getSourceControl() === "string" ? sap.ui.getCore().byId(this.getSourceControl()) : this.getSourceControl();
+		var oControl = this._getSourceControl();
 		if (!oControl) {
 			//SapBaseLog.error("Invalid source control: " + this.getSourceControl() + ". The mandatory 'sourceControl' association should be defined due to personalization reasons, parent: " + oField + " used instead.");
 			this.setSourceControl(oField);
@@ -442,18 +466,45 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
 	Link.prototype.retrieveAdditionalContent = function() {
+		if (this._aAdditionalContent) {
+			return Promise.resolve(this._aAdditionalContent);
+		} else {
+			this._oUseDelegateAdditionalContentPromise = this._useDelegateAdditionalContent();
+			return this._oUseDelegateAdditionalContentPromise.then(function() {
+				return Promise.resolve(this._aAdditionalContent);
+			}.bind(this));
+		}
+	};
+
+	/**
+	 * Determines the <code>AdditionalContent</code> objects depending on the given <code>LinkDelegate</code>.
+	 * @private
+	 * @returns {Promise} Resolves once the <code>AdditionalContent</code> objects have been retrieved by the delegate. This also sets this._aAdditionalContent.
+	 */
+	Link.prototype._useDelegateAdditionalContent = function() {
 		if (this.awaitControlDelegate()) {
 			return this.awaitControlDelegate().then(function() {
 				var oPayload = Object.assign({}, this.getPayload());
-				return this.getControlDelegate().fetchAdditionalContent(oPayload, this).then(function(aAdditionalContent) {
-					return aAdditionalContent;
-				});
+				return new Promise(function(resolve) {
+					this.getControlDelegate().fetchAdditionalContent(oPayload, this).then(function(aAdditionalContent) {
+						this._setAdditionalContent(aAdditionalContent === null ? [] : aAdditionalContent);
+						resolve();
+					}.bind(this));
+				}.bind(this));
 			}.bind(this));
 		}
 		SapBaseLog.error("mdc.Link retrieveAdditionalContent: control delegate is not set - could not load AdditionalContent from delegate.");
 		return Promise.resolve([]);
 	};
 
+	/**
+	 * @private
+	 * @param {sap.ui.core.Control[]} aAdditionalContent The given <code>AdditionalContent</code> objects
+	 */
+	 Link.prototype._setAdditionalContent = function(aAdditionalContent) {
+		this._aAdditionalContent = aAdditionalContent;
+	};
+
 	/**
 	 * @returns {Promise} Returns a {@link sap.ui.mdc.LinkDelegate.LinkType}, once resolved
 	 * @protected
@@ -496,8 +547,8 @@ sap.ui.define([
 		if (this._bLinkItemsFetched) {
 			return Promise.resolve(this._aLinkItems);
 		} else {
-			this.oUseDelegateItemsPromise = this._useDelegateItems();
-			return this.oUseDelegateItemsPromise.then(function() {
+			this._oUseDelegateItemsPromise = this._useDelegateItems();
+			return this._oUseDelegateItemsPromise.then(function() {
 				return Promise.resolve(this._aLinkItems);
 			}.bind(this));
 		}
@@ -539,6 +590,7 @@ sap.ui.define([
 		aLinkItemsMissingParent.forEach(function(oLinkItem) {
 			this.addDependent(oLinkItem);
 		}.bind(this));
+
 		this._aLinkItems = aLinkItems;
 	};
 
@@ -565,7 +617,7 @@ sap.ui.define([
 	 * @returns {Object} The binding context of the SourceControl / link
 	 */
 	Link.prototype._getControlBindingContext = function() {
-		var oControl = typeof this.getSourceControl() === "string" ? sap.ui.getCore().byId(this.getSourceControl()) : this.getSourceControl();
+		var oControl = this._getSourceControl();
 		return oControl && oControl.getBindingContext() || this.getBindingContext();
 	};
 
@@ -577,5 +629,14 @@ sap.ui.define([
 		return this.getModel("$sapuimdcLink");
 	};
 
+	/**
+	 * Returns the object which is defined in the association "sourceControl"
+	 * @private
+	 * @returns {sap.ui.core.Control} Associated sourceControl
+	 */
+	Link.prototype._getSourceControl = function() {
+		return typeof this.getSourceControl() === "string" ? sap.ui.getCore().byId(this.getSourceControl()) : this.getSourceControl();
+	};
+
 	return Link;
 });