@openui5/sap.m 1.101.0 → 1.102.0

package/src/sap/m/semantic/ShareMenu.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * ShareMenu is a special menu that is represented by (1) an actionSheet with the menu items and (2) a button that opens the actionSheet.
 	 * If the menu has only one item, then that item appears in place of the button that opens the actionSheet.
 	 *
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @private
 	 * @since 1.30.0
 	 * @alias sap.m.semantic.ShareMenu

package/src/sap/m/semantic/ShareMenuPage.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/m/semantic/SemanticPage", "sap/m/semantic/SemanticConfigurat
 	 * @extends sap.m.semantic.SemanticPage
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortAction.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/semantic/SortSelect.js

@@ -24,7 +24,7 @@ sap.ui.define(['sap/m/semantic/SemanticSelect'], function(SemanticSelect) {
 	 * @implements sap.m.semantic.ISort
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/table/Util.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/m/table/Util
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @since 1.96.0
 	 * @private
 	 * @experimental Since 1.96.0. This class is experimental and the API might be changed in future.
@@ -64,6 +64,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] The settings object
 	 * @param {int} [mSettings.maxWidth=19] The maximum content width of the field in rem
 	 * @param {int} [mSettings.defaultWidth=8] The default column content width when type check fails
+	 * @param {float} [mSettings.gap=0] The additional content width in rem
 	 * @returns {float} The calculated width of the ODataType converted to rem
 	 * @private
 	 */
@@ -78,6 +79,11 @@ sap.ui.define([
 		return function(oType, mSettings) {
 
 			var sType = oType.getMetadata().getName().split(".").pop();
+			var iMaxWidth = mSettings && mSettings.maxWidth || 19;
+			var iGap = mSettings && mSettings.gap || 0;
+			var applySettings = function(fCalculatedWidth) {
+				return Math.min(fCalculatedWidth + iGap, iMaxWidth);
+			};
 
 			if (sType == "Boolean") {
 				if (!fBooleanWidth) {
@@ -86,13 +92,11 @@ sap.ui.define([
 					var fNoWidth = Util.measureText(oResourceBundle.getText("NO"));
 					fBooleanWidth = Math.max(fYesWidth, fNoWidth);
 				}
-				return fBooleanWidth;
+				return applySettings(fBooleanWidth);
 			}
 
 			if (sType == "String" || oType.isA("sap.ui.model.odata.type.String")) {
-				var iMaxWidth = mSettings && mSettings.maxWidth || 19;
 				var iMaxLength = parseInt(oType.getConstraints().maxLength) || 0;
-
 				if (!iMaxLength) {
 					return Math.max(Math.min(10, iMaxWidth), iMaxWidth * 0.75);
 				}
@@ -106,7 +110,7 @@ sap.ui.define([
 				}
 
 				var fWidth = Math.log(fSampleWidth - iMaxWidth * 0.16) / Math.log(iMaxWidth / 3) * (iMaxWidth / 2) * Math.pow(iMaxWidth / 19, 1 / fSampleWidth);
-				return Math.min(fWidth, fSampleWidth, iMaxWidth);
+				return applySettings(Math.min(fWidth, fSampleWidth));
 			}
 
 			if (sType.startsWith("Date") || sType.startsWith("Time")) {
@@ -125,7 +129,7 @@ sap.ui.define([
 						sSample += (sWideFormat.length == 4 ? "---" : "-");
 					});
 				}
-				return Util.measureText(sSample);
+				return applySettings(Util.measureText(sSample));
 			}
 
 			if (mNumericLimits[sType]) {
@@ -134,7 +138,7 @@ sap.ui.define([
 				iPrecision = Math.min(iPrecision, mNumericLimits[sType]);
 				var sNumber = 2 * Math.pow(10, iPrecision - iScale - 1);
 				sNumber = oType.formatValue(sNumber, "string");
-				return Util.measureText(sNumber);
+				return applySettings(Util.measureText(sNumber));
 			}
 
 			return mSettings && mSettings.defaultWidth || 8;

package/src/sap/m/table/columnmenu/ActionItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/m/table/columnmenu/Entry.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -87,15 +87,5 @@ sap.ui.define([
 		throw new Error(this + " does not implement #getContent");
 	};
 
-	Entry.prototype.setVisible = function (bVisible) {
-		if (this.getVisible() == bVisible) {
-			return this;
-		}
-
-		this.setProperty("visible", bVisible);
-		this.getMenu() && this.getMenu()._setItemVisibility(this, bVisible);
-		return this;
-	};
-
 	return Entry;
 });

package/src/sap/m/table/columnmenu/Item.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/m/table/columnmenu/ItemBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -148,5 +148,15 @@ sap.ui.define([
 		this.getMenu() && this.getMenu()._updateButtonState(this);
 	};
 
+	ItemBase.prototype.setVisible = function (bVisible) {
+		if (this.getVisible() == bVisible) {
+			return this;
+		}
+
+		this.setProperty("visible", bVisible);
+		this.getMenu() && this.getMenu()._setItemVisibility(this, bVisible);
+		return this;
+	};
+
     return ItemBase;
 });

package/src/sap/m/table/columnmenu/Menu.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -149,10 +149,14 @@ sap.ui.define([
 		this._initPopover();
 		this._createQuickActionGrids();
 
-		if (!this._oItemsContainer) {
-			this._initItemsContainer();
+		if (this._oItemsContainer) {
+			this._oItemsContainer.destroy();
+			this._oItemsContainer = null;
 		}
+		this._initItemsContainer();
+
 		this._oPopover.openBy(oAnchor);
+		ControlEvents.bindAnyEvent(this.fAnyEventHandlerProxy);
 	};
 
 	/**
@@ -176,6 +180,7 @@ sap.ui.define([
 		if (this._oPopover) {
 			this._oPopover.close();
 		}
+		ControlEvents.unbindAnyEvent(this.fAnyEventHandlerProxy);
 	};
 
 	Menu.prototype.exit = function () {
@@ -250,10 +255,9 @@ sap.ui.define([
 				return;
 			}
 
-			if (!isInMenuHierarchy) {
-				if (containsOrEquals(this.getDomRef(), oEvent.target)) {
-					isInMenuHierarchy = true;
-				}
+			if (containsOrEquals(this.getDomRef(), oEvent.target) || containsOrEquals(Core.getStaticAreaRef(), oEvent.target) ||
+				isInControlTree(this, Core.byId(oEvent.target.id))) {
+				isInMenuHierarchy = true;
 			}
 		} else if (oEvent.type == "sapfocusleave") {
 			if (touchEnabled) {
@@ -261,11 +265,9 @@ sap.ui.define([
 			}
 
 			if (oEvent.relatedControlId) {
-				if (!isInMenuHierarchy) {
-					if (containsOrEquals(this.getDomRef(), jQuery(document.getElementById(oEvent.relatedControlId)).get(0)) ||
-						isInControlTree(this, Core.byId(oEvent.relatedControlId))) {
-						isInMenuHierarchy = true;
-					}
+				if (containsOrEquals(this.getDomRef(), jQuery(document.getElementById(oEvent.relatedControlId)).get(0)) ||
+					isInControlTree(this, Core.byId(oEvent.relatedControlId))) {
+					isInMenuHierarchy = true;
 				}
 			}
 		}
@@ -286,24 +288,20 @@ sap.ui.define([
 	}
 
 	Menu.prototype._initItemsContainer = function () {
-		var aControlMenuItems = (this.getAggregation("_items") || []).reduce(function (aItems, oItem) {
-			return aItems.concat(oItem.getEffectiveItems());
-		}, []);
-		var aApplicationMenuItems = this.getItems().reduce(function (aItems, oItem) {
-			return aItems.concat(oItem.getEffectiveItems());
-		}, []);
+		var aMenuItems = this._getAllEffectiveItems();
+		var bHasQuickActions = this._hasQuickActions();
+		var bHasitems =  this._hasItems();
 
 		if (!this._oItemsContainer) {
 			this._createItemsContainer();
 		}
 
-		aControlMenuItems.forEach(function (oColumnMenuItem, iIndex) {
-			this._addView(oColumnMenuItem);
-			iIndex === 0 && this._oItemsContainer.addSeparator();
-		}.bind(this));
-		aApplicationMenuItems.forEach(function (oColumnMenuItem, iIndex) {
+		aMenuItems.forEach(function (oColumnMenuItem, iIndex) {
 			this._addView(oColumnMenuItem);
-			iIndex === 0 && this._oItemsContainer.addSeparator();
+
+			if (bHasQuickActions && bHasitems && iIndex === 0) {
+				this._oItemsContainer.addSeparator();
+			}
 		}.bind(this));
 	};
 
@@ -358,6 +356,7 @@ sap.ui.define([
 		});
 		this._oBtnOk = new Button({
 			text: this._getResourceText("table.COLUMNMENU_CONFIRM"),
+			type: library.ButtonType.Emphasized,
 			press: function () {
 				var sKey = oMenu._oItemsContainer.getCurrentViewKey();
 				if (oMenu._fireEvent(Core.byId(sKey), "confirm")) {
@@ -436,14 +435,26 @@ sap.ui.define([
 		var aQuickActions = (this.getAggregation("_quickActions") || []).concat(this.getQuickActions());
 		return aQuickActions.reduce(function (a, oQuickAction) {
 			return a.concat(oQuickAction.getEffectiveQuickActions());
-		}, []);
+		}, []).filter(function (oQuickAction) {
+			return oQuickAction.getVisible();
+		});
+	};
+
+	Menu.prototype._hasQuickActions = function() {
+		return this._getAllEffectiveQuickActions().length > 0;
 	};
 
 	Menu.prototype._getAllEffectiveItems = function() {
 		var aItems = (this.getAggregation("_items") || []).concat(this.getItems());
 		return aItems.reduce(function(a, oItem) {
 			return a.concat(oItem.getEffectiveItems());
-		}, []);
+		}, []).filter(function (oItem) {
+			return oItem.getVisible();
+		});
+	};
+
+	Menu.prototype._hasItems = function() {
+		return this._getAllEffectiveItems().length > 0;
 	};
 
 	Menu.prototype._getItemFromContainerItem = function (oContainerItem) {
@@ -520,6 +531,9 @@ sap.ui.define([
 
 		var aEffectiveQuickActions = this._getAllEffectiveQuickActions();
 		aEffectiveQuickActions.forEach(function (oEffectiveQuickAction) {
+			if (!oEffectiveQuickAction.getVisible()) {
+				return;
+			}
 			// Create label
 			var oGridData = new GridData({span: "XL4 L4 M4 S12"});
 			var oLabel = new Label({

package/src/sap/m/table/columnmenu/MenuRenderer.js

@@ -20,11 +20,12 @@ sap.ui.define([], function () {
 	};
 
 	MenuRenderer.renderQuickActions = function (oRm, oMenu) {
-		if (oMenu.getQuickActions().length === 0 && !oMenu.getAggregation("_quickActions")) {
+		// If no active QuickActions are found, do not render the quick action container.
+		if (oMenu._getAllEffectiveQuickActions().length === 0) {
 			return;
 		}
 
-		oRm.openStart("div", oMenu.getId() + "-quickActions");
+		oRm.openStart("div");
 		if (oMenu._oItemsContainer) {
 			if (oMenu._oItemsContainer.getCurrentViewKey() === "$default") {
 				oRm.class("sapMTCMenuQAList");
@@ -42,7 +43,7 @@ sap.ui.define([], function () {
 	};
 
 	MenuRenderer.renderItems = function (oRm, oMenu) {
-		if (oMenu.getItems().length === 0 && !oMenu.getAggregation("_items")) {
+		if (oMenu._getAllEffectiveItems().length === 0) {
 			return;
 		}
 

package/src/sap/m/table/columnmenu/QuickAction.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @since 1.99

package/src/sap/m/table/columnmenu/QuickActionBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -50,5 +50,15 @@ sap.ui.define([
 		return [this];
 	};
 
+	QuickActionBase.prototype.setVisible = function (bVisible) {
+		if (this.getVisible() == bVisible) {
+			return this;
+		}
+
+		this.setProperty("visible", bVisible);
+		this.getMenu() && this.getMenu()._createQuickActionGrids();
+		return this;
+	};
+
 	return QuickActionBase;
 });

package/src/sap/m/table/columnmenu/QuickActionItem.js

@@ -5,9 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Element"
+	"sap/m/table/columnmenu/Entry"
 ], function (
-	Element
+	Entry
 ) {
 	"use strict";
 
@@ -21,17 +21,17 @@ sap.ui.define([
 	 * This element serves as a quick action item.
 	 * It can be used to specify control- and application specific quick action items.
 	 *
-	 * @extends sap.ui.core.Element
+	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
 	 *
 	 * @alias sap.m.table.columnmenu.QuickActionItem
 	 */
-	var QuickActionItem = Element.extend("sap.m.table.columnmenu.QuickActionItem", {
+	var QuickActionItem = Entry.extend("sap.m.table.columnmenu.QuickActionItem", {
 		metadata: {
 			library: "sap.m",
 			properties: {

package/src/sap/m/table/columnmenu/QuickGroup.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -127,19 +127,10 @@ sap.ui.define([
 		}
 	};
 
-	QuickGroup.prototype._onItemChange = function(oQuickGroupItem, bGrouped) {
-		var sLabel = oQuickGroupItem.getLabel();
-
-		var oButton = this.getContent().find(function(oBtn) {
-			return oBtn.getText() === sLabel;
-		});
-
-		oButton.setPressed(bGrouped);
-	};
-
 	QuickGroup.prototype.onChange = function(oEvent, oItem) {
 		oItem.setProperty("grouped", oEvent.getParameters().pressed, true);
 		this.fireChange({item: oItem});
+		this.getMenu().close();
 	};
 
 	return QuickGroup;

package/src/sap/m/table/columnmenu/QuickGroupItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -43,17 +43,5 @@ sap.ui.define([
 		}
 	});
 
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	QuickGroupItem.prototype.setGrouped = function(bGrouped) {
-		this.setProperty("grouped", bGrouped);
-
-		var oQuickGroup = this.getParent();
-		if (oQuickGroup) {
-			oQuickGroup._onItemChange(this, bGrouped);
-		}
-	};
-
 	return QuickGroupItem;
 });

package/src/sap/m/table/columnmenu/QuickSort.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -74,6 +74,7 @@ sap.ui.define([
 
 	QuickSort.prototype.onChange = function(oItem) {
 		this.fireChange({item: oItem});
+		this.getMenu().close();
 	};
 
 	return QuickSort;

package/src/sap/m/table/columnmenu/QuickSortItem.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/m/table/columnmenu/QuickTotal.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -127,30 +127,10 @@ sap.ui.define([
 		}
 	};
 
-	QuickTotal.prototype._onItemChange = function(oQuickTotalItem, bTotaled) {
-		var sLabel = oQuickTotalItem.getLabel();
-
-		this.getContent().forEach(function(oButton) {
-			if (oButton.getText() === sLabel) {
-				oButton.setPressed(bTotaled);
-			} else if (bTotaled) {
-				oButton.setPressed(false);
-			}
-		});
-	};
-
 	QuickTotal.prototype.onChange = function(oEvent, oItem) {
-		if (oEvent.getParameters().pressed) {
-			var sButtonId = oEvent.getSource().sId;
-			this.getContent().forEach(function(oButton) {
-				if (oButton.sId != sButtonId) {
-					oButton.setPressed(false);
-				}
-			});
-		}
-
 		oItem.setProperty("totaled", oEvent.getParameters().pressed, true);
 		this.fireChange({item: oItem});
+		this.getMenu().close();
 	};
 
 	return QuickTotal;

package/src/sap/m/table/columnmenu/QuickTotalItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @experimental
@@ -43,17 +43,5 @@ sap.ui.define([
 		}
 	});
 
-	/*
-	 * @see JSDoc generated by SAPUI5 control API generator
-	 */
-	QuickTotalItem.prototype.setTotaled = function(bTotaled) {
-		this.setProperty("totaled", bTotaled);
-
-		var oQuickTotal = this.getParent();
-		if (oQuickTotal) {
-			oQuickTotal._onItemChange(this, bTotaled);
-		}
-	};
-
 	return QuickTotalItem;
 });

package/src/sap/m/themes/base/ActionListItem.less

@@ -18,7 +18,7 @@
 	min-width: 3rem;
 	display: block;
 	text-align: center;
-	color: @sapUiButtonFooterTextColor;
+	color: @sapUiButtonTextColor;
 }
 
 .sapMALI > .sapMLIBContent {

package/src/sap/m/themes/base/Button.less

@@ -146,11 +146,6 @@ html[data-sap-ui-os^="iOS"] .sapMBtnBase:not(.sapMBtn) .sapMBtnContent {
 		height:           1.625rem;
 		min-width:        2.0rem;
 	}
-	.sapMBtnInner.sapMBtnText,
-	.sapMBtnInner.sapMBtnIconFirst {
-		padding-left: 0.4375rem;
-		padding-right: 0.4375rem;
-	}
 
 	.sapMBtnContent {
 		line-height:      1.500rem;
@@ -455,7 +450,7 @@ span.sapMBtnInner.sapMBtnEmphasized {
 .sapMBtn .sapMBtnNegative.sapMBtnInner,
 .sapMBtn .sapMBtnSuccess.sapMBtnInner,
 .sapMBtn .sapMBtnNeutral.sapMBtnInner{
-		text-shadow: @sapContent_ContrastTextShadow;
+	text-shadow: @sapUiContentContrastTextShadow;
 }
 
 .sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnCritical{