@openui5/sap.m 1.100.0 → 1.101.0

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

@@ -9,28 +9,46 @@ sap.ui.define([
 	"sap/m/Toolbar",
 	"sap/m/ToolbarSpacer",
 	"sap/m/library",
+	'sap/ui/Device',
 	"sap/ui/core/Control",
 	"sap/ui/core/Core",
 	"sap/ui/core/library",
 	"sap/ui/thirdparty/jquery",
+	"sap/ui/dom/containsOrEquals",
+	"sap/ui/events/ControlEvents",
 	"sap/base/strings/capitalize",
 	"sap/m/p13n/AbstractContainerItem",
 	"sap/m/p13n/Container",
-	"sap/m/table/columnmenu/MenuRenderer"
+	"sap/m/table/columnmenu/MenuRenderer",
+	"sap/ui/layout/form/Form",
+	"sap/ui/layout/GridData",
+	"sap/ui/layout/form/ResponsiveGridLayout",
+	"sap/ui/layout/form/FormContainer",
+	"sap/ui/layout/form/FormElement",
+	"sap/m/Label"
 ], function (
 	ResponsivePopover,
 	Button,
 	Toolbar,
 	ToolbarSpacer,
 	library,
+	Device,
 	Control,
 	Core,
 	coreLibrary,
 	jQuery,
+	containsOrEquals,
+	ControlEvents,
 	capitalize,
 	AbstractContainerItem,
 	Container,
-	MenuRenderer
+	MenuRenderer,
+	Form,
+	GridData,
+	ResponsiveGridLayout,
+	FormContainer,
+	FormElement,
+	Label
 ) {
 	"use strict";
 
@@ -57,7 +75,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental
@@ -69,16 +87,44 @@ sap.ui.define([
 			library: "sap.m",
 			interfaces: ["sap.ui.core.IColumnHeaderMenu"],
 			aggregations: {
+				/**
+				 * Defines the quick actions of the column menu.
+				 */
 				quickActions: { type: "sap.m.table.columnmenu.QuickActionBase" },
+
+				/**
+				 * Defines the items of the column menu.
+				 */
 				items: { type: "sap.m.table.columnmenu.ItemBase" },
+
+				/**
+				 * Defines quick actions that are control-specific.
+				 * @private
+				 */
 				_quickActions: { type: "sap.m.table.columnmenu.QuickActionBase", visibility: "hidden" },
+
+				/**
+				 * Defines menu items that are control-specific.
+				 * @private
+				 */
 				_items: { type: "sap.m.table.columnmenu.ItemBase", visibility: "hidden" }
 			}
-		}
+		},
+		renderer: MenuRenderer
 	});
 
 	var DEFAULT_KEY = "$default";
 	var ARIA_POPUP_TYPE = HasPopup.Dialog;
+	var MENU_WIDTH = "500px";
+
+	Menu.prototype.init = function() {
+		this.fAnyEventHandlerProxy = jQuery.proxy(function(oEvent){
+			if (!this._oPopover.isOpen() || !this.getDomRef() || (oEvent.type != "mousedown" && oEvent.type != "touchstart")) {
+				return;
+			}
+			this.handleOuterEvent(this.getId(), oEvent);
+		}, this);
+	};
 
 	Menu.prototype.applySettings = function (mSettings) {
 		// Only works in JS views, but that's fine. This is only convenience for controls.
@@ -101,11 +147,11 @@ sap.ui.define([
 		}
 
 		this._initPopover();
+		this._createQuickActionGrids();
 
 		if (!this._oItemsContainer) {
 			this._initItemsContainer();
 		}
-
 		this._oPopover.openBy(oAnchor);
 	};
 
@@ -140,6 +186,7 @@ sap.ui.define([
 		if (this._oItemsContainer) {
 			delete this._oItemsContainer;
 		}
+		ControlEvents.unbindAnyEvent(this.fAnyEventHandlerProxy);
 	};
 
 	Menu.prototype._addAllToPrivateAggregation = function (mSettings, sAggregationName) {
@@ -161,7 +208,7 @@ sap.ui.define([
 			showHeader: false,
 			placement: library.PlacementType.Bottom,
 			content: new AssociativeControl({control: this, height: true}),
-			contentWidth: "500px",
+			contentWidth: MENU_WIDTH,
 			horizontalScrolling: false,
 			verticalScrolling: false,
 			afterClose: [this.close, this]
@@ -172,11 +219,72 @@ sap.ui.define([
 			"onAfterRendering": this._focusItem
 		}, this);
 
-		if (this.getItems().length == 0 && !this.getAggregation("_items")) {
+		if (this.getItems().length === 0 && !this.getAggregation("_items")) {
 			this._oPopover.attachAfterOpen(this._focusInitialQuickAction.bind(this));
+		} else {
+			// focus the first visible menu item
+			this._oPopover.attachAfterOpen(function () {
+				var oItem = this._oItemsContainer._getNavigationList().getItems().find(function (oItem) {
+					return oItem.getVisible();
+				});
+				oItem && oItem.focus();
+			}.bind(this));
+		}
+		this._oPopover._oControl.oPopup.setAutoClose(false);
+	};
+
+	Menu.prototype.onsapfocusleave = function(oEvent){
+		if (!this._oPopover.isOpen()) {
+			return;
 		}
+		this.handleOuterEvent(this.getId(), oEvent);
 	};
 
+	Menu.prototype.handleOuterEvent = function(oMenuId, oEvent) {
+		var isInMenuHierarchy = false,
+			touchEnabled = Device.support.touch || Device.system.combi;
+
+		if (oEvent.type == "mousedown" || oEvent.type == "touchstart") {
+			// Suppress the delayed mouse event from mobile browser
+			if (touchEnabled && (oEvent.isMarked("delayedMouseEvent") || oEvent.isMarked("cancelAutoClose"))) {
+				return;
+			}
+
+			if (!isInMenuHierarchy) {
+				if (containsOrEquals(this.getDomRef(), oEvent.target)) {
+					isInMenuHierarchy = true;
+				}
+			}
+		} else if (oEvent.type == "sapfocusleave") {
+			if (touchEnabled) {
+				return;
+			}
+
+			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 (!isInMenuHierarchy) {
+			this.close();
+		}
+	};
+
+	function isInControlTree(oParent, oChild) {
+		var temp = oChild.getParent();
+		if (!temp) {
+			return false;
+		} else if (temp === oParent) {
+			return true;
+		}
+		return isInControlTree(oParent, temp);
+	}
+
 	Menu.prototype._initItemsContainer = function () {
 		var aControlMenuItems = (this.getAggregation("_items") || []).reduce(function (aItems, oItem) {
 			return aItems.concat(oItem.getEffectiveItems());
@@ -191,11 +299,11 @@ sap.ui.define([
 
 		aControlMenuItems.forEach(function (oColumnMenuItem, iIndex) {
 			this._addView(oColumnMenuItem);
-			iIndex == 0 && this._oItemsContainer.addSeparator();
+			iIndex === 0 && this._oItemsContainer.addSeparator();
 		}.bind(this));
 		aApplicationMenuItems.forEach(function (oColumnMenuItem, iIndex) {
 			this._addView(oColumnMenuItem);
-			iIndex == 0 && this._oItemsContainer.addSeparator();
+			iIndex === 0 && this._oItemsContainer.addSeparator();
 		}.bind(this));
 	};
 
@@ -245,7 +353,6 @@ sap.ui.define([
 				var sKey = oMenu._oItemsContainer.getCurrentViewKey();
 				if (oMenu._fireEvent(Core.byId(sKey), "cancel")) {
 					oMenu.close();
-					oMenu.exit();
 				}
 			}
 		});
@@ -275,9 +382,8 @@ sap.ui.define([
 				if (mParameters.target !== "$default") {
 					var oContainerItem = oMenu._oItemsContainer.getView(mParameters.target);
 					var oColumnMenuItem = oMenu._getItemFromContainerItem(oContainerItem);
-					if (oColumnMenuItem && oColumnMenuItem.firePress && !oMenu._fireEvent(oColumnMenuItem, "press")) {
+					if (oColumnMenuItem && !oMenu._fireEvent(oColumnMenuItem, "press")) {
 						oEvent.preventDefault();
-						return;
 					}
 				}
 			},
@@ -326,22 +432,36 @@ sap.ui.define([
 		return sText ? this.oResourceBundle.getText(sText, vValue) : this.oResourceBundle;
 	};
 
+	Menu.prototype._getAllEffectiveQuickActions = function() {
+		var aQuickActions = (this.getAggregation("_quickActions") || []).concat(this.getQuickActions());
+		return aQuickActions.reduce(function (a, oQuickAction) {
+			return a.concat(oQuickAction.getEffectiveQuickActions());
+		}, []);
+	};
+
+	Menu.prototype._getAllEffectiveItems = function() {
+		var aItems = (this.getAggregation("_items") || []).concat(this.getItems());
+		return aItems.reduce(function(a, oItem) {
+			return a.concat(oItem.getEffectiveItems());
+		}, []);
+	};
+
 	Menu.prototype._getItemFromContainerItem = function (oContainerItem) {
 		// Low performance as linear search has to be done
-		var oItem = this.getAggregation("_items") && this.getAggregation("_items").find(function(item) {
-			return item.getId() == oContainerItem.getKey();
+		return this._getAllEffectiveItems().find(function(item) {
+			return item.getId() === oContainerItem.getKey();
 		});
-		if (!oItem) {
-			oItem = this.getAggregation("items") && this.getAggregation("items").find(function(item) {
-				return item.getId() == oContainerItem.getKey();
-			});
-		}
-		return oItem;
 	};
 
 	Menu.prototype._updateButtonState = function (oItem) {
-		this._oItemsContainer.getHeader().getContentRight()[0].setEnabled(oItem.getButtonSettings()["reset"]["enabled"]);
+		if (!this._oItemsContainer) {
+			return;
+		}
+		if (this._oItemsContainer.getCurrentViewKey() === DEFAULT_KEY) {
+			return;
+		}
 		this._oItemsContainer.getHeader().getContentRight()[0].setVisible(oItem.getButtonSettings()["reset"]["visible"]);
+		this._oItemsContainer.getHeader().getContentRight()[0].setEnabled(oItem.getButtonSettings()["reset"]["enabled"]);
 		this._oBtnOk.setVisible(oItem.getButtonSettings()["confirm"]["visible"]);
 		this._oBtnCancel.setVisible(oItem.getButtonSettings()["cancel"]["visible"]);
 	};
@@ -359,14 +479,14 @@ sap.ui.define([
 
 	Menu.prototype._focusInitialQuickAction = function () {
 		// Does not work with content, which contains multiple items
-		if (this.getItems().length == 0 && !this.getAggregation("_items")) {
+		if (this.getItems().length === 0 && !this.getAggregation("_items")) {
 			var aQuickActions = [];
 			if (this.getAggregation("_quickActions")) {
 				aQuickActions = this.getAggregation("_quickActions")[0].getEffectiveQuickActions();
 			} else if (this.getQuickActions().length > 0) {
 				aQuickActions = this.getQuickActions()[0].getEffectiveQuickActions();
 			}
-			aQuickActions.length > 0 && aQuickActions[0].getContent().focus();
+			aQuickActions.length > 0 && aQuickActions[0].getContent()[0].focus();
 		}
 	};
 
@@ -378,5 +498,59 @@ sap.ui.define([
 		oListItem && oListItem.setVisible(bVisible);
 	};
 
+	Menu.prototype._createQuickActionGrids = function () {
+		var oFormContainer;
+		if (this._oForm) {
+			oFormContainer = this._oForm.getFormContainers()[0];
+			oFormContainer.destroyFormElements();
+		} else {
+			oFormContainer = new FormContainer();
+			this._oForm = new Form({
+				layout: new ResponsiveGridLayout({
+					labelSpanXL: 3,
+					labelSpanL: 3,
+					labelSpanM: 3,
+					labelSpanS: 12,
+					adjustLabelSpan: false
+				}),
+				editable: true,
+				formContainers: oFormContainer
+			});
+		}
+
+		var aEffectiveQuickActions = this._getAllEffectiveQuickActions();
+		aEffectiveQuickActions.forEach(function (oEffectiveQuickAction) {
+			// Create label
+			var oGridData = new GridData({span: "XL4 L4 M4 S12"});
+			var oLabel = new Label({
+				text: oEffectiveQuickAction.getLabel(),
+				layoutData: oGridData,
+				vAlign: sap.ui.core.VerticalAlign.Middle,
+				wrapping: true
+			}).setWidth("100%");
+			oLabel.addStyleClass("sapMTCMenuQALabel");
+
+			// Create content
+			var aControls = [];
+			var aContent = oEffectiveQuickAction.getContent();
+
+			aContent.forEach(function (oItem) {
+				if (oItem.getLayoutData()) {
+					oGridData = oItem.getLayoutData().clone();
+				} else {
+					var iSpan = Math.floor(8 / aContent.length);
+					var iSpanS = aContent.length > 2 ? 12 : Math.floor(12 / aContent.length);
+					oGridData = new GridData({spanS: iSpanS, spanM: iSpan, spanL: iSpan, spanXL: iSpan});
+				}
+				var oControl = new AssociativeControl({control: oItem.setWidth("100%")});
+				oControl.setLayoutData(oGridData);
+				aControls.push(oControl);
+			}, this);
+			oFormContainer.addFormElement(new FormElement({label: oLabel, fields: aControls}));
+		}, this);
+
+		this.addDependent(this._oForm);
+	};
+
 	return Menu;
 });

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);
@@ -37,31 +36,8 @@ 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");
 	};
 

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.101.0
 	 *
 	 * @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.101.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental

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.101.0
 	 *
 	 * @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,24 +109,34 @@ 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._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});

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.101.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._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.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental

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.101.0
 	 *
 	 * @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;
 });