@openui5/sap.m 1.102.1 → 1.103.1

package/src/sap/m/MessageItem.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Item
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessageListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessagePage.js

@@ -72,7 +72,7 @@ sap.ui.define([
 		 * @see {@link fiori:https://experience.sap.com/fiori-design-web/message-page/ Message Page}
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopover.js

@@ -91,7 +91,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopoverItem.js

@@ -19,7 +19,7 @@ sap.ui.define(["./library", "./MessageItem"],
 		 * @extends sap.m.MessageItem
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessageStrip.js

@@ -83,7 +83,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MessageToast.js

@@ -70,7 +70,7 @@ sap.ui.define([
 		 * The message toast has the same behavior on all devices. However, you can adjust the width of the control, for example, for use on a desktop device.
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @namespace
 		 * @public

package/src/sap/m/MessageView.js

@@ -112,7 +112,7 @@ sap.ui.define([
 	 * The responsiveness of the <code>MessageView</code> is determined by the container in which it is embedded. For that reason the control could not be visualized if the
 	 * container’s sizes are not defined.
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor

package/src/sap/m/MultiComboBox.js

@@ -159,7 +159,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase
@@ -2824,10 +2824,10 @@ function(
 	};
 
 	/**
-	 * Removes an selectedItem from the association named <code>selectedItems</code>.
+	 * Removes a selected item from the association named <code>selectedItems</code>.
 	 *
-	 * @param {sap.ui.core.Item | sap.ui.core.ID | string} oItem The item to be removed
-	 * @returns {sap.ui.core.ID | null} The removed selectedItem or null
+	 * @param {sap.ui.core.Item | sap.ui.core.ID} oItem The item to be removed or its ID
+	 * @returns {sap.ui.core.Item | null} The removed item or <code>null</code>
 	 * @public
 	 */
 	MultiComboBox.prototype.removeSelectedItem = function(oItem) {

package/src/sap/m/MultiEditField.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], fun
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -121,7 +121,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.102.1
+	* @version 1.103.1
 	*
 	* @constructor
 	* @public
@@ -1190,12 +1190,12 @@ function(
 	 *
 	 * @private
 	 * @param {string} sText The given starting text
-	 * @param {array} aItems The item array
+	 * @param {Array<sap.ui.core.Item|sap.m.ColumnListItem>} aItems The item array
 	 * @param {boolean} bExactMatch Whether the match should be exact
-	 * @param {function} fGetText Function to extract text from a single item
-	 * @return {object} A found item or null
+	 * @param {function} fnGetText Function to extract text from a single item
+	 * @returns {sap.ui.core.Item|sap.m.ColumnListItem|undefined} A found item or undefined
 	 */
-	MultiInput.prototype._findItem = function (sText, aItems, bExactMatch, fGetText) {
+	MultiInput.prototype._findItem = function (sText, aItems, bExactMatch, fnGetText) {
 		if (!sText) {
 			return;
 		}
@@ -1209,7 +1209,7 @@ function(
 		var length = aItems.length;
 		for (var i = 0; i < length; i++) {
 			var item = aItems[i];
-			var compareText = fGetText(item);
+			var compareText = fnGetText(item);
 			if (!compareText) {
 				continue;
 			}
@@ -1231,7 +1231,7 @@ function(
 	 * @private
 	 * @param {string} sText The search text
 	 * @param {boolean} bExactMatch If true, only items will be returned which exactly matches the text
-	 * @return {sap.ui.core.Item} A found item or null
+	 * @returns {sap.ui.core.Item|undefined} A found item or undefined
 	 */
 	MultiInput.prototype._getSuggestionItem = function (sText, bExactMatch) {
 		var items = null;
@@ -1811,7 +1811,7 @@ function(
 	 * @private
 	 * @param {object} oParameters Parameter bag containing fields for text, token, suggestionObject and validation callback
 	 * @param {function[]} aValidators [optional] Array of all validators to be used
-	 * @returns {sap.m.Token} A valid token or null
+	 * @returns {sap.m.Token|null} A valid token or null
 	 */
 	MultiInput.prototype._validateToken = function(oParameters, aValidators) {
 		var oToken = oParameters.token,

package/src/sap/m/NavContainer.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -402,12 +402,12 @@ sap.ui.define([
 
 
 	/**
-	 * Returns the control with the given ID from the "pages" aggregation (if available).
+	 * Returns the control with the given ID from the <code>pages</code> aggregation (if available).
 	 *
 	 * @param {string} pageId The ID of the aggregated control to find
 	 * @public
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
-	 * @returns {sap.ui.core.Control} The control with the given ID or null if it doesn`t exist
+	 * @returns {sap.ui.core.Control|null} The control with the given ID or <code>null</code> if it doesn't exist
 	 */
 	NavContainer.prototype.getPage = function (pageId) {
 		var aPages = this.getPages();
@@ -1713,7 +1713,7 @@ sap.ui.define([
 	 *            or that <code>Control</code> itself;
 	 *            if <code>vPage</code> is invalid, a negative value or a value greater or equal than the current size
 	 *            of the aggregation, nothing is removed.
-	 * @return {sap.ui.core.Control} the removed page or null
+	 * @returns {sap.ui.core.Control|null} the removed page or <code>null</code>
 	 * @protected
 	 * @override
 	 */

package/src/sap/m/NewsContent.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NotificationList.js

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

package/src/sap/m/NotificationListBase.js

@@ -86,7 +86,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

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

package/src/sap/m/NotificationListItem.js

@@ -64,7 +64,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @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.102.1
+	 * @version 1.103.1
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NumericInput.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.m.Input
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/ObjectAttribute.js

@@ -42,7 +42,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.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -145,6 +145,19 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 		}
 	};
 
+	ObjectAttribute.prototype.onBeforeRendering = function() {
+		var oLink,
+			sTitleId = this.getId() + "-title";
+
+		if (this._isClickable() && !this._isSimulatedLink()) {
+			oLink = this.getCustomContent();
+			oLink.setAriaHasPopup(this.getAriaHasPopup());
+			if (!oLink.getAriaLabelledBy().includes(sTitleId)) {
+				oLink.addAriaLabelledBy(sTitleId);
+			}
+		}
+	};
+
 	/**
 	 * Delivers text control with updated title, text and maxLines properties.
 	 *

package/src/sap/m/ObjectAttributeRenderer.js

@@ -122,15 +122,16 @@ sap.ui.define(["sap/ui/core/library"],
 	ObjectAttributeRenderer.renderActiveText = function (oRm, oOA, oParent) {
 		var oAttrAggregation = oOA.getAggregation("customContent"),
 			bRenderBDI = oOA.getTextDirection() === TextDirection.Inherit,
-			sAriaHasPopup = (oOA.getAriaHasPopup() === AriaHasPopup.None) ? "" : oOA.getAriaHasPopup().toLowerCase();
+			sAriaHasPopup = (oOA.getAriaHasPopup() === AriaHasPopup.None) ? "" : oOA.getAriaHasPopup().toLowerCase(),
+			sAriaLabel = [oOA.getTitle(), oOA.getText()].join(" ").trim();
 
 		oRm.openStart("span", oOA.getId() + "-text");
 		oRm.class("sapMObjectAttributeText");
-		if (oAttrAggregation && oAttrAggregation.isA("sap.m.Link")) {
-			oAttrAggregation.setAriaHasPopup(oOA.getAriaHasPopup());
-		} else if (oOA.getText() && oOA.getActive()) {
+
+		if (oOA._isSimulatedLink()) {
 			oRm.attr("tabindex", "0");
 			oRm.attr("role", "link");
+			oRm.attr("aria-label", sAriaLabel);
 			if (sAriaHasPopup) {
 				oRm.attr("aria-haspopup", sAriaHasPopup);
 			}

package/src/sap/m/ObjectHeader.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * <code>sapUiResponsivePadding--header</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -767,7 +767,7 @@ sap.ui.define([
 
 	/**
 	 * @private
-	 * @returns {Array} The visible markers
+	 * @returns {sap.m.ObjectMarker[]} The visible markers
 	 */
 	ObjectHeader.prototype._getVisibleMarkers = function() {
 
@@ -1249,10 +1249,10 @@ sap.ui.define([
 		if (!bHasStatus && this.getStatuses() && this.getStatuses().length > 0) {
 			var statuses = this.getStatuses();
 			for ( var i = 0; i < statuses.length; i++) {
-				if (statuses[i] instanceof sap.m.ObjectStatus && !statuses[i]._isEmpty()) {
+				if (statuses[i] && statuses[i].isA("sap.m.ObjectStatus") && !statuses[i]._isEmpty()) {
 					bHasStatus = true;
 					break;
-				} else if (statuses[i] instanceof sap.m.ProgressIndicator) {
+				} else if (statuses[i] && statuses[i].isA("sap.m.ProgressIndicator")) {
 					bHasStatus = true;
 					break;
 				}

package/src/sap/m/ObjectHeaderRenderer.js

@@ -248,7 +248,7 @@ sap.ui.define([
 			var aStatuses = oOH.getStatuses();
 			for (var i = 0; i < aStatuses.length; i++) {
 				if (!aStatuses[i].getVisible || aStatuses[i].getVisible()) {
-					if ((aStatuses[i] instanceof sap.m.ObjectStatus && !aStatuses[i]._isEmpty()) || aStatuses[i] instanceof sap.m.ProgressIndicator) {
+					if ((aStatuses[i].isA("sap.m.ObjectStatus") && !aStatuses[i]._isEmpty()) || aStatuses[i].isA("sap.m.ProgressIndicator")) {
 						aVisibleStatuses.push([aStatuses[i]]);
 					} else {
 						Log.warning("Only sap.m.ObjectStatus or sap.m.ProgressIndicator are allowed in \"sap.m.ObjectHeader.statuses\" aggregation." + " Current object is "
@@ -314,7 +314,7 @@ sap.ui.define([
 			this._renderAttribute(oRM, oOH, oLeft, ObjectHeaderRenderer._isEmptyArray(aRight));
 		} else if (ObjectHeaderRenderer._isEmptyObject(oLeft) && !ObjectHeaderRenderer._isEmptyArray(aRight)) {
 			// if there are no attributes at all and the array containing statuses and progress indicators isn't empty
-			if (aRight[0] instanceof sap.m.ProgressIndicator) { // check if the first element in the array is progress indicator, and if it's so then place an empty "attribute" div before the progress indicator
+			if (aRight[0] && aRight[0].isA("sap.m.ProgressIndicator")) { // check if the first element in the array is progress indicator, and if it's so then place an empty "attribute" div before the progress indicator
 				oRM.openStart("div");
 				oRM.class("sapMOHAttr");
 				oRM.openEnd();
@@ -324,9 +324,9 @@ sap.ui.define([
 
 		if (!ObjectHeaderRenderer._isEmptyArray(aRight)) { // check do we have statuses, icons or progress indicators and render them accordingly
 			oRM.openStart("div");
-			if (aRight[0] instanceof sap.m.ProgressIndicator) {
+			if (aRight[0] && aRight[0].isA("sap.m.ProgressIndicator")) {
 				oRM.class("sapMOHStatusFixedWidth");
-			} else if (aRight[0] instanceof sap.m.ObjectMarker) {
+			} else if (aRight[0] && aRight[0].isA("sap.m.ObjectMarker")) {
 				oRM.class("sapMOHStatusFixedWidth");
 				oRM.class("sapMObjStatusMarker");
 			} else {
@@ -814,7 +814,7 @@ sap.ui.define([
 
 		oRM.close("div");
 
-		if (oHeaderContainer && oHeaderContainer instanceof sap.m.IconTabBar) {
+		if (oHeaderContainer && oHeaderContainer.isA("sap.m.IconTabBar")) {
 			this._renderChildControl(oRM, oOH, oHeaderContainer);
 		}
 
@@ -1141,15 +1141,15 @@ sap.ui.define([
 			oIconTabHeader;
 
 		if (oHeaderContainer) {
-			if (oHeaderContainer instanceof sap.m.IconTabBar) {
+			if (oHeaderContainer.isA("sap.m.IconTabBar")) {
 				oIconTabHeader = oHeaderContainer._getIconTabHeader();
 				if (oIconTabHeader.getVisible()) {
 					oControl._iCountVisTabs = oIconTabHeader.getItems().length;
 					return !!oIconTabHeader.getItems().length;
 				}
-			} else if (oHeaderContainer.getMetadata().getName() === "sap.m.HeaderContainer") {
+			} else if (oHeaderContainer.isA("sap.m.HeaderContainer")) {
 				return !!oHeaderContainer.getContent().length;
-			} else if (oHeaderContainer.getMetadata().getName() === "sap.suite.ui.commons.HeaderContainer") {
+			} else if (oHeaderContainer.isA("sap.suite.ui.commons.HeaderContainer")) {
 				return !!oHeaderContainer.getItems().length;
 			}
 		}
@@ -1172,17 +1172,17 @@ sap.ui.define([
 
 		oRM.openStart("div");
 		oRM.class("sapMOHRTabs");
-		if (oHeaderContainer instanceof sap.m.IconTabBar) {
+		if (oHeaderContainer && oHeaderContainer.isA("sap.m.IconTabBar")) {
 			oRM.class("sapMOHRTabsITB");
 		}
 		oRM.openEnd();
 		if (oHeaderContainer) {
-			if (oHeaderContainer instanceof sap.m.IconTabBar) {
+			if (oHeaderContainer.isA("sap.m.IconTabBar")) {
 				oIconTabHeader = oHeaderContainer._getIconTabHeader();
 				this._renderChildControl(oRM, oControl, oIconTabHeader);
 				// tell iconTabBar to not render the header
 				oHeaderContainer._bHideHeader = true;
-			} else if (oHeaderContainer.getMetadata().getName() === "sap.m.HeaderContainer" || oHeaderContainer.getMetadata().getName() === "sap.suite.ui.commons.HeaderContainer") {
+			} else if (oHeaderContainer.isA(["sap.m.HeaderContainer", "sap.suite.ui.commons.HeaderContainer"])) {
 				// render the header container
 				this._renderChildControl(oRM, oControl, oHeaderContainer);
 			} else {

package/src/sap/m/ObjectIdentifier.js

@@ -52,7 +52,7 @@ function(
 	 *
      * <b>Note:</b> This control should not be used with {@link sap.m.Label} or in Forms along with {@link sap.m.Label}.
 	 * @extends sap.ui.core.Control
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -282,7 +282,7 @@ function(
 					//Add a custom hidden role "ObjectIdentifier" with hidden text
 					ariaLabelledBy: InvisibleText.getStaticId("sap.m", "OI_ARIA_ROLE")
 				});
-				oTitleControl.addAssociation("ariaLabelledBy", sId + "-text", true);
+				oTitleControl.addAriaLabelledBy(sId + "-text");
 			} else {
 				oTitleControl = new Text({
 					id : sId + "-txt",
@@ -423,7 +423,7 @@ function(
 
 		if (sAssociationName === "ariaLabelledBy") {
 			if (this.getTitleActive() && oTitle instanceof Link) {
-				oTitle.addAssociation("ariaLabelledBy", sId, true);
+				oTitle.addAriaLabelledBy(sId);
 			}
 		}
 

package/src/sap/m/ObjectListItem.js

@@ -59,7 +59,7 @@ function(
 		 *
 		 * <b>Note:</b> The control must only be used in the context of a list.
 		 * @extends sap.m.ListItemBase
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ObjectMarker.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -415,11 +415,12 @@ sap.ui.define([
 
 		if (bIsTextVisible) {
 			oInnerControl.setAggregation("tooltip", null, bSuppressInvalidate);
+			oInnerIcon && oInnerIcon.setAggregation("tooltip", null, bSuppressInvalidate);
 			oInnerControl.setText(sText, bSuppressInvalidate);
 			this.addStyleClass("sapMObjectMarkerText");
 		} else {
 			if (oInnerIcon) {
-				oInnerControl.setAggregation("tooltip", sText, bSuppressInvalidate);
+				oInnerControl.setAggregation("tooltip", this.getTooltip_AsString() || sText, bSuppressInvalidate);
 			}
 			oInnerControl.setText(null, bSuppressInvalidate);
 			this.removeStyleClass("sapMObjectMarkerText");
@@ -658,8 +659,10 @@ sap.ui.define([
 
 	CustomLinkRenderer.render = function(oRm, oControl) {
 		if (oControl.getIconOnly()) {
-			var oIconControl = oControl._getIconAggregation();
-			oIconControl.setAlt(oControl.getTooltip_AsString());
+			var oIconControl = oControl._getIconAggregation(),
+				sTooltip = oControl.getTooltip_AsString();
+			oIconControl.setAlt(sTooltip);
+			oIconControl.setTooltip(sTooltip);
 			oRm.renderControl(oIconControl);
 		} else {
 			LinkRenderer.render.call(this, oRm, oControl);

package/src/sap/m/ObjectNumber.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectStatus.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbar.js

@@ -7,6 +7,7 @@
 // Provides control sap.m.OverflowToolbar.
 sap.ui.define([
 	"sap/ui/core/library",
+	"sap/ui/core/Core",
 	"./library",
 	"sap/ui/core/Control",
 	"sap/m/ToggleButton",
@@ -27,6 +28,7 @@ sap.ui.define([
 	"sap/ui/dom/jquery/Focusable" // jQuery Plugin "lastFocusableDomRef"
 ], function(
 	coreLibrary,
+	oCore,
 	library,
 	Control,
 	ToggleButton,
@@ -90,10 +92,12 @@ sap.ui.define([
 	 * <h3>Overflow Behavior</h3>
 	 * By default, only the following controls can move to the overflow area:
 	 *
-	 * <ul><li>{@link sap.m.Button}</li>
+	 * <ul><li>{@link sap.m.Breadcrumbs}</li>
+	 * <li>{@link sap.m.Button}</li>
 	 * <li>{@link sap.m.CheckBox}</li>
 	 * <li>{@link sap.m.ComboBox}</li>
 	 * <li>{@link sap.m.DatePicker}</li>
+	 * <li>{@link sap.m.DateRangeSelection}</li>
 	 * <li>{@link sap.m.DateTimeInput}</li>
 	 * <li>{@link sap.m.DateTimePicker}</li>
 	 * <li>{@link sap.m.GenericTag}</li>
@@ -117,7 +121,7 @@ sap.ui.define([
 	 * <b>Note:</b> The <code>OverflowToolbar</code> is an adaptive container that checks the available
 	 * width and hides the part of its content that doesn't fit. It is intended that simple controls,
 	 * such as {@link sap.m.Button} and {@link sap.m.Label} are used as content. Embedding other
-	 * adaptive container controls, such as {@link sap.m.Breadcrumbs}, results in competition for the available
+	 * adaptive container controls (with the exception of {@link sap.m.Breadcrumbs}), results in competition for the available
 	 * space - both controls calculate the available space based on the other one's size and both change their
 	 * width at the same time, leading to incorrectly distributed space.
 	 *
@@ -131,7 +135,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @public
@@ -228,7 +232,7 @@ sap.ui.define([
 
 		this.addStyleClass("sapMOTB");
 
-		this._sAriaRoleDescription = sap.ui.getCore()
+		this._sAriaRoleDescription = oCore
 			.getLibraryResourceBundle("sap.m")
 			.getText(OverflowToolbar.ARIA_ROLE_DESCRIPTION);
 
@@ -310,8 +314,7 @@ sap.ui.define([
 	 * @private
 	 */
 	OverflowToolbar.prototype._doLayout = function () {
-		var oCore = sap.ui.getCore(),
-			iWidth;
+		var iWidth;
 
 		// If the theme is not applied, control widths should not be measured and cached
 		if (!oCore.isThemeApplied()) {
@@ -378,7 +381,7 @@ sap.ui.define([
 			$LastFocusableChildControl = this.$().lastFocusableDomRef();
 
 		if (this.sFocusedChildControlId) {
-			oFocusedChildControl = sap.ui.getCore().byId(this.sFocusedChildControlId);
+			oFocusedChildControl = oCore.byId(this.sFocusedChildControlId);
 		}
 
 		if (oFocusedChildControl && oFocusedChildControl.getDomRef()){
@@ -403,7 +406,7 @@ sap.ui.define([
 	 */
 	OverflowToolbar.prototype._preserveChildControlFocusInfo = function () {
 		// Preserve focus info
-		var sActiveElementId = sap.ui.getCore().getCurrentFocusedControlId();
+		var sActiveElementId = oCore.getCurrentFocusedControlId();
 
 		if (this._getControlsIds().indexOf(sActiveElementId) !== -1) {
 			this._bControlWasFocused = true;
@@ -830,7 +833,9 @@ sap.ui.define([
 	 */
 	OverflowToolbar.prototype._markControlWithShrinkableLayoutData = function(oControl) {
 		var sWidth,
-			oLayout;
+			oLayout,
+			bShrinkable,
+			bBreadcrumbs;
 
 		// remove old class
 		oControl.removeStyleClass(Toolbar.shrinkClass);
@@ -843,7 +848,14 @@ sap.ui.define([
 
 		// check shrinkable via layout data
 		oLayout = oControl.getLayoutData();
-		if (oLayout && oLayout.isA("sap.m.ToolbarLayoutData") && oLayout.getShrinkable()) {
+		bShrinkable = oLayout && oLayout.isA("sap.m.ToolbarLayoutData") && oLayout.getShrinkable();
+
+		// check explicitly for sap.m.Breadcrumbs, as text
+		// controls implement sap.ui.core.IShrinkable too,
+		// and they are not meant to be included
+		bBreadcrumbs = oControl.isA("sap.m.Breadcrumbs");
+
+		if (bShrinkable || bBreadcrumbs) {
 			oControl.addStyleClass(Toolbar.shrinkClass);
 		}
 	};
@@ -1449,11 +1461,22 @@ sap.ui.define([
 	OverflowToolbar.prototype._getOptimalControlWidth = function (oControl, iOldSize) {
 		var iOptimalWidth,
 			oLayoutData = oControl.getLayoutData(),
-			bShrinkable = oLayoutData && oLayoutData.isA("sap.m.ToolbarLayoutData") ? oLayoutData.getShrinkable() : false,
-			iMinWidth = bShrinkable ? this._getMinWidthOfShrinkableControl(oControl) : 0,
+			bLayoutData = oLayoutData && oLayoutData.isA("sap.m.ToolbarLayoutData"),
 			bVisible = oControl.getVisible(),
+			bBreadcrumbs = oControl.isA("sap.m.Breadcrumbs"),
+			bShrinkable = false,
+			iMinWidth,
 			iSpacerWidth;
 
+		// sap.m.Breadcrumbs is always shrinkable, regardless of sap.m.ToolbarLayoutData.shrinkable
+		if (bBreadcrumbs) {
+			bShrinkable = true;
+		} else if (bLayoutData) {
+			bShrinkable = oLayoutData.getShrinkable();
+		}
+
+		iMinWidth = bShrinkable ? this._getMinWidthOfShrinkableControl(oControl) : 0;
+
 		// For spacers, get the width (if specified) + margins
 		if (oControl.isA("sap.m.ToolbarSpacer")) {
 			iSpacerWidth = parseInt(oControl.$().css('width'));