@openui5/sap.ui.table 1.96.2 → 1.98.0

package/src/sap/ui/table/utils/_GroupingUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Grouping...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._GroupingUtils
 	 * @private
@@ -341,7 +341,7 @@ sap.ui.define([
 				var $TreeIcon = $Row.find(".sapUiTableTreeIcon");
 
 				if (!bIsExpandable && document.activeElement === $TreeIcon[0]) {
-					GroupingUtils.TableUtils.getParentCell(oTable, $TreeIcon[0]).focus();
+					GroupingUtils.TableUtils.getParentCell(oTable, $TreeIcon[0]).trigger("focus");
 				}
 
 				$TreeIcon.toggleClass("sapUiTableTreeIconLeaf", !bIsExpandable)

package/src/sap/ui/table/utils/_HookUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/base/DataType", "sap/base/Log"], function(DataType, Log)
 	 * - There is no concept for public or protected hooks. Never expose a hook directly, only indirectly as can be seen in the examples.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

package/src/sap/ui/table/utils/_MenuUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Menu...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private
@@ -95,14 +95,21 @@ sap.ui.define([
 
 				if (Device.system.desktop || bCellHasMenuButton) {
 					MenuUtils._removeColumnHeaderCellMenu(oTable);
-					bExecuteDefault = oTable.fireColumnSelect({
-						column: oTable.getColumns()[iColumnIndex]
-					});
 
-					if (bExecuteDefault) {
-						return MenuUtils._openColumnContextMenu(oTable, oCell);
+					var oColumn = oTable.getColumns()[iColumnIndex];
+					var oPopover = oColumn.getColumnHeaderMenu();
+					if (oPopover) {
+						oPopover.openBy(oColumn);
 					} else {
-						return true; // We do not know whether the event handler opens a context menu or not, so we just assume it is done.
+						bExecuteDefault = oTable.fireColumnSelect({
+							column: oColumn
+						});
+
+						if (bExecuteDefault) {
+							return MenuUtils._openColumnContextMenu(oTable, oCell);
+						} else {
+							return true; // We do not know whether the event handler opens a context menu or not, so we just assume it is done.
+						}
 					}
 				} else {
 					return MenuUtils._applyColumnHeaderCellMenu(oTable, oCell);