@openui5/sap.m 1.98.0 → 1.101.0

package/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+	"overrides": [
+		/*
+		 * Productive code, sample and unit test code of sap.m has been cleaned up.
+		 * No more references to the global jQuery allowed
+		 */
+		{
+			"files": [
+				"src/**/*.js",
+				"test/sap/m/demokit/**/*.js",
+				"test/sap/m/qunit/**/*.js"
+			],
+			"globals": {
+				"jQuery": "off"
+			}
+		}
+	]
+}

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ 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.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,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.34
+Component: SAP Theming Base Content, version: 11.1.38
 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.m",
-  "version": "1.98.0",
+  "version": "1.101.0",
   "description": "OpenUI5 UI Library sap.m",
   "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.ui.core": "1.98.0",
-    "@openui5/sap.ui.layout": "1.98.0",
-    "@openui5/sap.ui.unified": "1.98.0"
+    "@openui5/sap.ui.core": "1.101.0",
+    "@openui5/sap.ui.layout": "1.101.0",
+    "@openui5/sap.ui.unified": "1.101.0"
   }
 }

package/src/sap/m/.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.98.0</version>
+  <version>1.101.0</version>
 
   <documentation>The main UI5 control library, with responsive controls that can be used in touch devices as well as desktop browsers.</documentation>
 

package/src/sap/m/AccButton.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Button','./AccButtonRenderer'],
 	 * @extends sap.m.Button
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/ActionListItem.js

@@ -31,7 +31,7 @@ sap.ui.define(['./ListItemBase', './library', './ActionListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -74,7 +74,7 @@ sap.ui.define(['./ListItemBase', './library', './ActionListItemRenderer'],
 	 *
 	 * @returns {sap.m.ListMode|""} Mode of the list item.
 	 * @protected
-	 * @overwrite
+	 * @override
 	 */
 	ActionListItem.prototype.getMode = function() {
 		return ListMode.None;

package/src/sap/m/ActionListItemRenderer.js

@@ -17,15 +17,13 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer"],
 	ActionListItemRenderer.apiVersion = 2;
 
 	/**
-	 * Renders the HTML for the given control, using the provided
+	 * Renders the List item attributes for the given control, using the provided
 	 * {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *          oRenderManager the RenderManager that can be used for writing to the
-	 *          Render-Output-Buffer
-	 * @param {sap.ui.core.Control}
-	 *          oControl an object representation of the control that should be
-	 *          rendered
+	 * @param {sap.ui.core.RenderManager} rm
+	 *          RenderManager to be used for rendering
+	 * @param {sap.m.ActionListItem} oLI
+	 *          The item for which the attributes should be rendered
 	 */
 	ActionListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMALI");

package/src/sap/m/ActionSelect.js

@@ -20,7 +20,7 @@ sap.ui.define(['./Select', 'sap/ui/core/InvisibleText', 'sap/ui/Device', 'sap/ui
 		 * @extends sap.m.Select
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ActionSelectRenderer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Renderer', './SelectRenderer'],
 		 * Apply a CSS class to the HTML root element of the ActionSelect control.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-		 * @param {sap.ui.core.Control} oActionSelect An object representation of the control that should be rendered.
+		 * @param {sap.m.ActionSelect} oActionSelect An object representation of the control that should be rendered.
 		 */
 		ActionSelectRenderer.addClass = function(oRm, oActionSelect) {
 			oRm.class(ActionSelectRenderer.ACTION_SELECT_CSS_CLASS);

package/src/sap/m/ActionSheet.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -227,8 +227,15 @@ sap.ui.define([
 			this._oItemNavigation.setPageSize(5);
 
 			this._oItemNavigation.setDisabledModifiers({
-				sapnext: ["alt"],
-				sapprevious: ["alt"]
+				// Alt + arrow keys are reserved for browser navigation
+				sapnext: [
+					"alt", // Windows and Linux
+					"meta" // Apple (⌘)
+				],
+				sapprevious: [
+					"alt",
+					"meta"
+				]
 			});
 
 		}
@@ -437,7 +444,7 @@ sap.ui.define([
 		if (!this._oCancelButton) {
 			var sCancelButtonText = (this.getCancelButtonText()) ? this.getCancelButtonText() : sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACTIONSHEET_CANCELBUTTON_TEXT"),
 				that = this;
-	//			var sButtonStyle = (sap.ui.Device.os.ios) ? sap.m.ButtonType.Unstyled : sap.m.ButtonType.Default;
+	//			var sButtonStyle = (Device.os.ios) ? ButtonType.Unstyled : ButtonType.Default;
 			this._oCancelButton = new Button(this.getId() + '-cancelBtn', {
 				text: sCancelButtonText,
 				type: ButtonType.Reject,
@@ -605,7 +612,7 @@ sap.ui.define([
 
 	/**
 	 * Extends the afterClose event by providing context information.
-	 * @param {sap.m.Button | null} Action selected on Popover close
+	 * @param {sap.m.Button | null} oAction Action selected on Popover close
 	 * @private
 	 */
 	ActionSheet.prototype._onAfterClose = function (oAction) {

package/src/sap/m/ActionSheetRenderer.js

@@ -21,7 +21,7 @@ sap.ui.define(["sap/ui/Device"],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.ActionSheet} oControl an object representation of the control that should be rendered
 	 */
 	ActionSheetRenderer.render = function(oRm, oControl){
 		var aActionButtons = oControl._getAllButtons(),

package/src/sap/m/App.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.m.NavContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/AssociativeOverflowToolbar.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/base/Log', './OverflowToolbar', './OverflowToolbarRenderer',
 		 * @extends sap.m.OverflowToolbar
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/Avatar.js

@@ -13,8 +13,9 @@ sap.ui.define([
     "sap/ui/events/KeyCodes",
     "sap/base/Log",
     "sap/ui/core/Icon",
-    "./library"
-], function(Control, IconPool, AvatarRenderer, KeyCodes, Log, Icon, library) {
+    "./library",
+	"sap/ui/core/library"
+], function(Control, IconPool, AvatarRenderer, KeyCodes, Log, Icon, library, coreLibrary) {
 	"use strict";
 
 	// shortcut for sap.m.AvatarType
@@ -32,6 +33,9 @@ sap.ui.define([
 	// shortcut for sap.m.AvatarShape
 	var AvatarShape = library.AvatarShape;
 
+	// shortcut for sap.ui.core.aria.HasPopup
+	var AriaHasPopup = coreLibrary.aria.HasPopup;
+
 	// shortcut for Accent colors keys only (from AvatarColor enum)
 	var AccentColors = Object.keys(AvatarColor).filter(function (sCurrColor) {
 		return sCurrColor.indexOf("Accent") !== -1;
@@ -76,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -172,7 +176,20 @@ sap.ui.define([
 				 *
 				 * @since 1.97
 				 */
-				decorative : {type : "boolean", group : "Accessibility", defaultValue : false}
+				decorative : {type : "boolean", group : "Accessibility", defaultValue : false},
+
+				/**
+				 * Specifies the value of the <code>aria-haspopup</code> attribute
+				 *
+				 * If the value is <code>None</code>, the attribute will not be rendered. Otherwise it will be rendered with the selected value.
+				 *
+				 * NOTE: Use this property only when an avatar is related to a popover/popup. The value needs to be equal to the main/root role of the popup - e.g. dialog,
+				 * menu or list (examples: if you have dialog -> dialog, if you have menu -> menu; if you have list -> list; if you have dialog containing a list -> dialog).
+				 * Do not use it, if you open a standard sap.m.Dialog, MessageBox or other type of dialogs displayed as on overlay over the application.
+				 *
+				 * @since 1.99.0
+				 */
+				ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None}
 
 			},
 			aggregations : {

package/src/sap/m/AvatarRenderer.js

@@ -28,7 +28,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
-		 * @param {sap.ui.core.Control} oAvatar an object representation of the control that should be rendered
+		 * @param {sap.m.Avatar} oAvatar an object representation of the control that should be rendered
 		 */
 		AvatarRenderer.render = function (oRm, oAvatar) {
 			var sInitials = oAvatar.getInitials(),
@@ -44,6 +44,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 				sTooltip = oAvatar.getTooltip_AsString(),
 				aLabelledBy = oAvatar.getAriaLabelledBy(),
 				aDescribedBy = oAvatar.getAriaDescribedBy(),
+				aHasPopup = oAvatar.getAriaHasPopup(),
 				oBadge = oAvatar.hasListeners("press") ?  oAvatar._getBadge() : null,
 				sDefaultTooltip = oAvatar._getDefaultTooltip();
 
@@ -91,6 +92,10 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			if (aDescribedBy && aDescribedBy.length > 0) {
 				oRm.attr("aria-describedby", aDescribedBy.join(" "));
 			}
+			// aria-haspopup references
+			if (aHasPopup && aHasPopup !== "None") {
+				oRm.attr("aria-haspopup", aHasPopup.toLowerCase());
+			}
 			oRm.openEnd();
 			if (sActualDisplayType === AvatarType.Icon || sImageFallbackType === AvatarType.Icon) {
 				oRm.renderControl(oAvatar._getIcon().addStyleClass(sAvatarClass + "TypeIcon"));

package/src/sap/m/BadgeCustomData.js

@@ -57,8 +57,9 @@ sap.ui.define([
 	 * Sets the value of BadgeCustomData and updates the Badge DOM element.
 	 *
 	 * @private
-	 * @param {string} Value to be.
-	 * @return {this} this BadgeCustomData reference for chaining.
+	 * @param {string} sValue Value to be.
+	 * @returns {this} this BadgeCustomData reference for chaining.
+	 * @override
 	 */
 	BadgeCustomData.prototype.setValue =  function (sValue) {
 		if (this.getValue() === sValue) { return this; }
@@ -112,8 +113,9 @@ sap.ui.define([
 	 * Sets the key property of BadgeCustomData as it can be only 'badge'.
 	 *
 	 * @private
-	 * @param {string} Key to be.
-	 * @return {this} this BadgeCustomData reference for chaining.
+	 * @param {string} sKey Key to be.
+	 * @returns {this} this BadgeCustomData reference for chaining.
+	 * @override
 	 */
 	BadgeCustomData.prototype.setKey = function () {
 		return this;

package/src/sap/m/BadgeEnabler.js

@@ -8,9 +8,10 @@
 sap.ui.define([
 		'sap/m/BadgeCustomData',
 		'sap/base/Log',
-		'sap/m/library'
+		'sap/m/library',
+		'sap/ui/thirdparty/jquery'
 	],
-	function(BadgeCustomData, Log, library) {
+	function(BadgeCustomData, Log, library, jQuery) {
 		"use strict";
 
 		var IBADGE_CSS_CLASS = "sapMBadge";

package/src/sap/m/Bar.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @implements sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -340,10 +340,11 @@ sap.ui.define([
 			aContentLeftControls = this.getContentLeft().filter(function(oControl) { return oControl.getVisible(); }),
 			aContentRightControls = this.getContentRight().filter(function(oControl) { return oControl.getVisible(); }),
 			iContentLeftPadding = aContentLeftControls.length ? 0 : parseInt(this._$LeftBar.css('padding-' + sLeftOrRight)),
-			iContentRightPadding = aContentRightControls.length ? 0 : parseInt(this._$RightBar.css('padding-' + sRightOrLeft));
+			iContentRightPadding = aContentRightControls.length ? 0 : parseInt(this._$RightBar.css('padding-' + sRightOrLeft)),
+			iParentPaddingLeft = parseInt(this.$().css("padding-left")),
+			iParentPaddingRight = parseInt(this.$().css("padding-right"));
 
 		if (this.getEnableFlexBox()) {
-
 			iMidBarPlaceholderWidth = iBarWidth - iLeftBarWidth - iRightBarWidth - parseInt(this._$MidBarPlaceHolder.css('margin-left')) - parseInt(this._$MidBarPlaceHolder.css('margin-right'));
 
 			oMidBarCss.position = "absolute";
@@ -354,7 +355,7 @@ sap.ui.define([
 			return oMidBarCss;
 		}
 
-		var iSpaceBetweenLeftAndRight = iBarWidth - iLeftBarWidth - iRightBarWidth,
+		var iSpaceBetweenLeftAndRight = iBarWidth - iLeftBarWidth - iRightBarWidth - (bRtl ? iParentPaddingLeft : iParentPaddingRight),
 			iMidBarStartingPoint = (iBarWidth / 2) - (iMidBarPlaceholderWidth / 2),
 			bLeftContentIsOverlapping = iLeftBarWidth > iMidBarStartingPoint,
 			iMidBarEndPoint = (iBarWidth / 2) + (iMidBarPlaceholderWidth / 2),
@@ -372,7 +373,7 @@ sap.ui.define([
 			oMidBarCss.width = iSpaceBetweenLeftAndRight + iContentLeftPadding + iContentRightPadding + "px";
 
 			//Set left or right depending on LTR/RTL
-			oMidBarCss[sLeftOrRight] = iLeftBarWidth - iContentLeftPadding;
+			oMidBarCss[sLeftOrRight] = iLeftBarWidth - iContentLeftPadding + (bRtl ? iParentPaddingRight : iParentPaddingLeft);
 		}
 
 		return oMidBarCss;

package/src/sap/m/BarRenderer.js

@@ -26,7 +26,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 * @protected
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the Render-Output-Buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.Bar} oControl An object representation of the control that should be rendered
 	 */
 	BarRenderer.render = BarInPageEnabler.prototype.render;
 
@@ -38,7 +38,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 	 * Adds classes attributes and styles to the root tag
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.Bar} oControl An object representation of the control that should be rendered
 	 */
 	BarRenderer.decorateRootElement = function (oRM, oControl) {
 		oRM.class("sapMBar");
@@ -68,7 +68,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.Bar} oControl An object representation of the control that should be rendered
 	 */
 	BarRenderer.renderBarContent = function(oRM, oControl) {
 		//left content area
@@ -133,7 +133,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 
 	/**
 	 * Makes the RenderManager render all controls in an array.
-	 * @param {sap.ui.core.Control} aControls The Controls to be rendered
+	 * @param {sap.ui.core.Control[]} aControls The Controls to be rendered
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the Render-Output-Buffer
 	 * @param {sap.m.Bar} oBar An object representation of the control that should be rendered
 	 */
@@ -155,7 +155,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 	/**
 	 * Determines which tag or context class the Bar should have.
 	 * @protected
-	 * @param {sap.m.BarBase} oControl The Bar control
+	 * @param {sap.m.Bar} oControl The Bar control
 	 * @returns {string} The context class
 	 */
 	BarRenderer.getContext = function(oControl) {
@@ -169,7 +169,7 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 	 * Adds width style to 100% in case of the given content container is the only container with content amongst the three (left, middle, right)
 	 * @param {string} sArea The content container - one of the left, middle or right
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the Render-Output-Buffer.
-	 * @param {sap.ui.core.Control} oControl the Bar instance
+	 * @param {sap.m.Bar} oControl the Bar instance
 	 * @private
 	 */
 	function writeWidthIfContentOccupiesWholeArea(sArea, oRm, oControl) {

package/src/sap/m/Breadcrumbs.js

@@ -42,7 +42,10 @@ sap.ui.define([
 	var SelectType = library.SelectType,
 
 		// shortcut for sap.m.BreadCrumbsSeparatorStyle
-		SeparatorStyle = library.BreadcrumbsSeparatorStyle;
+		SeparatorStyle = library.BreadcrumbsSeparatorStyle,
+
+		// shortcut for texts resource bundle
+		oResource = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
 	 * Constructor for a new <code>Breadcrumbs</code>.
@@ -60,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -135,10 +138,15 @@ sap.ui.define([
 		DoubleGreaterThan: ">>"
 	};
 
+	Breadcrumbs._getResourceBundleText = function (sText, vOptions) {
+		return oResource.getText(sText, vOptions);
+	};
+
 	/*************************************** Framework lifecycle events ******************************************/
 
 	Breadcrumbs.prototype.init = function () {
 		this._sSeparatorSymbol = Breadcrumbs.STYLE_MAPPER[this.getSeparatorStyle()];
+		this._aCachedInvisibleTexts = [];
 		this._getInvisibleText();
 	};
 
@@ -153,6 +161,9 @@ sap.ui.define([
 		if (this._bControlsInfoCached) {
 			this._updateSelect(true);
 		}
+
+		this._destroyInvisibleTexts();
+		this._aCachedInvisibleTexts = this._buildInvisibleTexts();
 	};
 
 	Breadcrumbs.prototype.onAfterRendering = function () {
@@ -177,6 +188,7 @@ sap.ui.define([
 	Breadcrumbs.prototype.exit = function () {
 		this._resetControl();
 		this._destroyItemNavigation();
+		this._destroyInvisibleTexts();
 
 		if (this._oInvisibleText) {
 			this._oInvisibleText.destroy();
@@ -196,7 +208,7 @@ sap.ui.define([
 
 
 	Breadcrumbs.prototype._getInvisibleText = function() {
-		var oAriaLabelText = BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_LABEL");
+		var oAriaLabelText = Breadcrumbs._getResourceBundleText("BREADCRUMB_LABEL");
 
 		if (!this._oInvisibleText) {
 			this._oInvisibleText = new InvisibleText({ id: this.getId() + "-InvisibleText"});
@@ -215,7 +227,7 @@ sap.ui.define([
 				autoAdjustWidth: true,
 				icon: IconPool.getIconURI("slim-arrow-down"),
 				type: SelectType.IconOnly,
-				tooltip: BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
+				tooltip: Breadcrumbs._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
 			})), true);
 		}
 		return this.getAggregation("_select");
@@ -231,9 +243,8 @@ sap.ui.define([
 
 			oCurrentLocation.addEventDelegate({
 				onAfterRendering: function () {
-					oCurrentLocation.$().attr("aria-current", "page");
-					oCurrentLocation.$().attr("tabindex", 0);
-				}
+					this._setCurrentLocationAccInfo(oCurrentLocation);
+				}.bind(this)
 			});
 
 			this.setAggregation("_currentLocation", oCurrentLocation).addStyleClass("sapMBreadcrumbsCurrentLocation");
@@ -241,6 +252,16 @@ sap.ui.define([
 		return this.getAggregation("_currentLocation");
 	};
 
+	Breadcrumbs.prototype._setCurrentLocationAccInfo = function (oCurrentLocation) {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(),
+			positionText = Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [aVisibleItems.length, aVisibleItems.length]);
+
+		oCurrentLocation.$().attr("aria-current", "page");
+		oCurrentLocation.$().attr("tabindex", 0);
+		oCurrentLocation.$().attr("role", "link");
+		oCurrentLocation.$().attr("aria-label", this.getCurrentLocationText() + " " + positionText);
+	};
+
 	function fnConvertArguments(sAggregationName, aArguments) {
 		var aConvertedArguments = Array.prototype.slice.apply(aArguments);
 		aConvertedArguments.unshift(sAggregationName);
@@ -284,6 +305,22 @@ sap.ui.define([
 		return vResult;
 	};
 
+	Breadcrumbs.prototype._destroyInvisibleTexts = function () {
+		var oControl;
+		this._aCachedInvisibleTexts.forEach(function (oData) {
+			oControl = sap.ui.getCore().byId(oData.controlId);
+
+			// remove reference to the invisible text on the sap.m.Link control
+			// check for control existence as it might have been destroyed already
+			if (oControl && oControl.removeAriaLabelledBy) {
+				oControl.removeAriaLabelledBy(oData.invisibleText.getId());
+			}
+
+			oData.invisibleText.destroy();
+		});
+		this._aCachedInvisibleTexts = [];
+	};
+
 	/*************************************** Select Handling ******************************************/
 
 	Breadcrumbs.prototype._decorateSelect = function (oSelect) {
@@ -447,6 +484,43 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Creates InvisibleText instances for the Link controls in the Breadcrumbs.
+	 * Used to add the position and the size of the controls to their ariaLabelledBy association.
+	 * An array of objects is returned for the instances to be destroyed on next invalidation with the following properties:
+	 * - controlId: the id of the Link to later remove the InvisibleText instance id from the ariaLabelledBy association
+	 * - invisibleText: the InvisibleText control itself to be destroyed
+	 */
+	Breadcrumbs.prototype._buildInvisibleTexts = function() {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(), // all visible links outside the drop-down, including current location
+			iItemCount = aVisibleItems.length,
+			oInvisibleText,
+			oInvisibleTexts = [];
+
+		aVisibleItems.forEach(function(oItem, iIndex) {
+			if (!oItem.isA("sap.m.Link")) {
+				// only links are relevant for the ariaLabelledBy association
+				return;
+			}
+
+			oInvisibleText = new InvisibleText({
+				text: Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [iIndex + 1, iItemCount])
+			}).toStatic();
+
+			if (oItem.getAriaLabelledBy().indexOf(oItem.getId()) === -1) {
+				oItem.addAriaLabelledBy(oItem.getId());
+			}
+
+			oItem.addAriaLabelledBy(oInvisibleText.getId());
+			oInvisibleTexts.push({
+				controlId: oItem.getId(),
+				invisibleText: oInvisibleText
+			});
+		});
+
+		return oInvisibleTexts;
+	};
+
 	Breadcrumbs.prototype._getControlDistribution = function (iMaxContentSize) {
 		iMaxContentSize = iMaxContentSize || this._iContainerSize;
 		this._iContainerSize = iMaxContentSize;