@openui5/sap.m 1.96.5 → 1.99.0

package/src/sap/m/StandardListItemRenderer.js

@@ -25,7 +25,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	 * {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 */
 	StandardListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		var sIconURI = oLI.getIcon(),
@@ -57,7 +57,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the list item content element.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @protected
 	 */
 	StandardListItemRenderer.renderLIContent = function(rm, oLI) {
@@ -67,8 +67,10 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 			bAdaptTitleSize = oLI.getAdaptTitleSize(),
 			bShouldRenderInfoWithoutTitle = !sTitle && sInfo;
 
-		// render image
-		if (oLI.getIcon()) {
+		// render image or avatar control
+		if (oLI.getAvatar()) {
+			rm.renderControl(oLI._getAvatar());
+		} else if (oLI.getIcon()) {
 			rm.renderControl(oLI._getImage());
 		}
 
@@ -97,7 +99,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the title wrapper.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @protected
 	 */
 	StandardListItemRenderer.renderTitleWrapper = function(rm, oLI) {
@@ -141,7 +143,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the title text.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @protected
 	 */
 	StandardListItemRenderer.renderTitle = function(rm, oLI) {
@@ -151,7 +153,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the description text.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @protected
 	 */
 	StandardListItemRenderer.renderDescription = function (rm, oLI) {
@@ -195,7 +197,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the info text.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @protected
 	 */
 	StandardListItemRenderer.renderInfo = function (rm, oLI) {
@@ -229,7 +231,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the expand/collapse text.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @param {string} sWrapArea Defines the wrapping text area
 	 * @protected
 	 */
@@ -253,7 +255,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	/**
 	 * Renders the wrapping behavior of the text.
 	 * @param {sap.ui.core.RenderManager} rm The <code>RenderManager</code> that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oLI An object representation of the control that is rendered
+	 * @param {sap.m.StandardListItem} oLI An object representation of the control that is rendered
 	 * @param {string} sWrapArea Defines the wrapping text area
 	 * @protected
 	 */

package/src/sap/m/StandardTile.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.m.Tile
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTileRenderer.js

@@ -26,7 +26,7 @@ sap.ui.define(['./TileRenderer', 'sap/ui/core/ValueStateSupport', 'sap/ui/core/R
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oTile An object representation of the control that should be rendered
+	 * @param {sap.m.StandardTile} oTile An object representation of the control that should be rendered
 	 */
 	StandardTileRenderer._renderContent = function(rm, oTile) {
 		var infoState = oTile.getInfoState();

package/src/sap/m/StandardTreeItem.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.TreeItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StepInput.js

@@ -119,7 +119,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SuggestionItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @since 1.34
 	 *
 	 * @constructor

package/src/sap/m/SuggestionsPopover.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @alias sap.m.SuggestionsPopover
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 */
 	var SuggestionsPopover = EventProvider.extend("sap.m.SuggestionsPopover", /** @lends sap.m.SuggestionsPopover.prototype */ {
 
@@ -158,7 +158,7 @@ sap.ui.define([
 	/**
 	 * Helper function that creates  (List/Table) for the suggestion popup.
 	 *
-	 * @param {string} sParent The input control that instantiates this suggestions popover
+	 * @param {string} sParentId The input control that instantiates this suggestions popover
 	 * @param {sap.ui.core.Control} oContent Typically a List or a Table which would be Popover's content
 	 * @public
 	 */
@@ -298,7 +298,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsapdown</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handleArrowDown = function(aSelectableItems, iSelectedItemIndex, bFocusInInput, bHasValueStateHeader) {
 		// if the focus is on the input and there is no VSH available, return the first selectable item
@@ -329,7 +328,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsapup</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handleArrowUp = function(aSelectableItems, iSelectedItemIndex, bFocusInInput, bHasValueStateHeader) {
 		// if the focus is on the input field, do nothing
@@ -354,7 +352,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsapend</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handleEnd = function(aSelectableItems, bHasValueStateHeader) {
 		// if the focus is on the VSH, we should remove the active state
@@ -369,7 +366,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsaphome</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handleHome = function(aSelectableItems, bHasValueStateHeader) {
 		// if a VSH is present, Home key should move the focus to it
@@ -386,7 +382,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsappagedown</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handlePageDown = function(aSelectableItems, iSelectedItemIndex, bHasValueStateHeader) {
 		// if the focus is on the VSH, we should remove the active state
@@ -401,7 +396,6 @@ sap.ui.define([
 	 * Handles the list navigation on <code>onsappageup</code>.
 	 *
 	 * @private
-	 * @param {jQuery.Event} oEvent Arrow key event.
 	 */
 	SuggestionsPopover.prototype.handlePageUp = function(aSelectableItems, iSelectedItemIndex, bHasValueStateHeader) {
 		// if there is an item one page up, return the item
@@ -497,7 +491,6 @@ sap.ui.define([
 	 * Handles the navigation inside the list.
 	 *
 	 * @private
-	 * @param {sap.ui.core.Control} oParent The input control that instantiates this suggestions popover
 	 * @param {sap.m.GroupHeaderListItem | sap.m.StandardListItem | sap.m.ColumnListItem} oItem The item to be selected.
 	 */
 	SuggestionsPopover.prototype.handleSelectionFromList = function(oItem) {

package/src/sap/m/Switch.js

@@ -48,7 +48,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -208,11 +208,24 @@ function(
 			return sText;
 		};
 
+		var mParams = Object.assign({
+			// add base styles as default
+			"_sap_m_Switch_OnPosition": -32,
+			"_sap_m_Switch_OffPosition": 0
+		}, Parameters.get({
+			name: ["_sap_m_Switch_OnPosition", "_sap_m_Switch_OffPosition"],
+			callback: function (_mParams) {
+				Switch._ONPOSITION = Number(_mParams["_sap_m_Switch_OnPosition"]);
+				Switch._OFFPOSITION = Number(_mParams["_sap_m_Switch_OffPosition"]);
+				Switch._SWAPPOINT = Math.abs((Switch._ONPOSITION - Switch._OFFPOSITION) / 2);
+			}
+		}));
+
 		// the position of the inner HTML element whether the switch is "ON"
-		Switch._ONPOSITION = Number(Parameters.get("_sap_m_Switch_OnPosition"));
+		Switch._ONPOSITION = Number(mParams["_sap_m_Switch_OnPosition"]);
 
 		// the position of the inner HTML element whether the switch is "OFF"
-		Switch._OFFPOSITION = Number(Parameters.get("_sap_m_Switch_OffPosition"));
+		Switch._OFFPOSITION = Number(mParams["_sap_m_Switch_OffPosition"]);
 
 		// swap point
 		Switch._SWAPPOINT = Math.abs((Switch._ONPOSITION - Switch._OFFPOSITION) / 2);

package/src/sap/m/SwitchRenderer.js

@@ -29,7 +29,7 @@ sap.ui.define(["sap/ui/Device", "sap/m/library"], function(Device, library) {
 		 * 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} oSwitch An object representation of the control that should be rendered.
+		 * @param {sap.m.Switch} oSwitch An object representation of the control that should be rendered.
 		 */
 		SwitchRenderer.render = function(oRm, oSwitch) {
 			var bState = oSwitch.getState(),
@@ -183,7 +183,7 @@ sap.ui.define(["sap/ui/Device", "sap/m/library"], function(Device, library) {
 		 * To be overwritten by subclasses.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-		 * @param {sap.ui.core.Control} oSwitch An object representation of the control that should be rendered.
+		 * @param {sap.m.Switch} oSwitch An object representation of the control that should be rendered.
 		 */
 		SwitchRenderer.writeAccessibilityState = function(oRm, oSwitch) {
 			var mAriaLabelledby = oSwitch.getAriaLabelledBy(),
@@ -212,7 +212,7 @@ sap.ui.define(["sap/ui/Device", "sap/m/library"], function(Device, library) {
 		 * To be overwritten by subclasses.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-		 * @param {sap.ui.core.Control} oSwitch An object representation of the control that should be rendered.
+		 * @param {sap.m.Switch} oSwitch An object representation of the control that should be rendered.
 		 * @param {object} mOptions
 		 */
 		SwitchRenderer.renderInvisibleElement = function(oRm, oSwitch, mOptions) {

package/src/sap/m/TabContainer.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TabContainerItem.js

@@ -12,6 +12,9 @@ sap.ui.define(['sap/ui/core/Element',
 	function(Element, IconPool, TabStripItem, library) {
 		"use strict";
 
+		// shortcut for sap.m.ImageHelper
+		var ImageHelper = library.ImageHelper;
+
 		/**
 		 * Constructor for a new <code>TabContainerItem</code>.
 		 *
@@ -23,7 +26,7 @@ sap.ui.define(['sap/ui/core/Element',
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -141,15 +144,40 @@ sap.ui.define(['sap/ui/core/Element',
 		 * @return {this} <code>this</code> to allow method chaining
 		 * @public
 		 */
-		TabContainerItem.prototype.setIcon = function(sIcon) {
-			return TabStripItem.prototype._setIcon.call(this, sIcon, true);
+		TabContainerItem.prototype.setIcon = function(sIcon, bSuppressRendering) {
+			var mProperties,
+				aCssClasses = ['sapMTabContIcon'],
+				oImage = this.getAggregation("_image"),
+				sImgId = this.getId() + "-img",
+				bDecorative = !!(this.getName() || this.getAdditionalText());
+
+			if (!sIcon) {
+				this.setProperty("icon", sIcon, bSuppressRendering);
+				if (oImage) {
+					this.destroyAggregation("_image");
+				}
+				return this;
+			}
+
+			if (this.getIcon() !== sIcon) {
+				this.setProperty("icon", sIcon, bSuppressRendering);
+
+				mProperties = {
+					src : sIcon,
+					id: sImgId,
+					decorative: bDecorative,
+					tooltip: this.getIconTooltip()
+				};
+
+				oImage = ImageHelper.getImageControl(sImgId, oImage, undefined, mProperties, aCssClasses);
+				this.setAggregation("_image", oImage, bSuppressRendering);
+			}
+			return this;
 		};
 
 		/**
 		 * Function is called when image control needs to be loaded.
 		 *
-		 * @param {string} sImgId - id to be used for the image
-		 * @param {sap.ui.core.URI} sSrc - URI indicating the image to use as image source
 		 * @return {sap.ui.core.Control} The image
 		 * @private
 		 */

package/src/sap/m/TabContainerRenderer.js

@@ -20,7 +20,7 @@ sap.ui.define([],
 		 * 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.TabContainer} oControl An object representation of the control that should be rendered
 		 */
 		TabContainerRenderer.render = function(oRm, oControl) {
 			var oTabStrip = oControl._getTabStrip(),
@@ -90,7 +90,7 @@ sap.ui.define([],
 		/**
 		 * Returns the DOM ID of the content element.
 		 *
-		 * @param {sap.ui.core.Control} oControl The <code>TabContainer</code> for which the DOM ID is looking for
+		 * @param {sap.m.TabContainer} oControl The <code>TabContainer</code> for which the DOM ID is looking for
 		 * @returns {string} The ID of the DOM element, corresponding to the tab content
 		 */
 		TabContainerRenderer.getContentDomId = function(oControl) {

package/src/sap/m/TabStrip.js

@@ -73,7 +73,7 @@ function(
 		 * space is exceeded, a horizontal scrollbar appears.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/TabStripItem.js

@@ -25,7 +25,7 @@ sap.ui.define(["./library", "sap/ui/core/Item", "sap/ui/base/ManagedObject", "sa
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private
@@ -234,6 +234,12 @@ sap.ui.define(["./library", "sap/ui/core/Item", "sap/ui/base/ManagedObject", "sa
 			}
 			ManagedObject.prototype.setProperty.call(this, sName, vValue, bSupressInvalidation);
 
+			if ((sName === "text" && this.getAdditionalText() !== "" && this.getAggregation("_image")) ||
+				(sName === "additionalText" && this.getText() !== "" && this.getAggregation("_image"))) {
+					// update the decorative state of the icon if the text or additional text is changed
+					this.getAggregation("_image").setDecorative(vValue !== "");
+			}
+
 			// optimisation to not invalidate and rerender the whole parent DOM, but only manipulate the CSS class
 			// for invisibility on the concrete DOM element that needs to change
 			if (this.getParent() && this.getParent().changeItemState) {
@@ -249,23 +255,12 @@ sap.ui.define(["./library", "sap/ui/core/Item", "sap/ui/base/ManagedObject", "sa
 			return this;
 		};
 
-
-		/**
-		 * Property setter for the icon
-		 *
-		 * @param {sap.ui.core.URI} sIcon - new value of the Icon property
-		 * @return {this} this to allow method chaining
-		 * @public
-		 */
-		TabStripItem.prototype.setIcon = function(sIcon) {
-			return this._setIcon(sIcon);
-		};
-
-		TabStripItem.prototype._setIcon = function(sIcon, bSuppressRendering) {
+		TabStripItem.prototype.setIcon = function(sIcon, bSuppressRendering) {
 			var mProperties,
 				aCssClasses = ['sapMTabContIcon'],
 				oImage = this.getAggregation("_image"),
-				sImgId = this.getId() + "-img";
+				sImgId = this.getId() + "-img",
+				bDecorative = !!(this.getText() || this.getAdditionalText());
 
 			if (!sIcon) {
 				this.setProperty("icon", sIcon, bSuppressRendering);
@@ -281,6 +276,7 @@ sap.ui.define(["./library", "sap/ui/core/Item", "sap/ui/base/ManagedObject", "sa
 				mProperties = {
 					src : sIcon,
 					id: sImgId,
+					decorative: bDecorative,
 					tooltip: this.getIconTooltip()
 				};
 

package/src/sap/m/TabStripRenderer.js

@@ -299,7 +299,7 @@ sap.ui.define([
 	 * Returns the accessibility attributes for a given <code>TabStripItem</code>.
 	 *
 	 * @param {sap.m.TabStripItem} oItem The <code>TabStripItem</code> to prepare accessibility attributes for
-	 * @param {sap.ui.core.Control} oTabStripParent The <code>TabStrip</code> parent control
+	 * @param {sap.m.TabStrip} oTabStripParent The <code>TabStrip</code> parent control
 	 * @param {sap.m.TabStripItem} oSelectedItem The <code>TabStripItem</code> that is currently selected
 	 * @returns {Object} The accessibility attributes for given <code>TabStripItem</code>
 	 * @private
@@ -316,7 +316,7 @@ sap.ui.define([
 		mAccAttributes["describedby"] = sDescribedBy;
 		mAccAttributes["posinset"] = iIndex + 1;
 		mAccAttributes["setsize"] = aItems.length;
-		mAccAttributes["labelledby"] = getTabTextDomId(oItem) + "-addText " + getTabTextDomId(oItem) + "-text";
+
 		if (oTabStripParent && oTabStripParent.getRenderer && oTabStripParent.getRenderer().getContentDomId) {
 			mAccAttributes["controls"] = oTabStripParent.getRenderer().getContentDomId(oTabStripParent);
 		}

package/src/sap/m/Table.js

@@ -14,6 +14,7 @@ sap.ui.define([
 	"./CheckBox",
 	"./TableRenderer",
 	"sap/base/Log",
+	"sap/ui/base/Object",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/core/util/PasteHelper",
 	"sap/ui/events/KeyCodes",
@@ -23,7 +24,7 @@ sap.ui.define([
 	// jQuery custom selectors ":sapTabbable"
 	"sap/ui/dom/jquery/Selectors"
 ],
-	function(Core, Device, library, ListBase, ListItemBase, CheckBox, TableRenderer, Log, ResizeHandler, PasteHelper, KeyCodes, jQuery, ListBaseRenderer, Icon) {
+	function(Core, Device, library, ListBase, ListItemBase, CheckBox, TableRenderer, Log, BaseObject, ResizeHandler, PasteHelper, KeyCodes, jQuery, ListBaseRenderer, Icon) {
 	"use strict";
 
 
@@ -65,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -472,12 +473,13 @@ sap.ui.define([
 	 */
 	Table.prototype._checkLastColumnWidth = function() {
 		var $this = this.$();
+		var oTableDomRef = this.getTableDomRef();
 
-		if (!$this.length) {
+		if (!$this.length || !oTableDomRef) {
 			return;
 		}
 
-		if ($this[0].clientWidth < this.getTableDomRef().clientWidth) {
+		if ($this[0].clientWidth < oTableDomRef.clientWidth) {
 			$this.find(".sapMListTblCell:visible").eq(0).addClass("sapMTableLastColumn").width("");
 		}
 
@@ -560,7 +562,7 @@ sap.ui.define([
 
 	/*
 	 * This hook method is called if growing feature is enabled and after new page loaded
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.onBeforePageLoaded = function() {
 		if (this.getAlternateRowColors()) {
@@ -572,7 +574,7 @@ sap.ui.define([
 
 	/*
 	 * This hook method is called if growing feature is enabled and after new page loaded
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.onAfterPageLoaded = function() {
 		this.updateSelectAllCheckbox();
@@ -586,7 +588,7 @@ sap.ui.define([
 
 	/*
 	 * This hook method is called from renderer to determine whether items should render or not
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.shouldRenderItems = function() {
 		return this.getColumns().some(function(oColumn) {
@@ -597,7 +599,7 @@ sap.ui.define([
 	/*
 	 * This hook method is called from GrowingEnablement to determine whether
 	 * growing should suppress Table invalidation
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.shouldGrowingSuppressInvalidation = function() {
 		if (this.getAutoPopinMode()) {
@@ -637,7 +639,7 @@ sap.ui.define([
 
 	/*
 	 * Returns items container DOM reference
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.getItemsContainerDomRef = function() {
 		return this.getDomRef("tblBody");
@@ -645,7 +647,7 @@ sap.ui.define([
 
 	/*
 	 * Sets DOM References for keyboard navigation
-	 * @overwrite
+	 * @override
 	 */
 	Table.prototype.setNavigationItems = function(oItemNavigation) {
 		var $Header = this.$("tblHeader");
@@ -687,7 +689,9 @@ sap.ui.define([
 	};
 
 	Table.prototype.onColumnPress = function(oColumn) {
-		this.bActiveHeaders && this.fireEvent("columnPress", {
+		var oMenu = oColumn.getColumnHeaderMenu();
+		oMenu && oMenu.openBy(oColumn);
+		(this.bActiveHeaders || oMenu) && this.fireEvent("columnPress", {
 			column: oColumn
 		});
 	};
@@ -811,6 +815,7 @@ sap.ui.define([
 			this._clearAllButton = new Icon({
 				id: this.getId() + "-clearSelection",
 				src: "sap-icon://clear-all",
+				tooltip: Core.getLibraryResourceBundle("sap.m").getText("TABLE_CLEARBUTTON_TOOLTIP"),
 				decorative: false,
 				press: this.removeSelections.bind(this, false, true, false)
 			}).setParent(this, null, true).addEventDelegate({
@@ -1064,6 +1069,44 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Sets the focus on the stored focus DOM reference.
+	 *
+	 * If {@param oFocusInfo.targetInfo} is of type {@type sap.ui.core.message.Message},
+	 * the focus will be set as accurately as possible according to the information provided by {@type sap.ui.core.message.Message}.
+	 *
+	 * @param {object} [oFocusInfo={}] Options for setting the focus
+	 * @param {boolean} [oFocusInfo.preventScroll=false] @since 1.60 If set to <code>true</code>, the focused
+	 *   element won't be moved into the viewport if it's not completely visible before the focus is set
+	 * @param {any} [oFocusInfo.targetInfo] @since 1.98 Further control-specific setting of the focus target within the control
+	 * @public
+	 */
+	Table.prototype.focus = function(oFocusInfo) {
+		this._oFocusInfo = oFocusInfo;
+		ListBase.prototype.focus.apply(this, arguments);
+		delete this._oFocusInfo;
+	};
+
+	Table.prototype.getFocusDomRef = function() {
+		var bHasMessage = this._oFocusInfo && this._oFocusInfo.targetInfo && BaseObject.isA(this._oFocusInfo.targetInfo, "sap.ui.core.message.Message");
+
+		if (bHasMessage) {
+			var $TblHeader = this.$("tblHeader");
+			var $VisibleColumns = $TblHeader.find(".sapMListTblCell:visible");
+
+			if ($VisibleColumns.length) {
+				return $TblHeader[0];
+			}
+
+			var $NoData = this.$("nodata");
+			if ($NoData.length) {
+				return $NoData[0];
+			}
+		}
+
+		return ListBase.prototype.getFocusDomRef.apply(this, arguments);
+	};
+
 	Table.prototype.onfocusin = function(oEvent) {
 		var oTarget = oEvent.target;
 		if (oTarget.id == this.getId("tblHeader")) {

package/src/sap/m/TablePersoController.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class Table Personalization Controller
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @alias sap.m.TablePersoController
 	 */
 	var TablePersoController = ManagedObject.extend("sap.m.TablePersoController", /** @lends sap.m.TablePersoController */

package/src/sap/m/TablePersoDialog.js

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @class Table Personalization Dialog
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @alias sap.m.TablePersoDialog
 	 */
 	var TablePersoDialog = ManagedObject.extend("sap.m.TablePersoDialog", /** @lends sap.m.TablePersoDialog */

package/src/sap/m/TablePersoProvider.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/ManagedObject', "sap/base/Log"],
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @alias sap.m.TablePersoProvider
 	 */
 	var TablePersoProvider = ManagedObject.extend("sap.m.TablePersoProvider", /** @lends sap.m.TablePersoProvider */

package/src/sap/m/TableRenderer.js

@@ -38,7 +38,7 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 	 *
 	 * @param {sap.ui.core.RenderManager} rm RenderManager
 	 * @param {sap.m.ListBase} oTable Table control
-	 * @param {String} type Whether "Head" or "Foot"
+	 * @param {string} type Whether "Head" or "Foot"
 	 */
 	TableRenderer.renderColumns = function(rm, oTable, type) {
 		var index = 0,
@@ -211,12 +211,13 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 					rm.openStart("div");
 					rm.class("sapMColumnHeader");
 
-					if (oTable.bActiveHeaders && !control.isA("sap.ui.core.InvisibleText")) {
+					var oMenu = oColumn.getColumnHeaderMenu();
+					if ((oTable.bActiveHeaders || oMenu)  && !control.isA("sap.ui.core.InvisibleText")) {
 						// add active header attributes and style class
 						rm.attr("tabindex", 0);
 						rm.attr("role", "button");
-						rm.attr("aria-haspopup", "dialog");
 						rm.class("sapMColumnHeaderActive");
+						rm.attr("aria-haspopup", oMenu ? oMenu.getAriaHasPopupType().toLowerCase() : "dialog");
 					} else if (oTable.bFocusableHeaders) {
 						rm.attr("tabindex", 0);
 						rm.class("sapMColumnHeaderFocusable");