@openui5/sap.m 1.100.0 → 1.102.1

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

@@ -13,7 +13,6 @@ sap.ui.define([], function () {
 	MenuRenderer.render = function (oRm, oMenu) {
 		oRm.openStart("div", oMenu);
 		oRm.class("sapMTCMenu");
-
 		oRm.openEnd();
 		this.renderQuickActions(oRm, oMenu);
 		this.renderItems(oRm, oMenu);
@@ -21,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");
@@ -37,36 +37,13 @@ sap.ui.define([], function () {
 		}
 		oRm.openEnd();
 
-		var aQuickActions = (oMenu.getAggregation("_quickActions") || []).concat(oMenu.getQuickActions());
-		aQuickActions.forEach(function (oQuickAction) {
-			oQuickAction.getEffectiveQuickActions().forEach(function (oQuickAction) {
-				this.renderQuickAction(oRm, oQuickAction);
-			}, this);
-		}, this);
-
-		oRm.close("div");
-	};
+		oRm.renderControl(oMenu._oForm);
 
-	MenuRenderer.renderQuickAction = function (oRm, oQuickAction) {
-		oRm.openStart("div", oQuickAction);
-		oRm.class("sapMTCMenuQAction");
-		oRm.openEnd();
-		// Label
-		oRm.openStart("div");
-		oRm.class("sapMTCMenuQALabel");
-		oRm.openEnd();
-		oRm.text(oQuickAction.getLabel());
-		oRm.close("div");
-		// Content
-		oRm.openStart("div");
-		oRm.openEnd();
-		oRm.renderControl(oQuickAction.getContent());
-		oRm.close("div");
 		oRm.close("div");
 	};
 
 	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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @since 1.99
@@ -43,9 +43,20 @@ sap.ui.define([
 			},
 			aggregations: {
 				/**
-				 * Defines the content, which should be shown for the quick action.
+				 * Defines the content that is shown for the quick action.
+				 *
+				 * <b>Notes:</b>
+				 * <ul>
+				 * <li>Adding additional content to the quick action or altering its layout will
+				 * only take effect once the popover has been closed and reopened again.</li>
+				 * <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>
+				 * </ul>
 				 */
-				content: { type: "sap.ui.core.Control", multiple: false }
+				content: { type: "sap.ui.core.Control", multiple: true }
 			}
 		}
 	});

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.100.0
+	 * @version 1.102.1
 	 *
 	 * @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/QuickActionContainer.js

@@ -0,0 +1,29 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/m/table/columnmenu/QuickActionBase"
+], function(
+	QuickActionBase
+) {
+	"use strict";
+
+	var QuickActionContainer = QuickActionBase.extend("sap.m.table.columnmenu.QuickActionContainer", {
+		metadata: {
+			library: "sap.m",
+			aggregations: {
+				quickActions: {type: "sap.m.table.columnmenu.QuickActionBase"}
+			}
+		}
+	});
+
+	QuickActionContainer.prototype.getEffectiveQuickActions = function() {
+		return this.getQuickActions().reduce(function(aQuickActions, oQuickAction) {
+			return aQuickActions.concat(oQuickAction.getEffectiveQuickActions());
+		}, []);
+	};
+
+	return QuickActionContainer;
+});

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.100.0
+	 * @version 1.102.1
 	 *
 	 * @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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @experimental
@@ -73,11 +73,14 @@ sap.ui.define([
 	};
 
 	QuickGroup.prototype.getContent = function() {
-		if (!this._oContent) {
-			this._oContent = this.createContent(this.getItems());
+		if (!this._aContent) {
+			this._aContent = this.createContent(this.getItems());
+			this._aContent.forEach(function(oItem) {
+				this.addDependent(oItem);
+			}.bind(this));
 		}
 
-		return this._oContent;
+		return this._aContent;
 	};
 
 	QuickGroup.prototype.addItem = function(oItem) {
@@ -106,27 +109,28 @@ sap.ui.define([
 	};
 
 	QuickGroup.prototype.createContent = function(aItems) {
-		return new HBox({
-			items: aItems.map(function(oItem) {
-				return new ToggleButton({
-					text: oItem.getLabel(),
-					pressed: oItem.getGrouped(),
-					press: [oItem, this.onChange, this]
-				});
-			}, this)
-		});
+		return aItems.map(function(oItem) {
+			return new ToggleButton({
+				text: oItem.getLabel(),
+				pressed: oItem.getGrouped(),
+				press: [oItem, this.onChange, this]
+			});
+		}, this);
 	};
 
 	QuickGroup.prototype.destroyContent = function() {
-		if (this._oContent) {
-			this._oContent.destroy();
-			delete this._oContent;
+		if (this._aContent) {
+			this._aContent.forEach(function (oContent) {
+				oContent.destroy();
+			});
+			delete this._aContent;
 		}
 	};
 
 	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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @experimental

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.100.0
+	 * @version 1.102.1
 	 *
 	 * @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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @experimental
@@ -62,7 +62,7 @@ sap.ui.define([
 		} else {
 			oQuickAction = new QuickAction({
 				label: sLabel,
-				content: this._createContent()
+				content: [this._createContent()]
 			});
 		}
 
@@ -81,37 +81,38 @@ sap.ui.define([
 
 	QuickSortItem.prototype._createContent = function() {
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-		return new HBox({
-			items: [
-				new ToggleButton({
-					text: oBundle.getText("table.COLUMNMENU_SORT_ASCENDING"),
-					icon: "sap-icon://sort-ascending",
-					pressed: this.getSortOrder() === SortOrder.Ascending,
-					press: [{item: this, sortOrder: SortOrder.Ascending}, this._onSortChange, this]
-				}),
-				new ToggleButton({
-					text: oBundle.getText("table.COLUMNMENU_SORT_DESCENDING"),
-					icon: "sap-icon://sort-descending",
-					pressed: this.getSortOrder() === SortOrder.Descending,
-					press: [{item: this, sortOrder: SortOrder.Descending}, this._onSortChange, this]
-				})
-			]
-		});
+		return [
+			new ToggleButton({
+				text: oBundle.getText("table.COLUMNMENU_SORT_ASCENDING"),
+				pressed: this.getSortOrder() === SortOrder.Ascending,
+				press: [{item: this, sortOrder: SortOrder.Ascending}, this._onSortChange, this]
+			}),
+			new ToggleButton({
+				text: oBundle.getText("table.COLUMNMENU_SORT_DESCENDING"),
+				pressed: this.getSortOrder() === SortOrder.Descending,
+				press: [{item: this, sortOrder: SortOrder.Descending}, this._onSortChange, this]
+			})
+		];
 	};
 
 	QuickSortItem.prototype._onSortChange = function (oEvent, mSortInfo) {
-		if (oEvent.getParameters().pressed) {
-			var sButtonId = oEvent.getSource().sId;
-			oEvent.getSource().getParent().getItems().forEach(function(oButton) {
-				if (oButton.sId != sButtonId) {
-					oButton.setPressed(false);
-				}
-			});
-		}
-
-		mSortInfo.item.setProperty("sortOrder", oEvent.getParameters().pressed ? mSortInfo.sortOrder : SortOrder.None, true);
+		this.setSortOrder(oEvent.getParameters().pressed ? mSortInfo.sortOrder : SortOrder.None, true);
 		this.getParent().onChange(mSortInfo.item);
 	};
 
+	/*
+	 * @see JSDoc generated by SAPUI5 control API generator
+	 */
+	QuickSortItem.prototype.setSortOrder = function(sSortOrder) {
+		this.setProperty("sortOrder", sSortOrder);
+
+		var oQuickAction = this.getAggregation("quickAction");
+		if (oQuickAction) {
+			var aButtons = oQuickAction.getContent();
+			aButtons[0].setPressed(sSortOrder === SortOrder.Ascending);
+			aButtons[1].setPressed(sSortOrder === SortOrder.Descending);
+		}
+	};
+
 	return QuickSortItem;
 });

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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @experimental
@@ -73,11 +73,14 @@ sap.ui.define([
 	};
 
 	QuickTotal.prototype.getContent = function() {
-		if (!this._oContent) {
-			this._oContent = this.createContent(this.getItems());
+		if (!this._aContent) {
+			this._aContent = this.createContent(this.getItems());
+			this._aContent.forEach(function(oItem) {
+				this.addDependent(oItem);
+			}.bind(this));
 		}
 
-		return this._oContent;
+		return this._aContent;
 	};
 
 	QuickTotal.prototype.addItem = function(oItem) {
@@ -106,36 +109,28 @@ sap.ui.define([
 	};
 
 	QuickTotal.prototype.createContent = function(aItems) {
-		return new HBox({
-			items: aItems.map(function(oItem) {
-				return new ToggleButton({
-					text: oItem.getLabel(),
-					pressed: oItem.getTotaled(),
-					press: [oItem, this.onChange, this]
-				});
-			}, this)
-		});
+		return aItems.map(function(oItem) {
+			return new ToggleButton({
+				text: oItem.getLabel(),
+				pressed: oItem.getTotaled(),
+				press: [oItem, this.onChange, this]
+			});
+		}, this);
 	};
 
 	QuickTotal.prototype.destroyContent = function() {
-		if (this._oContent) {
-			this._oContent.destroy();
-			delete this._oContent;
+		if (this._aContent) {
+			this._aContent.forEach(function (oContent) {
+				oContent.destroy();
+			});
+			delete this._aContent;
 		}
 	};
 
 	QuickTotal.prototype.onChange = function(oEvent, oItem) {
-		if (oEvent.getParameters().pressed) {
-			var sButtonId = oEvent.getSource().sId;
-			oEvent.getSource().getParent().getItems().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.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @experimental

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/Avatar.less

@@ -3,6 +3,12 @@
 /* Base theme                    */
 /* ============================= */
 
+@_sap_m_Avatar_Font_Size_XL: 3rem;
+@_sap_m_Avatar_Font_Size_L: 2.5rem;
+@_sap_m_Avatar_Font_Size_M: 2rem;
+@_sap_m_Avatar_Font_Size_S: 1.5rem;
+@_sap_m_Avatar_Font_Size_XS: 1rem;
+
 .sapFAvatar {
 	display: inline-block;
 	position: relative;
@@ -120,7 +126,7 @@
 .sapFAvatarXS {
 	height: 2rem;
 	width: 2rem;
-	font-size: 1rem;
+	font-size: @_sap_m_Avatar_Font_Size_XS;
 
 	.sapFAvatarInitialsHolder {
 		font-size: 0.75rem;
@@ -130,7 +136,7 @@
 .sapFAvatarS {
 	height: 3rem;
 	width: 3rem;
-	font-size: 1.5rem;
+	font-size: @_sap_m_Avatar_Font_Size_S;
 
 	.sapFAvatarInitialsHolder {
 		font-size: 1.125rem;
@@ -140,7 +146,7 @@
 .sapFAvatarM {
 	height: 4rem;
 	width: 4rem;
-	font-size: 2rem;
+	font-size: @_sap_m_Avatar_Font_Size_M;
 
 	.sapFAvatarInitialsHolder {
 		font-size: 1.625rem;
@@ -150,7 +156,7 @@
 .sapFAvatarL {
 	height: 5rem;
 	width: 5rem;
-	font-size: 2.5rem;
+	font-size: @_sap_m_Avatar_Font_Size_L;
 
 	.sapFAvatarInitialsHolder {
 		font-size: 2rem;
@@ -160,7 +166,7 @@
 .sapFAvatarXL {
 	height: 7rem;
 	width: 7rem;
-	font-size: 3rem;
+	font-size: @_sap_m_Avatar_Font_Size_XL;
 
 	.sapFAvatarInitialsHolder {
 		font-size: 2.75rem;

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{