@openui5/sap.m 1.95.0 → 1.96.3

package/src/sap/m/MultiInput.js

@@ -121,7 +121,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.95.0
+	* @version 1.96.3
 	*
 	* @constructor
 	* @public
@@ -992,7 +992,7 @@ function(
 			this._validateCurrentText();
 		}
 
-		if (oEvent && oEvent.setMarked && this._bTokenIsValidated) {
+		if (oEvent && oEvent.setMarked && (this._bTokenIsValidated || this.getDOMValue())) {
 			oEvent.setMarked();
 		}
 
@@ -1403,10 +1403,36 @@ 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;
 	};
 
+	/**
+	 * 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();
+
+		if (sValue) {
+			return sValue;
+		}
+
+		// 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");
+		}
+	};
+
 	/**
 	 * Decorates Input
 	 *
@@ -1660,7 +1686,7 @@ function(
 		}
 
 		iSummedIconsWidth = this._calculateIconsSpace();
-		iTokenizerWidth = Math.ceil(oTokenizer.getDomRef().getBoundingClientRect().width);
+		iTokenizerWidth = oTokenizer.getDomRef().scrollWidth;
 		oFocusDomRef.style.width = 'calc(100% - ' + Math.floor(iSummedIconsWidth + iTokenizerWidth) + "px";
 	};
 

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 *
 	 * @constructor
 	 * @public
@@ -1815,21 +1815,28 @@ sap.ui.define([
 	 * Shows the placeholder if NavContainer is rendered.
 	 * Otherwise, registers the 'onAfterRendering' delegate which shows the placeholder.
 	 *
-	 * @param {object} mSettings Object containing the placeholder instance
+	 * @param {object} [mSettings] Object containing the placeholder instance.
+	 *                             Can be omitted if a placeholder instance is already created by <code>sap.ui.core.routing.async.Target</code>.
+	 * @param {object} [mSettings.placeholder] The placeholder instance
 	 * @param {sap.ui.core.Placeholder} mSettings.placeholder The placeholder instance
 	 * @return {Promise} Promise that resolves with the placeholder
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAPUI5 Distribution libraries only
 	 * @since 1.91
 	 */
 	NavContainer.prototype.showPlaceholder = function(mSettings) {
 		var pLoaded;
 
+		if (!sap.ui.getCore().getConfiguration().getPlaceholder()) {
+			return;
+		}
+
 		if (this._placeholder) {
 			this.hidePlaceholder();
 		}
 
-		if (mSettings.placeholder) {
+		if (mSettings && mSettings.placeholder) {
 			this._placeholder = mSettings.placeholder;
 			pLoaded = this._placeholder._load();
 		} else {
@@ -1848,7 +1855,8 @@ sap.ui.define([
 	/**
 	 * Hides the placeholder and removes the 'onAfterRendering' placeholder delegate.
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAP internal apps
 	 * @since 1.91
 	 */
 	NavContainer.prototype.hidePlaceholder = function() {

package/src/sap/m/NewsContent.js

@@ -8,11 +8,12 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
 	'sap/m/Text',
+	'sap/m/FormattedText',
 	'sap/ui/Device',
 	'./NewsContentRenderer',
 	"sap/ui/events/KeyCodes"
 ],
-	function(library, Control, Text, Device, NewsContentRenderer, KeyCodes) {
+	function(library, Control, Text, FormattedText, Device, NewsContentRenderer, KeyCodes) {
 	"use strict";
 
 	/**
@@ -25,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 * @since 1.34
 	 *
 	 * @public
@@ -56,7 +57,11 @@ sap.ui.define([
 				/**
 				 * The hidden aggregation for the content text.
 				 */
-				"_contentText" : {type : "sap.m.Text", multiple : false, visibility : "hidden"}
+				"_contentText" : {type : "sap.m.FormattedText", multiple : false, visibility : "hidden"},
+				/**
+				 * The hidden aggregation for the subHeader text.
+				 */
+				 "_subHeaderText" : {type : "sap.m.FormattedText", multiple : false, visibility : "hidden"}
 			},
 			events : {
 				/**
@@ -73,11 +78,10 @@ sap.ui.define([
 	* Init function for the control
 	*/
 	NewsContent.prototype.init = function() {
-		this._oContentText = new Text(this.getId() + "-content-text", {
-			maxLines : 2
-		});
-		this._oContentText.cacheLineHeight = false;
+		this._oContentText = new FormattedText(this.getId() + "-content-text");
+		this._oSubHeaderText = new FormattedText(this.getId() + "-subheader-text");
 		this.setAggregation("_contentText", this._oContentText, true);
+		this.setAggregation("_subHeaderText", this._oSubHeaderText, true);
 		this.setTooltip("{AltText}");
 	};
 
@@ -131,8 +135,8 @@ sap.ui.define([
 	NewsContent.prototype.getAltText = function() {
 		var sAltText = "";
 		var bIsFirst = true;
-		if (this.getAggregation("_contentText").getText()) {
-			sAltText += this.getAggregation("_contentText").getText();
+		if (this.getContentText()) {
+			sAltText += this.getContentText();
 			bIsFirst = false;
 		}
 		if (this.getSubheader()) {
@@ -160,10 +164,15 @@ sap.ui.define([
 	};
 
 	NewsContent.prototype.setContentText = function(text) {
-		this._oContentText.setText(text);
+		this._oContentText.setHtmlText(text);
 		return this.setProperty("contentText", text, true);
 	};
 
+	NewsContent.prototype.setSubheader = function(text) {
+		this._oSubHeaderText.setHtmlText(text);
+		return this.setProperty("subheader", text, true);
+	};
+
 	/* --- Event Handling --- */
 
 	/**

package/src/sap/m/NewsContentRenderer.js

@@ -23,7 +23,6 @@ sap.ui.define([],
 	 * @param {sap.m.GenericTile} oControl the control to be rendered
 	 */
 	NewsContentRenderer.render = function(oRm, oControl) {
-		var sSubheader = oControl.getSubheader();
 		var sTooltip = oControl.getTooltip_AsString();
 		if (typeof sTooltip !== "string") {
 			sTooltip = "";
@@ -49,7 +48,7 @@ sap.ui.define([],
 		oRm.openStart("div", oControl.getId() + "-subheader");
 		oRm.class("sapMNwCSbh");
 		oRm.openEnd();
-		oRm.text(sSubheader);
+		oRm.renderControl(oControl._oSubHeaderText);
 		oRm.close("div");
 		oRm.close("div");
 	};

package/src/sap/m/NotificationList.js

@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListBase.js

@@ -78,7 +78,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.95.0
+		 * @version 1.96.3
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListItem.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NumericContent.js

@@ -107,7 +107,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NumericContentRenderer.js

@@ -184,28 +184,45 @@ sap.ui.define([
 		oRm.class(oControl.getState());
 		oRm.openEnd();
 
-		var oMaxDigitsData = oControl._getMaxDigitsData();
-		this._prepareAndRenderIcon(oRm, oControl, oControl._oIcon, oMaxDigitsData.fontClass);
-
-		var iChar = oControl.getTruncateValueTo() || oMaxDigitsData.maxLength;
-	    oRm.openStart("span" , oControl.getId() + "-value-inner");
-		if (oMaxDigitsData.fontClass) {
-			oRm.class(oMaxDigitsData.fontClass);
-		}
-		oRm.openEnd();
+		if (oControl.getState() === LoadState.Loading) {
+			oRm.openStart("div").class("sapMNCContentShimmerPlaceholderItem");
+			oRm.openEnd();
+			oRm.openStart("div")
+				.class("sapMNCContentShimmerPlaceholderRows")
+				.openEnd();
+			oRm.openStart("div")
+				.class("sapMNCContentShimmerPlaceholderItemHeader")
+				.class("sapMNCLoadingShimmer")
+				.openEnd()
+				.close("div");
 
-		//Control shows only iChar characters. If the last shown character is decimal separator - show only first N-1 characters. So "144.5" is shown like "144" and not like "144.".
-		if (sValue.length >= iChar && (sValue[iChar - 1] === "." || sValue[iChar - 1] === ",")) {
-			oRm.text(sValue.substring(0, iChar - 1));
+			oRm.close("div");
+			oRm.close("div");
+			oRm.close("div");
 		} else {
-			oRm.text(sValue ? sValue.substring(0, iChar) : sEmptyValue);
-		}
+			var oMaxDigitsData = oControl._getMaxDigitsData();
+			this._prepareAndRenderIcon(oRm, oControl, oControl._oIcon, oMaxDigitsData.fontClass);
 
-		oRm.close("span");
+			var iChar = oControl.getTruncateValueTo() || oMaxDigitsData.maxLength;
+			oRm.openStart("span" , oControl.getId() + "-value-inner");
+			if (oMaxDigitsData.fontClass) {
+				oRm.class(oMaxDigitsData.fontClass);
+			}
+			oRm.openEnd();
 
-		this._renderScaleAndIndicator(oRm, oControl, sWithoutMargin, sValue, sScale, oMaxDigitsData.fontClass);
+			//Control shows only iChar characters. If the last shown character is decimal separator - show only first N-1 characters. So "144.5" is shown like "144" and not like "144.".
+			if (sValue.length >= iChar && (sValue[iChar - 1] === "." || sValue[iChar - 1] === ",")) {
+				oRm.text(sValue.substring(0, iChar - 1));
+			} else {
+				oRm.text(sValue ? sValue.substring(0, iChar) : sEmptyValue);
+			}
 
-		oRm.close("div");
+			oRm.close("span");
+
+			this._renderScaleAndIndicator(oRm, oControl, sWithoutMargin, sValue, sScale, oMaxDigitsData.fontClass);
+
+			oRm.close("div");
+		}
 	};
 
 	return NumericContentRenderer;

package/src/sap/m/NumericInput.js

@@ -0,0 +1,138 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"./InputBase",
+	"./Input",
+	"./NumericInputRenderer",
+	"./library",
+	"sap/ui/core/format/NumberFormat",
+	"sap/ui/Device",
+	"sap/ui/events/KeyCodes",
+	"sap/ui/dom/jquery/cursorPos"],
+function(
+	InputBase,
+	Input,
+	NumericInputRenderer,
+	library,
+	NumberFormat,
+	Device,
+	KeyCodes) {
+	"use strict";
+
+	var InputType = library.InputType;
+
+	/**
+	 * Constructor for a new <code>sap.m.NumericInput</code>.
+	 * Only used inside a StepInput control.
+	 *
+	 * @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 <code>sap.m.NumericInput</code> control provides functionality for a editing numbers.
+	 *
+	 * @extends sap.m.Input
+	 *
+	 * @author SAP SE
+	 * @version 1.96.3
+	 *
+	 * @constructor
+	 * @private
+	 * @since 1.97.0
+	 * @alias sap.m.NumericInput
+	 */
+	var NumericInput = Input.extend("sap.m.NumericInput", {
+		metadata: {
+			library: "sap.m"
+		}
+	});
+
+	NumericInput.prototype.onBeforeRendering = function() {
+		InputBase.prototype.onBeforeRendering.call(this);
+
+		// The Input is handling its width in its onBeforeRendering method - if noting is set, the width is 100%.
+		// As the NumericInput is using the InputBase's onBeforeRendering method, the width must be handled here too.
+		// The real width of the StepInput is handled from its width property, so the NumericInput's width should be 100%.
+		this.setWidth("100%");
+
+		this._deregisterEvents();
+	};
+
+	NumericInput.prototype.setValue = function(sValue) {
+		Input.prototype.setValue.apply(this, arguments);
+
+		if (this.getDomRef()) {
+			this.getDomRef("inner").setAttribute("aria-valuenow", sValue);
+		}
+
+		return this;
+	};
+
+	NumericInput.prototype.setType = function(sType) {
+		return Input.prototype.setType.call(this, InputType.Number);
+	};
+
+	NumericInput.prototype.onkeydown = function(oEvent) {
+		var sTypedValue,
+			iCursorPos,
+			fParsedValue;
+
+		Input.prototype.onkeydown.apply(this, arguments);
+
+		if (!Device.system.desktop
+			|| oEvent.ctrlKey
+			|| oEvent.metaKey
+			|| (oEvent.originalEvent.key && oEvent.originalEvent.key.length !== 1)) {
+			return;
+		}
+
+		iCursorPos = this._$input.cursorPos();
+
+		// a special key that is meant to be a decimal separator, always
+		// so replace in the input if needed
+		if (oEvent.which === KeyCodes.NUMPAD_COMMA) {
+			oEvent.preventDefault();
+
+			sTypedValue = this.getValue().substring(0, iCursorPos) + this._getNumberFormat().oFormatOptions.decimalSeparator + this.getValue().substring(iCursorPos);
+			fParsedValue = this._getNumberFormat().parse(sTypedValue);
+			if (fParsedValue || fParsedValue === 0) {
+				this.setDOMValue(sTypedValue);
+			}
+
+			return;
+		}
+
+		sTypedValue = this.getValue().substring(0, iCursorPos) + oEvent.originalEvent.key + this.getValue().substring(iCursorPos);
+		fParsedValue = this._getNumberFormat().parse(sTypedValue);
+		if (!isKeyAllowed(oEvent.which) || (!fParsedValue && fParsedValue !== 0)) {
+			oEvent.preventDefault();
+		}
+	};
+
+	var aNotAllowedKeyCodeRanges = [
+		[KeyCodes.A, KeyCodes.Z],
+		[KeyCodes.OPEN_BRACKET, KeyCodes.OPEN_BRACKET],
+		[KeyCodes.PIPE, KeyCodes.SEMICOLON],
+		[KeyCodes.GREAT_ACCENT, KeyCodes.BACKSLASH]
+	];
+
+	function isKeyAllowed(iKeyCode) {
+		return Object.values(KeyCodes).includes(iKeyCode) && !aNotAllowedKeyCodeRanges.some(function(aRange) {
+			return iKeyCode >= aRange[0] && iKeyCode <= aRange[1];
+		});
+	}
+
+	NumericInput.prototype._getNumberFormat = function() {
+		if (!this._oNumberFormat) {
+			this._oNumberFormat = NumberFormat.getFloatInstance();
+		}
+
+		return this._oNumberFormat;
+	};
+
+	return NumericInput;
+});

package/src/sap/m/NumericInputRenderer.js

@@ -0,0 +1,120 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/ui/core/LabelEnablement"],
+	function(Renderer, InputRenderer, Device, LabelEnablement) {
+	"use strict";
+
+	/**
+	* NumericInput renderer.
+	*
+	* NumericInputRenderer extends the InputRenderer.
+	*
+	* @namespace
+	*/
+	var NumericInputRenderer = Renderer.extend(InputRenderer);
+	NumericInputRenderer.apiVersion = 2;
+
+	NumericInputRenderer.writeInnerAttributes = function(oRm, oControl) {
+		var oStepInput = oControl.getParent(),
+			mAccAttributes = this.getAccessibilityState(oControl);
+
+		oRm.attr("type", Device.system.desktop ? "text" : "number");
+
+		// inside the Input this function also sets explicitly textAlign to "End" if the type
+		// of the Input is Numeric (our case)
+		// so we have to overwrite it by leaving only the text direction
+		// and the textAlign will be controlled by textAlign property of the StepInput
+
+		if (sap.ui.getCore().getConfiguration().getRTL()) {
+			oRm.attr("dir", "ltr");
+		}
+		// prevent rendering of aria-disabled attribute to avoid having
+		// both aria-disabled and disabled at the same time
+		mAccAttributes.disabled = null;
+
+		if (NumericInputRenderer._isStepInput(oStepInput)) {
+			oRm.accessibilityState(oStepInput, mAccAttributes);
+		}
+	};
+
+	//Accessibility behavior of the Input needs to be extended
+	/**
+	* Overwrites the accessibility state using the <code>getAccessibilityState</code> method of the <code>InputBaseRenderer</code>.
+	*
+	* @param {NumericInput} oNumericInput The numeric input instance
+	* @returns {Array} mAccessibilityState
+	*/
+	NumericInputRenderer.getAccessibilityState = function(oNumericInput) {
+		var mAccessibilityState = InputRenderer.getAccessibilityState(oNumericInput),
+			fMin,
+			fMax,
+			fNow,
+			sDescription,
+			aAriaLabelledByRefs,
+			aReferencingLabels,
+			sDescribedBy,
+			sResultingLabelledBy,
+			oStepInput = oNumericInput.getParent(),
+			sValue = oNumericInput.getValue();
+
+		if (!NumericInputRenderer._isStepInput(oStepInput)) {
+			return mAccessibilityState;
+		}
+
+		fMin = oStepInput._getMin();
+		fMax = oStepInput._getMax();
+		fNow = oStepInput.getValue();
+		sDescription = oStepInput.getDescription();
+		aAriaLabelledByRefs = oStepInput.getAriaLabelledBy();
+		// If we don't check this manually, we won't have the labels, which were referencing SI,
+		// in aria-labelledby (which normally comes out of the box). This is because writeAccessibilityState
+		// is called for NumericInput, while any labels will be for the parent StepInput.
+		aReferencingLabels = LabelEnablement.getReferencingLabels(oStepInput);
+		sDescribedBy = oStepInput.getAriaDescribedBy().join(" ");
+
+		mAccessibilityState.valuenow = fNow;
+
+		if (Device.system.desktop && sValue) {
+			mAccessibilityState.valuetext = sValue;
+		}
+
+		if (sDescription) {
+			// If there is a description, we should add a reference to it in the aria-labelledby
+			aAriaLabelledByRefs.push(oStepInput._getInput().getId() + "-descr");
+		}
+
+		sResultingLabelledBy = aReferencingLabels.concat(aAriaLabelledByRefs).join(" ");
+
+		if (typeof fMin === "number") {
+			mAccessibilityState.valuemin = fMin;
+		}
+
+		if (typeof fMax === "number") {
+			mAccessibilityState.valuemax = fMax;
+		}
+
+		if (!oStepInput.getEditable()) {
+			mAccessibilityState.readonly = true;
+		}
+
+		if (sDescribedBy) {
+			mAccessibilityState.describedby = sDescribedBy;
+		}
+
+		if (sResultingLabelledBy) {
+			mAccessibilityState.labelledby = sResultingLabelledBy;
+		}
+
+		return mAccessibilityState;
+	};
+
+	NumericInputRenderer._isStepInput = function(oControl) {
+		return oControl && oControl.getMetadata().getName() === "sap.m.StepInput";
+	};
+
+	return NumericInputRenderer;
+});

package/src/sap/m/ObjectAttribute.js

@@ -13,9 +13,10 @@ sap.ui.define([
 	'sap/ui/events/KeyCodes',
 	'./ObjectAttributeRenderer',
 	'sap/base/Log',
+	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/core/Core'
 ],
-function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer, Log, Core) {
+function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer, Log, ManagedObjectObserver, Core) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TextDirection
@@ -38,7 +39,7 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	 * <code>text</code> property is styled and acts as a link. In this case the <code>text</code>
 	 * property must also be set, as otherwise there will be no link displayed for the user.
 	 * @extends sap.ui.core.Control
-	 * @version 1.95.0
+	 * @version 1.96.3
 	 *
 	 * @constructor
 	 * @public
@@ -116,13 +117,24 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 		this.setAggregation('_textControl', new Text());
 	};
 
+	ObjectAttribute.prototype.exit = function() {
+		if (this._oCustomContentObserver) {
+			this._oCustomContentObserver.disconnect();
+			this._oCustomContentObserver = null;
+		}
+
+		if (this._oCustomContentCloning) {
+			this._oCustomContentCloning.destroy();
+		}
+	};
+
 	/**
 	 * Delivers text control with updated title, text and maxLines properties.
 	 *
 	 * @private
 	 */
 	ObjectAttribute.prototype._getUpdatedTextControl = function() {
-		var oAttrAggregation = this.getAggregation('customContent') || this.getAggregation('_textControl'),
+		var oAttrAggregation = this._oCustomContentCloning || this.getAggregation('_textControl'),
 			sTitle = this.getTitle(),
 			sText = this.getAggregation('customContent') ? this.getAggregation('customContent').getText() : this.getText(),
 			sTextDir = this.getTextDirection(),
@@ -280,11 +292,40 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	};
 
 	ObjectAttribute.prototype.setCustomContent = function(oCustomContent) {
-		if (oCustomContent && oCustomContent.isA('sap.m.Link')) {
-			oCustomContent._getTabindex = function() {
+		var oCurrentCustomContent = this.getCustomContent(),
+			fnGetTabIndex = function() {
 				return "-1";
 			};
+
+		//for the cases where the original custom content is rendered
+		if (oCustomContent && oCustomContent.isA('sap.m.Link')) {
+			oCustomContent._getTabindex = fnGetTabIndex;
+		}
+
+		// clone the new aggregation, but first destroy the previous cloning
+		if (this._oCustomContentCloning) {
+			this._oCustomContentCloning.destroy();
+		}
+		this._oCustomContentCloning = oCustomContent && oCustomContent.clone();
+
+		if (this._oCustomContentCloning && this._oCustomContentCloning.isA('sap.m.Link')) {
+			this._oCustomContentCloning._getTabindex = fnGetTabIndex;
+		}
+
+		if (!this._oCustomContentObserver) {
+			this._oCustomContentObserver = new ManagedObjectObserver(function() {
+				this.invalidate();
+			}.bind(this));
 		}
+
+		// do not listen for property changes on the old control
+		if (oCurrentCustomContent) {
+			this._oCustomContentObserver.unobserve(oCurrentCustomContent);
+		}
+
+		// listen on the new one
+		oCustomContent && this._oCustomContentObserver.observe(oCustomContent, { properties: true });
+
 		return this.setAggregation('customContent', oCustomContent);
 	};