@openui5/sap.m 1.97.1 → 1.98.0

package/src/sap/m/StepInput.js

@@ -6,46 +6,35 @@
 
 // Provides control sap.m.StepInput.
 sap.ui.define([
-	"sap/ui/core/Icon",
-	"./Input",
-	"./InputBase",
-	"./InputRenderer",
 	"sap/ui/core/Control",
 	"sap/ui/core/IconPool",
-	"sap/ui/core/LabelEnablement",
 	"sap/ui/core/message/MessageMixin",
+	"sap/ui/core/format/NumberFormat",
 	"sap/ui/model/ValidateException",
 	"sap/ui/Device",
 	"sap/ui/core/library",
-	"sap/ui/core/Renderer",
 	"sap/m/library",
+	"./NumericInput",
 	"./StepInputRenderer",
 	"sap/ui/events/KeyCodes",
 	"sap/base/Log"
 ],
 function(
-	Icon,
-	Input,
-	InputBase,
-	InputRenderer,
 	Control,
 	IconPool,
-	LabelEnablement,
 	MessageMixin,
+	NumberFormat,
 	ValidateException,
 	Device,
 	coreLibrary,
-	Renderer,
 	library,
+	NumericInput,
 	StepInputRenderer,
 	KeyCodes,
 	Log
 ) {
 		"use strict";
 
-		// shortcut for sap.m.InputType
-		var InputType = library.InputType;
-
 		// shortcut for sap.ui.core.TextAlign
 		var TextAlign = coreLibrary.TextAlign;
 
@@ -130,7 +119,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public
@@ -325,117 +314,6 @@ function(
 		 */
 		var aForwardableProps = ["enabled", "editable", "name", "placeholder", "required", "valueStateText", "description", "fieldWidth", "textAlign"];
 
-
-		/****************************************** NUMERIC INPUT CONTROL ****************************************************/
-
-		var NumericInputRenderer = Renderer.extend(InputRenderer);
-
-		NumericInputRenderer.apiVersion = 2;
-
-		NumericInputRenderer.writeInnerAttributes = function(oRm, oControl) {
-			var oStepInput = oControl.getParent(),
-				mAccAttributes = this.getAccessibilityState(oControl);
-			// inside the Input this function also sets explicitly textAlign to "End" if the type
-			// of the Input is Numeric (our case)
-			// so we have to overwrite it by leaving only the text direction
-			// and the textAlign will be controlled by textAlign property of the StepInput
-			oRm.attr("type", oControl.getType().toLowerCase());
-
-			if (sap.ui.getCore().getConfiguration().getRTL()) {
-				oRm.attr("dir", "ltr");
-			}
-			// prevent rendering of aria-disabled attribute to avoid having
-			// both aria-disabled and disabled at the same time
-			mAccAttributes.disabled = null;
-
-			oRm.accessibilityState(oStepInput,  mAccAttributes);
-		};
-
-		//Accessibility behavior of the Input needs to be extended
-		/**
-		 * Overwrites the accessibility state using the <code>getAccessibilityState</code> method of the <code>InputBaseRenderer</code>.
-		 *
-		 * @param {NumericInput} oNumericInput The numeric input instance
-		 * @returns {Array} mAccessibilityState
-		 */
-		NumericInputRenderer.getAccessibilityState = function(oNumericInput) {
-			var mAccessibilityState = InputRenderer.getAccessibilityState(oNumericInput),
-				oStepInput = oNumericInput.getParent(),
-				fMin = oStepInput._getMin(),
-				fMax = oStepInput._getMax(),
-				fNow = oStepInput.getValue(),
-				sDescription = oStepInput.getDescription(),
-				aAriaLabelledByRefs = oStepInput.getAriaLabelledBy(),
-				// If we don't check this manually, we won't have the labels, which were referencing SI,
-				// in aria-labelledby (which normally comes out of the box). This is because writeAccessibilityState
-				// is called for NumericInput, while any labels will be for the parent StepInput.
-				aReferencingLabels = LabelEnablement.getReferencingLabels(oStepInput),
-				sDescribedBy = oStepInput.getAriaDescribedBy().join(" "),
-				sResultingLabelledBy;
-
-				mAccessibilityState.valuenow = fNow;
-
-			if (sDescription) {
-				// If there is a description, we should add a reference to it in the aria-labelledby
-				aAriaLabelledByRefs.push(oStepInput._getInput().getId() + "-descr");
-			}
-
-			sResultingLabelledBy = aReferencingLabels.concat(aAriaLabelledByRefs).join(" ");
-
-			if (typeof fMin === "number") {
-				mAccessibilityState.valuemin = fMin;
-			}
-
-			if (typeof fMax === "number") {
-				mAccessibilityState.valuemax = fMax;
-			}
-
-			if (!oStepInput.getEditable()) {
-				mAccessibilityState.readonly = true;
-			}
-
-			if (sDescribedBy){
-				mAccessibilityState.describedby = sDescribedBy;
-			}
-
-			if (sResultingLabelledBy){
-				mAccessibilityState.labelledby = sResultingLabelledBy;
-			}
-
-			return mAccessibilityState;
-		};
-
-		var NumericInput = Input.extend("sap.m.internal.NumericInput", {
-			metadata: {
-				library: "sap.m"
-			},
-			constructor: function(sId, mSettings) {
-				return Input.apply(this, arguments);
-			},
-			renderer: NumericInputRenderer
-		});
-
-		NumericInput.prototype.onBeforeRendering = function() {
-			InputBase.prototype.onBeforeRendering.call(this);
-
-			// The Input is handling its width in its onBeforeRendering method - if noting is set, the width is 100%.
-			// As the NumericInput is using the InputBase's onBeforeRendering method, the width must be handled here too.
-			// The real width of the StepInput is handled from its width property, so the NumericInput's width should be 100%.
-			this.setWidth("100%");
-
-			this._deregisterEvents();
-		};
-
-		NumericInput.prototype.setValue = function(sValue) {
-			Input.prototype.setValue.apply(this, arguments);
-
-			if (this.getDomRef()) {
-				this.getDomRef("inner").setAttribute("aria-valuenow", sValue);
-			}
-
-			return this;
-		};
-
 		MessageMixin.call(StepInput.prototype);
 
 		/**
@@ -572,7 +450,8 @@ function(
 		 * @returns {this} Reference to the control instance for chaining
 		 */
 		StepInput.prototype.setDisplayValuePrecision = function (number) {
-			var vValuePrecision;
+			var vValuePrecision,
+				oInstance;
 
 			if (isValidPrecisionValue(number)) {
 				vValuePrecision = parseInt(number);
@@ -581,7 +460,11 @@ function(
 				Log.warning(this + ": ValuePrecision (" + number + ") is not correct. It should be a number between 0 and 20! Setting the default ValuePrecision:0.");
 			}
 
-			return this.setProperty("displayValuePrecision", vValuePrecision);
+			var oInstance = this.setProperty("displayValuePrecision", vValuePrecision);
+
+			this._getNumberFormatter(true);
+
+			return oInstance;
 		};
 
 		/**
@@ -631,7 +514,7 @@ function(
 				});
 
 			oIcon.getEnabled = function () {
-				return !this._shouldDisableIncrementButton(Number(this._getInput().getValue()), this._getMax());
+				return !this._shouldDisableIncrementButton(this._parseNumber(this._getInput().getValue()), this._getMax());
 			}.bind(this);
 
 			oIcon.$().attr("tabindex", "-1");
@@ -664,7 +547,7 @@ function(
 				});
 
 			oIcon.getEnabled = function () {
-				return !this._shouldDisableDecrementButton(Number(this._getInput().getValue()), this._getMin());
+				return !this._shouldDisableDecrementButton(this._parseNumber(this._getInput().getValue()), this._getMin());
 			}.bind(this);
 
 			oIcon.$().attr("tabindex", "-1");
@@ -692,7 +575,6 @@ function(
 				var oNumericInput = new NumericInput({
 					id: this.getId() + "-input",
 					textAlign: this.getTextAlign(),
-					type: InputType.Number,
 					editable: this.getEditable(),
 					enabled: this.getEnabled(),
 					description: this.getDescription(),
@@ -720,7 +602,7 @@ function(
 			} else {
 				// just update the visual value and buttons
 				this._applyValue(this._fTempValue);
-				this._disableButtons(Number(this._getInput().getValue()), this._getMax(), this._getMin());
+				this._disableButtons(this._parseNumber(this._getInput().getValue()), this._getMax(), this._getMin());
 			}
 			return this;
 		};
@@ -778,7 +660,7 @@ function(
 
 			if (this._bDelayedEventFire) {
 				this._applyValue(fNewValue);
-				this._disableButtons(Number(this._getFormattedValue(fNewValue)), this._getMax(), this._getMin());
+				this._disableButtons(this._parseNumber(this._getFormattedValue(fNewValue)), this._getMax(), this._getMin());
 				this._bNeedsVerification = true;
 			}
 
@@ -830,7 +712,7 @@ function(
 		StepInput.prototype._verifyValue = function () {
 			var min = this._getMin(),
 				max = this._getMax(),
-				value = parseFloat(this._getInput().getValue()),
+				value = this._parseNumber(this._getInput().getValue()),
 				oCoreMessageBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.core"),
 				oBinding = this.getBinding("value"),
 				oBindingType = oBinding && oBinding.getType && oBinding.getType(),
@@ -922,7 +804,7 @@ function(
 
 			this._sOriginalValue = oValue;
 			this._applyValue(oValue);
-			this._disableButtons(Number(this._getInput().getValue()), this._getMax(), this._getMin());
+			this._disableButtons(this._parseNumber(this._getInput().getValue()), this._getMax(), this._getMin());
 
 			if (oValue !== this._fOldValue) {
 				// save current value (for ESC restoring)
@@ -938,11 +820,19 @@ function(
 			return oResult;
 		};
 
+		StepInput.prototype._getNumberFormatter = function(bReset) {
+			if (!this._formatter || bReset) {
+				this._formatter = NumberFormat.getFloatInstance({ decimals: this.getDisplayValuePrecision() });
+			}
+
+			return this._formatter;
+		};
+
 		/**
 		 * Formats the <code>vValue</code> accordingly to the <code>displayValuePrecision</code> property.
-		 * if vValue is undefined or null, the property <code>value</code> will be used.
+		 * If vValue is undefined or null, the property <code>value</code> will be used.
 		 *
-		 * @returns formated value as a String
+		 * @returns formatted value as a String
 		 * @private
 		 */
 		StepInput.prototype._getFormattedValue = function (vValue) {
@@ -954,6 +844,10 @@ function(
 				vValue = this.getValue();
 			}
 
+			if (Device.system.desktop) {
+				return this._getNumberFormatter().format(vValue);
+			}
+
 			if (iPrecision <= 0) {
 				// return value without any decimals
 				return parseFloat(vValue).toFixed(0);
@@ -970,7 +864,6 @@ function(
 			} else {
 				return vValue.toString() + "." + this._padZeroesRight("0", iPrecision);
 			}
-
 		};
 
 		/**
@@ -1010,12 +903,12 @@ function(
 
 			// fix the entered value if the precision is 0; and filter 'e/E' meanwhile
 			if (this.getDisplayValuePrecision() === 0) {
-				sInputValue = Math.round(Number(sInputValue.toLowerCase().split('e')[0])).toString();
+				sInputValue = Math.round(this._parseNumber(sInputValue.toLowerCase().split('e')[0])).toString();
 			}
 
 			// calculates delta (difference) between input value and real control value
 			if (this._getFormattedValue(this._fTempValue) !== sInputValue) {
-				fDelta = Number(sInputValue) - this._fTempValue;
+				fDelta = this._parseNumber(sInputValue) - this._fTempValue;
 			}
 			return fDelta;
 		};
@@ -1060,7 +953,7 @@ function(
 		StepInput.prototype.onsappageupmodifiers = function (oEvent) {
 			if (this.getEditable() && this._isNumericLike(this._getMax()) && !(oEvent.ctrlKey || oEvent.metaKey || oEvent.altKey) && oEvent.shiftKey) {
 				this._bDelayedEventFire = true;
-				this._fTempValue = Number(this._getInput().getValue());
+				this._fTempValue = this._parseNumber(this._getInput().getValue());
 				this._changeValueWithStep(this._getMax() - this._fTempValue);
 			}
 		};
@@ -1073,7 +966,7 @@ function(
 		StepInput.prototype.onsappagedownmodifiers = function (oEvent) {
 			if (this.getEditable() && this._isNumericLike(this._getMin()) && !(oEvent.ctrlKey || oEvent.metaKey || oEvent.altKey) && oEvent.shiftKey) {
 				this._bDelayedEventFire = true;
-				this._fTempValue = Number(this._getInput().getValue());
+				this._fTempValue = this._parseNumber(this._getInput().getValue());
 				this._changeValueWithStep(-(this._fTempValue - this._getMin()));
 			}
 		};
@@ -1144,11 +1037,11 @@ function(
 
 			if (oEvent.which === KeyCodes.ARROW_UP && !oEvent.altKey && oEvent.shiftKey && (oEvent.ctrlKey || oEvent.metaKey)) { //ctrl+shift+up
 				fMax = this._getMax();
-				this._fTempValue = Number(this._getInput().getValue());
+				this._fTempValue = this._parseNumber(this._getInput().getValue());
 				fStep = (fMax !== undefined) ? fMax - this._fTempValue : 0;
 			} else if (oEvent.which === KeyCodes.ARROW_DOWN && !oEvent.altKey && oEvent.shiftKey && (oEvent.ctrlKey || oEvent.metaKey)) { //ctrl+shift+down
 				fMin = this._getMin();
-				this._fTempValue = Number(this._getInput().getValue());
+				this._fTempValue = this._parseNumber(this._getInput().getValue());
 				fStep = (fMin !== undefined) ? -(this._fTempValue - fMin) : 0;
 			} else if (oEvent.which === KeyCodes.ARROW_UP && !(oEvent.ctrlKey || oEvent.metaKey || oEvent.altKey) && oEvent.shiftKey) { //shift+up
 				fStep = this.getLargerStep();
@@ -1215,7 +1108,7 @@ function(
 		 * @private
 		 */
 		StepInput.prototype._liveChange = function () {
-			this._disableButtons(Number(this._getInput().getValue()), this._getMax(), this._getMin());
+			this._disableButtons(this._parseNumber(this._getInput().getValue()), this._getMax(), this._getMin());
 			this._verifyValue();
 		};
 
@@ -1232,7 +1125,7 @@ function(
 			if (!this._isButtonFocused() ) {
 
 				if (!this._btndown || bIsNotInValidRange) {
-					fOldValue = Number(this._getFormattedValue());
+					fOldValue = this._parseNumber(this._getFormattedValue());
 					if (this._fOldValue === undefined) {
 						this._fOldValue = fOldValue;
 					}
@@ -1242,7 +1135,7 @@ function(
 					this._changeValue();
 					this._bNeedsVerification = true;
 				} else {
-					this._fTempValue = Number(this._getInput().getValue());
+					this._fTempValue = this._parseNumber(this._getInput().getValue());
 				}
 			}
 		};
@@ -1368,30 +1261,31 @@ function(
 		 * @param {sap.ui.base.Event} oEvent Event object
 		 * @private
 		 */
-		StepInput.prototype._restrictCharsWhenDecimal = function (oEvent) {
-			var iDecimalMark = oEvent.getParameter("value").indexOf("."),
+		StepInput.prototype._restrictCharsWhenDecimal = function(oEvent) {
+			var sDecimalSeparator = Device.system.desktop ? this._getNumberFormatter().oFormatOptions.decimalSeparator : ".";
+			var iDecimalMark = oEvent.getParameter("value").indexOf(sDecimalSeparator),
 				iCharsSet = this.getDisplayValuePrecision(),
 				sEventValue = oEvent.getParameter("value"),
 				sValue;
 
 			if (iDecimalMark > 0 && iCharsSet >= 0) { //only for decimals
-				var sEventValueAfterTheDecimal = sEventValue.split('.')[1],
+				var sEventValueAfterTheDecimal = sEventValue.split(sDecimalSeparator)[1],
 					iCharsAfterTheDecimalSign = sEventValueAfterTheDecimal ? sEventValueAfterTheDecimal.length : 0,
-					sCharsBeforeTheEventDecimalValue = sEventValue.split('.')[0],
-					sCharsAfterTheEventDecimalValue = iCharsSet > 0 ? sEventValue.substring(sEventValue.indexOf('.') + 1, sEventValue.length) : '';
+					sCharsBeforeTheEventDecimalValue = sEventValue.split(sDecimalSeparator)[0],
+					sCharsAfterTheEventDecimalValue = iCharsSet > 0 ? sEventValue.substring(sEventValue.indexOf(sDecimalSeparator) + 1, sEventValue.length) : '';
 
 				//scenario 1 - user typing after the decimal mark:
 				if (!this._bPaste) {
 					//if the characters after the decimal are more than the displayValuePrecision -> keep the current value after the decimal
 					if (iCharsAfterTheDecimalSign > iCharsSet) {
-						sValue = sCharsBeforeTheEventDecimalValue + (iCharsSet > 0 ? "." + sCharsAfterTheEventDecimalValue.substr(0, iCharsSet) : '');
+						sValue = sCharsBeforeTheEventDecimalValue + (iCharsSet > 0 ? sDecimalSeparator + sCharsAfterTheEventDecimalValue.substr(0, iCharsSet) : '');
 						this._showWrongValueVisualEffect();
 					}
 
 					//scenario 2 - paste - cut the chars with length, bigger than displayValuePrecision
 				} else {
-					if (sEventValue.indexOf(".")){
-						sValue = sEventValue.split('.')[0] + (iCharsSet > 0 ? "." + sEventValueAfterTheDecimal.substring(0, iCharsSet) : '');
+					if (sEventValue.indexOf(sDecimalSeparator)){
+						sValue = sEventValue.split(sDecimalSeparator)[0] + (iCharsSet > 0 ? sDecimalSeparator + sEventValueAfterTheDecimal.substring(0, iCharsSet) : '');
 					}
 					this._bPaste = false;
 				}
@@ -1433,7 +1327,7 @@ function(
 		 */
 		StepInput.prototype._getDefaultValue = function (value, max, min) {
 			if (value !== "" && value !== undefined) {
-				return Number(this._getInput().getValue());
+				return this._parseNumber(this._getInput().getValue());
 			}
 
 			if (this._isNumericLike(min) && min > 0) {
@@ -1564,7 +1458,7 @@ function(
 					this._bSpinStarted = true;
 					this._bDelayedEventFire = true;
 					this._changeValueWithStep(bIncrementButton ? 1 : -1);
-					this._disableButtons(Number(this._getInput().getValue()), this._getMax(), this._getMin());
+					this._disableButtons(this._parseNumber(this._getInput().getValue()), this._getMax(), this._getMin());
 					if ((this._getIncrementButton().getEnabled() && bIncrementButton) || (this._getDecrementButton().getEnabled() && !bIncrementButton)) {
 						this._spinValues(bIncrementButton);
 					}
@@ -1709,5 +1603,13 @@ function(
 			};
 		};
 
+		StepInput.prototype._parseNumber = function(sValue) {
+			if (Device.system.desktop) {
+				return this._getNumberFormatter().parse(sValue);
+			}
+
+			return Number(sValue);
+		};
+
 		return StepInput;
 	});

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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 */
 	var SuggestionsPopover = EventProvider.extend("sap.m.SuggestionsPopover", /** @lends sap.m.SuggestionsPopover.prototype */ {
 

package/src/sap/m/Switch.js

@@ -48,7 +48,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.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/TabContainer.js

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

package/src/sap/m/TabContainerItem.js

@@ -26,7 +26,7 @@ sap.ui.define(['sap/ui/core/Element',
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

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.97.1
+		 * @version 1.98.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.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @private

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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -688,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
 		});
 	};
@@ -1065,6 +1068,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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 * @alias sap.m.TablePersoProvider
 	 */
 	var TablePersoProvider = ManagedObject.extend("sap.m.TablePersoProvider", /** @lends sap.m.TablePersoProvider */

package/src/sap/m/TableRenderer.js

@@ -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");