@openui5/sap.m 1.94.0 → 1.97.0

package/src/sap/m/Dialog.js

@@ -79,6 +79,9 @@ function(
 		// shortcut for sap.ui.core.ValueState
 		var ValueState = coreLibrary.ValueState;
 
+		// shortcut for sap.ui.core.TitleLevel
+		var TitleLevel = coreLibrary.TitleLevel;
+
 		// shortcut for sap.m.TitleAlignment
 		var TitleAlignment = library.TitleAlignment;
 
@@ -172,7 +175,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.94.0
+		* @version 1.97.0
 		*
 		* @constructor
 		* @public
@@ -222,7 +225,7 @@ function(
 					 * Determines whether the Dialog will be displayed on full screen on a phone.
 					 * @since 1.11.2
 					 * @deprecated Since version 1.13.1.
-					 * Please use the new stretch property instead. This enables a stretched Dialog even on tablet and desktop. If you want to achieve the same effect as <code>stretchOnPhone</code>, please set the stretch with jQuery.device.is.phone, then the Dialog is only stretched when it runs on a phone.
+					 * Please use the new stretch property instead. This enables a stretched Dialog even on tablet and desktop. If you want to achieve the same effect as <code>stretchOnPhone</code>, please set the stretch with <code>Device.system.phone</code>, then the Dialog is only stretched when it runs on a phone.
 					 */
 					stretchOnPhone: {type: "boolean", group: "Appearance", defaultValue: false, deprecated: true},
 
@@ -513,7 +516,7 @@ function(
 		};
 
 		Dialog.prototype.onBeforeRendering = function () {
-			var oHeader = this.getCustomHeader() || this._header;
+			var oHeader = this._getAnyHeader();
 
 			if (!Dialog._bPaddingByDefault && this.hasStyleClass("sapUiPopupWithPadding")) {
 				Log.warning("Usage of CSS class 'sapUiPopupWithPadding' is deprecated. Use 'sapUiContentPadding' instead", null, "sap.m.Dialog");
@@ -551,6 +554,11 @@ function(
 			if (oHeader && oHeader.setTitleAlignment) {
 				oHeader.setProperty("titleAlignment", this.getTitleAlignment(), true);
 			}
+
+			if (oHeader && this._getTitles(oHeader).length === 0) {
+				oHeader._setRootAccessibilityRole("heading");
+				oHeader._setRootAriaLevel("2");
+			}
 		};
 
 		Dialog.prototype.onAfterRendering = function () {
@@ -1289,8 +1297,6 @@ function(
 				this._header = new Bar(this.getId() + "-header", {
 					titleAlignment: this.getTitleAlignment()
 				});
-				this._header._setRootAccessibilityRole("heading");
-				this._header._setRootAriaLevel("2");
 
 				this.setAggregation("_header", this._header);
 			}
@@ -1307,7 +1313,7 @@ function(
 			} else {
 				this._headerTitle = new Title(this.getId() + "-title", {
 					text: sTitle,
-					level: "H2"
+					level: TitleLevel.H2
 				}).addStyleClass("sapMDialogTitle");
 
 				this._header.addContentMiddle(this._headerTitle);
@@ -1502,8 +1508,7 @@ function(
 			var oCustomHeader = this.getCustomHeader();
 
 			if (oCustomHeader) {
-				oCustomHeader._setRootAriaLevel("2");
-				return oCustomHeader._setRootAccessibilityRole("heading");
+				return oCustomHeader;
 			} else {
 				var bShowHeader = this.getShowHeader();
 				// if showHeader is set to false and not for standard dialog in iOS in theme sap_mvi, no header.
@@ -1783,9 +1788,7 @@ function(
 
 			var oSubHeader = this.getSubHeader();
 			if (oSubHeader) {
-				var aSubtitles = oSubHeader.findAggregatedObjects(true, function(oObject) {
-					return oObject.isA("sap.m.Title");
-				});
+				var aSubtitles = this._getTitles(oSubHeader);
 
 				// if there are titles in the subheader, add all of them to labels, else use the full subheader
 				if (aSubtitles.length) {
@@ -1796,9 +1799,7 @@ function(
 			}
 
 			if (oHeader) {
-				var aTitles = oHeader.findAggregatedObjects(true, function(oObject) {
-					return oObject.isA("sap.m.Title");
-				});
+				var aTitles = this._getTitles(oHeader);
 
 				// if there are titles in the header, add all of them to labels, else use the full header
 				if (aTitles.length) {
@@ -1933,16 +1934,11 @@ function(
 				var oBoundingClientRect = this.getDomRef().getBoundingClientRect();
 
 				var initial = {
-					x: e.pageX,
-					y: e.pageY,
+					x: e.clientX,
+					y: e.clientY,
 					width: that._$dialog.width(),
 					height: that._$dialog.height(),
 					outerHeight : that._$dialog.outerHeight(),
-					offset: {
-						//use e.originalEvent.layerX/Y for Firefox
-						x: e.offsetX ? e.offsetX : e.originalEvent.layerX,
-						y: e.offsetY ? e.offsetY : e.originalEvent.layerY
-					},
 					position: {
 						x: oBoundingClientRect.x,
 						y: oBoundingClientRect.y
@@ -1971,22 +1967,9 @@ function(
 					}
 				}
 
-				if ((isHeaderClicked(e.target) && this.getDraggable()) || bResize) {
+				if (isHeaderClicked(e.target) && this.getDraggable() || bResize) {
 					that._bDisableRepositioning = true;
-
 					that._$dialog.addClass('sapDialogDisableTransition');
-
-					that._oManuallySetPosition = {
-						x: initial.position.x,
-						y: initial.position.y
-					};
-
-					//set the new position of the dialog on mouse down when the transform is disabled by the class
-					that._$dialog.css({
-						left: Math.min(Math.max(oAreaDimensions.left, that._oManuallySetPosition.x), oAreaDimensions.right - initial.width),
-						top: Math.min(Math.max(oAreaDimensions.top, that._oManuallySetPosition.y), oAreaDimensions.bottom - initial.height),
-						width: initial.width
-					});
 				}
 
 				if (isHeaderClicked(e.target) && this.getDraggable()) {
@@ -2003,8 +1986,8 @@ function(
 							that._bDisableRepositioning = true;
 
 							that._oManuallySetPosition = {
-								x: Math.max(oAreaDimensions.left, Math.min(event.pageX - e.pageX + initial.position.x, oAreaDimensions.right - initial.width)), // deltaX + initial dialog position
-								y: Math.max(oAreaDimensions.top, Math.min(event.pageY - e.pageY + initial.position.y, oAreaDimensions.bottom - initial.outerHeight)) // deltaY + initial dialog position
+								x: Math.max(oAreaDimensions.left, Math.min(event.clientX - e.clientX + initial.position.x, oAreaDimensions.right - initial.width)), // deltaX + initial dialog position
+								y: Math.max(oAreaDimensions.top, Math.min(event.clientY - e.clientY + initial.position.y, oAreaDimensions.bottom - initial.outerHeight)) // deltaY + initial dialog position
 							};
 
 							//move the dialog
@@ -2015,8 +1998,6 @@ function(
 							});
 						});
 					};
-
-					$w.on("mousemove", mouseMoveHandler);
 				} else if (bResize) {
 					that._$dialog.addClass('sapMDialogResizing');
 
@@ -2033,22 +2014,22 @@ function(
 							// BCP: 1680048166 remove inline set height and width so that the content resizes together with the mouse pointer
 							that.$('cont').height('').width('');
 
-							if (event.pageY + handleOffsetY > oAreaDimensions.bottom) {
-								event.pageY = oAreaDimensions.bottom - handleOffsetY;
+							if (event.clientY + handleOffsetY > oAreaDimensions.bottom) {
+								event.clientY = oAreaDimensions.bottom - handleOffsetY;
 							}
 
-							if (event.pageX + handleOffsetX > oAreaDimensions.right) {
-								event.pageX = oAreaDimensions.right - handleOffsetX;
+							if (event.clientX + handleOffsetX > oAreaDimensions.right) {
+								event.clientX = oAreaDimensions.right - handleOffsetX;
 							}
 
 							that._oManuallySetSize = {
-								width: initial.width + event.pageX - initial.x,
-								height: initial.height + event.pageY - initial.y
+								width: initial.width + event.clientX - initial.x,
+								height: initial.height + event.clientY - initial.y
 							};
 
 							if (that._bRTL) {
-								styles.left = Math.min(Math.max(event.pageX, 0), maxLeftOffset);
-								that._oManuallySetSize.width = initial.width + initial.x - Math.max(event.pageX, 0);
+								styles.left = Math.min(Math.max(event.clientX, 0), maxLeftOffset);
+								that._oManuallySetSize.width = initial.width + initial.x - Math.max(event.clientX, 0);
 							}
 
 							styles.width = that._oManuallySetSize.width;
@@ -2057,12 +2038,11 @@ function(
 							that._$dialog.css(styles);
 						});
 					};
-
-					$w.on("mousemove", mouseMoveHandler);
 				} else {
 					return;
 				}
 
+				$w.on("mousemove", mouseMoveHandler);
 				$w.on("mouseup", mouseUpHandler);
 
 				e.stopPropagation();
@@ -2077,5 +2057,11 @@ function(
 			Control.prototype._applyContextualSettings.call(this);
 		};
 
+		Dialog.prototype._getTitles = function (oContainer) {
+			return oContainer.findAggregatedObjects(true, function(oObject) {
+				return oObject.isA("sap.m.Title");
+			});
+		};
+
 		return Dialog;
 	});

package/src/sap/m/DialogRenderer.js

@@ -178,7 +178,7 @@ sap.ui.define([
 				.close("header");
 		}
 
-		if (oSubHeader) {
+		if (oSubHeader && oSubHeader.getVisible()) {
 			oSubHeader._applyContextClassFor("subheader");
 			oRM.openStart("header")
 				.class("sapMDialogSubHeader")

package/src/sap/m/DisplayListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DraftIndicator.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateFormat.js

@@ -10,13 +10,13 @@ sap.ui.define([
 	'sap/ui/core/format/NumberFormat',
 	'sap/ui/core/Locale',
 	'sap/ui/core/LocaleData',
-	'./StandardDynamicDateRangeKeys',
 	"sap/base/Log",
 	"sap/base/util/deepExtend",
 	"sap/base/util/isEmptyObject",
-	"sap/ui/core/date/UniversalDateUtils"
+	"sap/ui/core/date/UniversalDateUtils",
+	"./library"
 ],
-	function(DateFormat, NumberFormat, Locale, LocaleData, StandardDynamicDateRangeKeys, Log, deepExtend, isEmptyObject, UniversalDateUtils) {
+	function(DateFormat, NumberFormat, Locale, LocaleData, Log, deepExtend, isEmptyObject, UniversalDateUtils, library) {
 		"use strict";
 
 		/**
@@ -58,8 +58,8 @@ sap.ui.define([
 			"TODAYFROMTO": ["int", "int"]
 		};
 
-		for (var i = 0; i < StandardDynamicDateRangeKeys.length; i++) {
-			var sKey = StandardDynamicDateRangeKeys[i];
+		for (var i = 0; i < library.StandardDynamicDateRangeKeys.length; i++) {
+			var sKey = library.StandardDynamicDateRangeKeys[i];
 			var sPattern = _resourceBundle.getText("DYNAMIC_DATE_" + sKey.toUpperCase() + "_FORMAT");
 			var aStaticParts = sPattern.split('{').map(function(sPart) {
 				var iClosingBracket = sPart.indexOf('}');

package/src/sap/m/DynamicDateOption.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -231,7 +231,8 @@ sap.ui.define([
 		 * @public
 		 */
 		DynamicDateOption.prototype.getGroupHeader = function() {
-			return sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("DDR_OPTIONS_GROUP_0");
+			var iGroup = (this.getGroup() > -1 && this.getGroup() < 7) ? this.getGroup() : 0;
+			return sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("DDR_OPTIONS_GROUP_" + iGroup);
 		};
 
 		/**

package/src/sap/m/DynamicDateRange.js

@@ -34,7 +34,6 @@ sap.ui.define([
 	'./NavContainer',
 	'./DynamicDateRangeRenderer',
 	'./StandardDynamicDateOption',
-	'./StandardDynamicDateRangeKeys',
 	'sap/ui/dom/jquery/Focusable',
 	'./library'],
 	function(
@@ -66,7 +65,6 @@ sap.ui.define([
 		NavContainer,
 		DynamicDateRangeRenderer,
 		StandardDynamicDateOption,
-		StandardDynamicDateRangeKeys,
 		Focusable,
 		library
 	) {
@@ -118,7 +116,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public
@@ -258,7 +256,8 @@ sap.ui.define([
 						}
 					}
 				}
-			}
+			},
+			renderer: DynamicDateRangeRenderer
 		});
 
 		MessageMixin.call(DynamicDateRange.prototype);
@@ -402,6 +401,10 @@ sap.ui.define([
 			this.setOptions(aOptions);
 		};
 
+		DynamicDateRange.prototype.getFocusDomRef = function(){
+			return this.getAggregation("_input") && this.getAggregation("_input").getFocusDomRef();
+		};
+
 		DynamicDateRange.prototype._updateInputValue = function(oValue) {
 			var sInputValue;
 
@@ -612,7 +615,6 @@ sap.ui.define([
 				this._oPopup.attachAfterClose(function() {
 					this._setFooterVisibility(false);
 					this.invalidate();
-					this.getAggregation("_input").focus();
 				}, this);
 
 				this._oPopup.setBeginButton(new Button({
@@ -650,7 +652,7 @@ sap.ui.define([
 					return iGroupDiff;
 				}
 
-				return StandardDynamicDateRangeKeys.indexOf(a.getKey()) - StandardDynamicDateRangeKeys.indexOf(b.getKey());
+				return library.StandardDynamicDateRangeKeys.indexOf(a.getKey()) - library.StandardDynamicDateRangeKeys.indexOf(b.getKey());
 			});
 
 			// for last x/next x options leave only the first of each, remove the rest
@@ -910,8 +912,18 @@ sap.ui.define([
 			}
 
 			oElementToFocus.focus();
+
+			this._reApplyFocusToElement(oToPage, oValue);
 		};
 
+		/**
+		 * A hook that provides an option to reapply the focus to another element if needed.
+		 *
+		 * @ui5-restricted sap.ui.comp.config.condition.DateRangeType
+		 * @private
+		 */
+		DynamicDateRange.prototype._reApplyFocusToElement = function (oToPage, oValue) {};
+
 		/**
 		 * Creates the title text for the options page.
 		 *
@@ -953,7 +965,7 @@ sap.ui.define([
 				// There is a custom initial focus handling logic for both options list page and option details page
 				this._applyNavContainerPageFocus(oToPage);
 			} else {
-				this.getAggregation("_input").focus();
+				this.focus();
 			}
 		};
 
@@ -1033,7 +1045,7 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype._parseValue = function(sInputValue) {
-			var aResults = DynamicDateUtil.parse(sInputValue, this._getFormatter()).filter(function(oResult) {
+			var aResults = DynamicDateUtil.parse(sInputValue, this._getFormatter(), this.getOptions()).filter(function(oResult) {
 				return this.getOptions().indexOf(oResult.operator) !== -1;
 			}, this);
 

package/src/sap/m/DynamicDateUtil.js

@@ -7,14 +7,15 @@
 // Provides utility class sap.m.DynamicDateUtil
 sap.ui.define([
 	"./StandardDynamicDateOption",
-	"./StandardDynamicDateRangeKeys",
-	"sap/base/Log"
+	"sap/base/Log",
+	"./library"
 ], function(
-	StandardDynamicDateOption, StandardDynamicDateRangeKeys, Log) {
+	StandardDynamicDateOption, Log, library) {
 	"use strict";
 
 	/**
-	 * A utility class for working with the DynamicDateOption instances.
+	 * @class
+	 * The DynamicDateUtil is a utility class for working with the DynamicDateOption instances.
 	 *
 	 * @alias sap.m.DynamicDateUtil
 	 * @static
@@ -51,6 +52,7 @@ sap.ui.define([
 			"FROM": new StandardDynamicDateOption({ key: "FROM", valueTypes: ["date"] }),
 			"TO": new StandardDynamicDateOption({ key: "TO", valueTypes: ["date"] }),
 			"YEARTODATE": new StandardDynamicDateOption({ key: "YEARTODATE", valueTypes: [] }),
+			"DATETOYEAR": new StandardDynamicDateOption({ key: "DATETOYEAR", valueTypes: [] }),
 			"TODAYFROMTO": new StandardDynamicDateOption({ key: "TODAYFROMTO", valueTypes: ["int", "int"] }),
 			"QUARTER1": new StandardDynamicDateOption({ key: "QUARTER1", valueTypes: [] }),
 			"QUARTER2": new StandardDynamicDateOption({ key: "QUARTER2", valueTypes: [] }),
@@ -60,7 +62,7 @@ sap.ui.define([
 			"DATERANGE": new StandardDynamicDateOption({ key: "DATERANGE", valueTypes: ["date", "date"] }),
 			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] })
 		},
-		_allKeys: StandardDynamicDateRangeKeys.slice(0)
+		_allKeys: library.StandardDynamicDateRangeKeys.slice(0)
 	};
 
 	/**
@@ -113,11 +115,12 @@ sap.ui.define([
 	 *
 	 * @param {string} sValue The string to be parsed
 	 * @param {sap.m.DynamicDateFormat} oFormatter A dynamic date formatter
+	 * @param {array} aOptionKeys array of option names
 	 * @returns {object[]} An array of value objects in the DynamicDateRange's value format
 	 * @static
 	 * @public
 	 */
-	DynamicDateUtil.parse = function(sValue, oFormatter) {
+	DynamicDateUtil.parse = function(sValue, oFormatter, aOptionKeys) {
 		if (typeof sValue !== 'string') {
 			Log.error("DynamicDateFormat can only parse a String.");
 			return [];
@@ -126,14 +129,16 @@ sap.ui.define([
 		var aResults = [],
 			oResult;
 
-		var aOptions = Object.keys(DynamicDateUtil._options).sort(function(sKey1, sKey2) {
-			return StandardDynamicDateRangeKeys.indexOf(sKey1) - StandardDynamicDateRangeKeys.indexOf(sKey2);
+		aOptionKeys = aOptionKeys || Object.keys(DynamicDateUtil._options);
+
+		var aOptions = aOptionKeys.sort(function(sKey1, sKey2) {
+			return library.StandardDynamicDateRangeKeys.indexOf(sKey1) - library.StandardDynamicDateRangeKeys.indexOf(sKey2);
 		}).map(function(sKey) {
 			return DynamicDateUtil._options[sKey];
 		});
 
 		for (var i = 0; i < aOptions.length; i++) {
-			oResult = aOptions[i].parse(sValue.trim(), oFormatter);
+			oResult = aOptions[i] && aOptions[i].parse(sValue.trim(), oFormatter);
 
 			if (oResult) {
 				oResult.operator = aOptions[i].getKey();

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/ExpandableText.js

@@ -100,7 +100,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/FeedInput.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItem.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItemAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Element"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Fiori20Adapter.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @class text
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @private
 	 * @since 1.38
 	 * @alias HeaderAdapter
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.Fiori20Adapter.
 	 *
 	 * @class text
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @private
 	 * @since 1.38
 	 * @alias sap.m.Fiori20Adapter

package/src/sap/m/FlexBox.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @alias sap.m.FlexBox

package/src/sap/m/FlexItemData.js

@@ -24,7 +24,7 @@ sap.ui.define(["./FlexBoxStylingHelper", "./library", "sap/ui/core/LayoutData"],
 	 * @class
 	 * Holds layout data for a FlexBox / HBox / VBox.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FormattedText.js

@@ -42,7 +42,7 @@ function(
 		 * @class
 		 * The FormattedText control allows the usage of a limited set of tags for inline display of formatted text in HTML format.
 		 * @extends sap.ui.core.Control
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/GenericTag.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -91,6 +91,13 @@ sap.ui.define([
 				valueState: {type : "sap.m.GenericTagValueState", defaultValue : GenericTagValueState.None }
 			},
 			defaultAggregation: "value",
+			associations : {
+				/**
+				 * Association to controls / ids which label this control (see WAI-ARIA attribute aria-labelledBy).
+	 			 * @since 1.97.0
+				 */
+				ariaLabelledBy: {type : "sap.ui.core.Control", multiple : true, singularName : "ariaLabelledBy"}
+			},
 			aggregations: {
 				/**
 				 * Numeric value rendered by the control.

package/src/sap/m/GenericTagRenderer.js

@@ -107,7 +107,7 @@ sap.ui.define([
 	};
 
 	GenericTagRenderer._getAriaLabelledBy = function(oControl) {
-		var aLabelledBy = [],
+		var aLabelledBy = oControl.getAriaLabelledBy().slice(),
 			sId = oControl.getId(),
 			sTagValueId = this._getTagValueId(oControl);