@openui5/sap.m 1.103.1 → 1.106.0

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/m/semantic/SemanticButton'], function(SemanticButton) {
 	 * @extends sap.m.semantic.SemanticButton
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

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.103.1
+	 * @version 1.106.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.103.1
+	 * @version 1.106.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.103.1
+	 * @version 1.106.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.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -8,20 +8,22 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/core/Core",
 	"sap/ui/core/theming/Parameters",
-	"sap/m/IllustratedMessage"
-], function(MLibrary, Core, ThemeParameters, IllustratedMessage) {
+	"sap/m/IllustratedMessage",
+	"sap/m/Button"
+], function(MLibrary, Core, ThemeParameters, IllustratedMessage, Button) {
 	"use strict";
 	/*global Intl*/
 
 	/**
 	 * Provides utility functions for tables.
+	 *
 	 * @namespace
 	 * @alias module:sap/m/table/Util
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 1.96.0
 	 * @private
-	 * @experimental Since 1.96.0. This class is experimental and the API might be changed in future.
+	 * @ui5-restricted sap.fe, sap.ui.mdc, sap.ui.comp
 	 */
 	var Util = {};
 
@@ -103,7 +105,7 @@ sap.ui.define([
 
 				var fSampleWidth = Util.measureText("A".repeat(iMaxLength));
 				if (iMaxLength < iMaxWidth || iMaxWidth < 10) {
-					return Math.min(fSampleWidth, iMaxWidth);
+					return applySettings(fSampleWidth);
 				}
 
 				var fWidth = Math.log(fSampleWidth - iMaxWidth * 0.16) / Math.log(iMaxWidth / 3) * (iMaxWidth / 2) * Math.pow(iMaxWidth / 19, 1 / fSampleWidth);
@@ -147,7 +149,7 @@ sap.ui.define([
 	 * Calculates the width of the column header width according to calculated cell content and min/max width restrictions.
 	 *
 	 * @param {string} sHeader The header text
-	 * @param {float} fContentWidth The calculated width of the cell in rem
+	 * @param {float} [fContentWidth] The calculated width of the cell in rem
 	 * @param {int} [iMaxWidth=19] The maximum header width in rem
 	 * @param {int} [iMinWidth=2] The minimum header width in rem
 	 * @returns {float} The calculated header width in rem
@@ -175,6 +177,9 @@ sap.ui.define([
 			if (iMinWidth > iHeaderLength) {
 				return iMinWidth;
 			}
+			if (!fContentWidth) {
+				return Util.measureText(sHeader, fnGetHeaderFont());
+			}
 
 			fContentWidth = Math.max(fContentWidth, iMinWidth);
 			if (fContentWidth > iHeaderLength) {
@@ -203,6 +208,8 @@ sap.ui.define([
 	 * @param {int} [mSettings.maxWidth=19] The maximum content width of the field in rem
 	 * @param {int} [mSettings.padding=1] The sum of column padding and border in rem
 	 * @param {float} [mSettings.gap=0] The additional content width in rem
+	 * @param {boolean} [mSettings.headerGap=false] Whether icons in the header should be taken into account
+	 * @param {boolean} [mSettings.truncateLabel=true] Whether the header of the column can be truncated or not
 	 * @param {boolean} [mSettings.verticalArrangement=false] Whether the fields are arranged vertically
 	 * @param {int} [mSettings.defaultWidth=8] The default column content width when type check fails
 	 * @returns {string} The calculated width of the column
@@ -219,9 +226,9 @@ sap.ui.define([
 			minWidth: 2,
 			maxWidth: 19,
 			defaultWidth: 8,
+			truncateLabel: true,
 			padding: 1,
-			gap: 0,
-			verticalArrangement: false
+			gap: 0
 		}, mSettings);
 
 		var fHeaderWidth = 0;
@@ -246,7 +253,8 @@ sap.ui.define([
 		}, 0);
 
 		if (sHeader) {
-			fHeaderWidth = Util.calcHeaderWidth(sHeader, fContentWidth, iMaxWidth, iMinWidth);
+			fHeaderWidth = Util.calcHeaderWidth(sHeader, (mSettings.truncateLabel ? fContentWidth : 0), iMaxWidth, iMinWidth);
+			fHeaderWidth += mSettings.headerGap ? (8 /* padding */ + 14 /* icon width */) / fBaseFontSize : 0;
 		}
 
 		fContentWidth = Math.max(iMinWidth, fContentWidth, fHeaderWidth);
@@ -260,16 +268,27 @@ sap.ui.define([
 	 * Returns an instance of <code>sap.m.IllustratedMessage</code> in case there are no visible columns in the table.
 	 *
 	 * @returns {sap.m.IllustratedMessage} The message to be displayed when the table has no visible columns
+	 * @param {function} [fnAddColumn] The handler to be executed when the additional add column button is pressed
 	 * @private
 	 */
-	Util.getNoColumnsIllustratedMessage = function() {
+	Util.getNoColumnsIllustratedMessage = function(fnAddColumn) {
 		var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 
-		return new IllustratedMessage({
+		var oIllustratedMessage = new IllustratedMessage({
 			illustrationType: MLibrary.IllustratedMessageType.AddColumn,
 			title: oResourceBundle.getText("TABLE_NO_COLUMNS_TITLE"),
 			description: oResourceBundle.getText("TABLE_NO_COLUMNS_DESCRIPTION")
 		});
+
+		if (fnAddColumn) {
+			var oAddButton = new Button({
+				icon: "sap-icon://action-settings",
+				press: fnAddColumn
+			});
+			oIllustratedMessage.addAdditionalContent(oAddButton);
+		}
+
+		return oIllustratedMessage;
 	};
 
 	return Util;

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.103.1
+	 * @version 1.106.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.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental

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.103.1
+	 * @version 1.106.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.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -52,8 +52,9 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// shortcut for sap.ui.core.aria.HasPopup
 	var HasPopup = coreLibrary.aria.HasPopup;
+	var VerticalAlign = coreLibrary.VerticalAlign;
+	var Category = library.table.columnmenu.Category;
 
 	/**
 	 * Constructor for a new Menu.
@@ -75,7 +76,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -108,6 +109,12 @@ sap.ui.define([
 				 * @private
 				 */
 				_items: { type: "sap.m.table.columnmenu.ItemBase", visibility: "hidden" }
+			},
+			events: {
+				/**
+				 * Fires before the column menu is opened
+				 */
+				beforeOpen: {}
 			}
 		},
 		renderer: MenuRenderer
@@ -119,7 +126,7 @@ sap.ui.define([
 
 	Menu.prototype.init = function() {
 		this.fAnyEventHandlerProxy = jQuery.proxy(function(oEvent){
-			if (!this._oPopover.isOpen() || !this.getDomRef() || (oEvent.type != "mousedown" && oEvent.type != "touchstart")) {
+			if (!this.isOpen() || !this.getDomRef() || (oEvent.type != "mousedown" && oEvent.type != "touchstart")) {
 				return;
 			}
 			this.handleOuterEvent(this.getId(), oEvent);
@@ -155,7 +162,11 @@ sap.ui.define([
 		}
 		this._initItemsContainer();
 
-		this._oPopover.openBy(oAnchor);
+		if (!this.isOpen()) {
+			this.fireBeforeOpen();
+			this._oPopover.openBy(oAnchor);
+		}
+
 		ControlEvents.bindAnyEvent(this.fAnyEventHandlerProxy);
 	};
 
@@ -170,6 +181,15 @@ sap.ui.define([
 		return ARIA_POPUP_TYPE;
 	};
 
+	/**
+	 * Returns true when the menu is open, otherwise it returns false.
+	 *
+	 * @returns {boolean} Whether the menu is open.
+	 */
+	Menu.prototype.isOpen = function () {
+		return this._oPopover && this._oPopover.isOpen();
+	};
+
 	/**
 	 * Closes the popover.
 	 *
@@ -239,7 +259,7 @@ sap.ui.define([
 	};
 
 	Menu.prototype.onsapfocusleave = function(oEvent){
-		if (!this._oPopover.isOpen()) {
+		if (!this.isOpen()) {
 			return;
 		}
 		this.handleOuterEvent(this.getId(), oEvent);
@@ -278,6 +298,9 @@ sap.ui.define([
 	};
 
 	function isInControlTree(oParent, oChild) {
+		if (!oParent || !oChild) {
+			return false;
+		}
 		var temp = oChild.getParent();
 		if (!temp) {
 			return false;
@@ -431,17 +454,31 @@ sap.ui.define([
 		return sText ? this.oResourceBundle.getText(sText, vValue) : this.oResourceBundle;
 	};
 
-	Menu.prototype._getAllEffectiveQuickActions = function() {
+	var mSortOrder = {};
+	mSortOrder[Category.Sort] = 0;
+	mSortOrder[Category.Filter] = 1;
+	mSortOrder[Category.Group] = 2;
+	mSortOrder[Category.Aggregate] = 3;
+	mSortOrder[Category.Generic] = 4;
+
+	Menu.prototype._getAllEffectiveQuickActions = function(bSkipImplicitSorting) {
 		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();
-		});
+
+		aQuickActions = aQuickActions.reduce(function(aQuickActions, oQuickAction) {
+			return aQuickActions.concat(oQuickAction ? oQuickAction.getEffectiveQuickActions() : []);
+		}, []);
+
+		if (!bSkipImplicitSorting) {
+			aQuickActions.sort(function(oLeftQuickAction, oRightQuickAction) {
+				return mSortOrder[oLeftQuickAction.getCategory()] - mSortOrder[oRightQuickAction.getCategory()];
+			});
+		}
+
+		return aQuickActions;
 	};
 
 	Menu.prototype._hasQuickActions = function() {
-		return this._getAllEffectiveQuickActions().length > 0;
+		return this._getAllEffectiveQuickActions(true).length > 0;
 	};
 
 	Menu.prototype._getAllEffectiveItems = function() {
@@ -539,7 +576,7 @@ sap.ui.define([
 			var oLabel = new Label({
 				text: oEffectiveQuickAction.getLabel(),
 				layoutData: oGridData,
-				vAlign: sap.ui.core.VerticalAlign.Middle,
+				vAlign: VerticalAlign.Middle,
 				wrapping: true
 			}).setWidth("100%");
 			oLabel.addStyleClass("sapMTCMenuQALabel");

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

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/m/table/columnmenu/QuickActionBase"
-], function (
-	QuickActionBase
+	"sap/m/table/columnmenu/QuickActionBase",
+	"sap/m/library"
+], function(
+	QuickActionBase,
+	library
 ) {
 	"use strict";
 
@@ -24,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @since 1.99
@@ -39,7 +41,11 @@ sap.ui.define([
 				/**
 				 * Defines the text for the label.
 				 */
-				label: { type: "string" }
+				label: {type: "string", defaultValue: ""},
+				/**
+				 * Defines the category. In the menu, all <code>QuickActions</code> are implicitly ordered by their category.
+				 */
+				category: {type: "sap.m.table.columnmenu.Category", defaultValue: library.table.columnmenu.Category.Generic}
 			},
 			aggregations: {
 				/**
@@ -52,11 +58,13 @@ sap.ui.define([
 				 * <li>The layout of the content of <code>QuickAction</code> can be altered by providing {@link sap.ui.layout.GridData} for each
 				 * <code>layoutData</code> aggregation of each content control. In size S, content controls can take up to
 				 * 12 columns, while in sizes M and bigger, content controls can take up to 8 columns of space.</li>
-				 * <li>If there are more than 2 controls inside a quick action, they will be shown underneath each other if the <code>ColumnMenu</code> is in size S.</li>
-				 * <li>By default, the content controls of <code>QuickAction</code> will take up the same amount of space and will have the same size.</li>
+				 * <li>If there are more than 2 controls inside a quick action, they will be shown underneath each other if the
+				 * <code>ColumnMenu</code> is in size S.</li>
+				 * <li>By default, the content controls of <code>QuickAction</code> will take up the same amount of space and will have the same
+				 * size.</li>
 				 * </ul>
 				 */
-				content: { type: "sap.ui.core.Control", multiple: true }
+				content: {type: "sap.ui.core.Control", multiple: true}
 			}
 		}
 	});

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

@@ -4,9 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/m/table/columnmenu/Entry"
+	"sap/m/table/columnmenu/Entry",
+	"sap/m/library"
 ], function(
-	Entry
+	Entry,
+	library
 ) {
 	"use strict";
 
@@ -23,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -60,5 +62,18 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Gets the category of this quick action.
+	 *
+	 * @returns {sap.m.table.columnmenu.Category} The category
+	 * @virtual
+	 */
+	QuickActionBase.prototype.getCategory = function() {
+		if (this.getMetadata().hasProperty("category")) {
+			return this.getProperty("category");
+		}
+		return library.table.columnmenu.Category.Generic;
+	};
+
 	return QuickActionBase;
 });

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

@@ -6,7 +6,7 @@
 
 sap.ui.define([
 	"sap/m/table/columnmenu/Entry"
-], function (
+], function(
 	Entry
 ) {
 	"use strict";
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -33,16 +33,15 @@ sap.ui.define([
 	 */
 	var QuickActionItem = Entry.extend("sap.m.table.columnmenu.QuickActionItem", {
 		metadata: {
-			library: "sap.m",
-			properties: {
+			library: "sap.m", properties: {
 				/**
 				 * The property name
 				 */
-				key: { type: "string" },
+				key: {type: "string"},
 				/**
 				 * Defines the text for the label.
 				 */
-				label: { type: "string" }
+				label: {type: "string", defaultValue: ""}
 			}
 		}
 	});

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

@@ -6,12 +6,12 @@
 
 sap.ui.define([
 	"sap/m/table/columnmenu/QuickActionBase",
-	"sap/m/HBox",
-	"sap/m/ToggleButton"
+	"sap/m/ToggleButton",
+	"sap/m/library"
 ], function (
 	QuickActionBase,
-	HBox,
-	ToggleButton
+	ToggleButton,
+	library
 ) {
 	"use strict";
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -127,11 +127,35 @@ sap.ui.define([
 		}
 	};
 
+	QuickGroup.prototype._updateContent = function() {
+		var aItems = this.getItems();
+		var aContent = this.getContent();
+		var oItem, oButton;
+
+		for (var i = 0; i < aItems.length; i++) {
+			oItem = aItems[i];
+			oButton = aContent[i];
+			if (!oButton) {
+				oButton = new ToggleButton({press: [oItem, this.onChange, this]});
+			}
+			oButton.setText(oItem.getLabel());
+			oButton.setPressed(oItem.getGrouped());
+		}
+
+		for (var i = aItems.length; i < aContent.length; i++) {
+			aContent[i].destroy();
+		}
+	};
+
 	QuickGroup.prototype.onChange = function(oEvent, oItem) {
 		oItem.setProperty("grouped", oEvent.getParameters().pressed, true);
 		this.fireChange({item: oItem});
 		this.getMenu().close();
 	};
 
+	QuickGroup.prototype.getCategory = function() {
+		return library.table.columnmenu.Category.Group;
+	};
+
 	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.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -43,5 +43,17 @@ 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._updateContent();
+		}
+	};
+
 	return QuickGroupItem;
 });

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

@@ -5,10 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Element",
 	"sap/m/table/columnmenu/QuickActionBase"
 ], function (
-	Element,
 	QuickActionBase
 ) {
 	"use strict";
@@ -25,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -7,19 +7,19 @@
 sap.ui.define([
 	"./QuickActionItem",
 	"./QuickAction",
-	"sap/m/HBox",
 	"sap/m/ToggleButton",
+	"sap/m/library",
 	"sap/ui/core/library"
 ], function (
 	QuickActionItem,
 	QuickAction,
-	HBox,
 	ToggleButton,
-	library
+	library,
+	CoreLibrary
 ) {
 	"use strict";
 
-	var SortOrder = library.SortOrder;
+	var SortOrder = CoreLibrary.SortOrder;
 
 	/**
 	 * Constructor for a new QuickSortItem.
@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -45,7 +45,7 @@ sap.ui.define([
 		metadata: {
 			library: "sap.m",
 			properties: {
-				sortOrder: { type: "sap.ui.core.SortOrder", defaultValue: library.SortOrder.None }
+				sortOrder: { type: "sap.ui.core.SortOrder", defaultValue: CoreLibrary.SortOrder.None }
 			},
 			aggregations: {
 				quickAction: { type: "sap.m.table.columnmenu.QuickAction", multiple: false, visibility: "hidden" }
@@ -62,7 +62,8 @@ sap.ui.define([
 		} else {
 			oQuickAction = new QuickAction({
 				label: sLabel,
-				content: [this._createContent()]
+				content: [this._createContent()],
+				category: library.table.columnmenu.Category.Sort
 			});
 		}