@openui5/sap.ui.table 1.117.1 → 1.119.0

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

@@ -39,7 +39,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.117.1
+	 * @version 1.119.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private
@@ -68,19 +68,14 @@ sap.ui.define([
 		 * and the column context menu is opened.
 		 *
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
-		 * @param {jQuery | HTMLElement} oElement The header or content cell, or an element inside, for which to open the context menu.
-		 * @param {jQuery.Event} [oEvent] The event object.
+		 * @param {jQuery.Event} oEvent The event object.
 		 * @returns {boolean} Whether a context menu was opened.
 		 * @see _openColumnContextMenu
 		 * @see _openContentCellContextMenu
 		 * @see _applyColumnHeaderCellMenu
 		 */
-		openContextMenu: function(oTable, oElement, oEvent) {
-			if (!oTable || !oElement) {
-				return false;
-			}
-
-			var $Cell = MenuUtils.TableUtils.getCell(oTable, oElement);
+		openContextMenu: function(oTable, oEvent) {
+			var $Cell = MenuUtils.TableUtils.getCell(oTable, oEvent.target);
 			var oCell = $Cell ? $Cell[0] : null;
 			var oCellInfo = MenuUtils.TableUtils.getCellInfo(oCell);
 			var iColumnIndex = oCellInfo.columnIndex;
@@ -88,9 +83,7 @@ sap.ui.define([
 			var bExecuteDefault = true;
 
 			if (oCellInfo.isOfType(MenuUtils.TableUtils.CELLTYPE.COLUMNHEADER)) {
-				var oColumn = oTable.getColumns()[iColumnIndex];
-
-				oColumn._openHeaderMenu(oCell);
+				oTable.getColumns()[iColumnIndex]._openHeaderMenu(oCell);
 				return true;
 
 			} else if (oCellInfo.isOfType(MenuUtils.TableUtils.CELLTYPE.ANYCONTENTCELL)) {
@@ -103,6 +96,9 @@ sap.ui.define([
 					oRowBindingContext = oRow.getBindingContext(oRowBindingInfo.model);
 				}
 
+				/**
+				 * @deprecated As of version 1.21.0
+				 */
 				if (iColumnIndex >= 0) {
 					bExecuteDefault = oTable.fireCellContextmenu({
 						rowIndex: oRow.getIndex(),
@@ -114,21 +110,26 @@ sap.ui.define([
 					});
 				}
 
-				// fire beforeOpenContextMenu event if the default is not prevented in the cellContextMenu event
-				if (bExecuteDefault) {
-					var oRowContextMenu = oTable.getContextMenu();
+				/**
+				 * @deprecated As of version 1.21.0
+				 */
+				if (!bExecuteDefault) {
+					return true;
+				}
 
-					if (oRowContextMenu && oRowBindingInfo) {
-						oRowContextMenu.setBindingContext(oRowBindingContext, oRowBindingInfo.model);
-					}
+				// fire beforeOpenContextMenu event
+				var oRowContextMenu = oTable.getContextMenu();
 
-					bExecuteDefault = oTable.fireBeforeOpenContextMenu({
-						rowIndex: oRow.getIndex(),
-						columnIndex: oRowColCell.column ? iColumnIndex : null,
-						contextMenu: oRowContextMenu
-					});
+				if (oRowContextMenu && oRowBindingInfo) {
+					oRowContextMenu.setBindingContext(oRowBindingContext, oRowBindingInfo.model);
 				}
 
+				bExecuteDefault = oTable.fireBeforeOpenContextMenu({
+					rowIndex: oRow.getIndex(),
+					columnIndex: oRowColCell.column ? iColumnIndex : null,
+					contextMenu: oRowContextMenu
+				});
+
 				if (bExecuteDefault) {
 					return MenuUtils._openContentCellContextMenu(oTable, oCell, oEvent);
 				} else {
@@ -147,7 +148,7 @@ sap.ui.define([
 		 *
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
 		 * @param {HTMLElement} oCell A content cell.
-		 * @param {jQuery.Event} [oEvent] The event object.
+		 * @param {jQuery.Event} oEvent The event object.
 		 * @returns {boolean} Whether a context menu was opened.
 		 * @private
 		 * @see _openCustomContentCellContextMenu
@@ -175,7 +176,7 @@ sap.ui.define([
 		 *
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
 		 * @param {HTMLElement} oCell A content cell.
-		 * @param {jQuery.Event} [oEvent] The event object.
+		 * @param {jQuery.Event} oEvent The event object.
 		 * @returns {boolean} Whether a context menu was opened.
 		 * @private
 		 */
@@ -187,16 +188,7 @@ sap.ui.define([
 				return false;
 			}
 
-			var oContextMenu = oTable.getContextMenu();
-			MenuUtils._closeDefaultContentCellContextMenu(oTable);
-
-			if (oEvent) {
-				oContextMenu.openAsContextMenu(oEvent, oCell);
-			} else if (typeof oContextMenu.openBy === "function") {
-				oContextMenu.openBy(oCell);
-			} else {
-				oContextMenu.open(null, oCell, Popup.Dock.BeginTop, Popup.Dock.BeginBottom, oCell);
-			}
+			oTable.getContextMenu().openAsContextMenu(oEvent, oCell);
 
 			return true;
 		},
@@ -209,7 +201,7 @@ sap.ui.define([
 		 *
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
 		 * @param {HTMLElement} oCell A content cell.
-		 * @param {jQuery.Event} [oEvent] The event object.
+		 * @param {jQuery.Event} oEvent The event object.
 		 * @returns {boolean} Whether a context menu was opened.
 		 * @private
 		 */
@@ -255,13 +247,7 @@ sap.ui.define([
 				return false;
 			}
 
-			MenuUtils._closeCustomContentCellContextMenu(oTable);
-
-			if (oEvent) {
-				oTable._oCellContextMenu.openAsContextMenu(oEvent, oCell);
-			} else {
-				oTable._oCellContextMenu.open(null, oCell, Popup.Dock.BeginTop, Popup.Dock.BeginBottom, oCell);
-			}
+			oTable._oCellContextMenu.openAsContextMenu(oEvent, oCell);
 
 			return true;
 		},
@@ -274,7 +260,7 @@ sap.ui.define([
 		 * @see _closeCustomContentCellContextMenu
 		 * @see _closeDefaultContentCellContextMenu
 		 */
-		_closeContentCellContextMenu: function(oTable) {
+		closeContentCellContextMenu: function(oTable) {
 			MenuUtils._closeCustomContentCellContextMenu(oTable);
 			MenuUtils._closeDefaultContentCellContextMenu(oTable);
 		},
@@ -286,12 +272,7 @@ sap.ui.define([
 		 * @private
 		 */
 		_closeCustomContentCellContextMenu: function(oTable) {
-			var oCustomMenu = oTable.getContextMenu();
-			var bCustomContextMenuOpen = oCustomMenu ? oCustomMenu.bOpen : false;
-
-			if (bCustomContextMenuOpen) {
-				oCustomMenu.close();
-			}
+			oTable.getContextMenu()?.close?.(); // sap.ui.core.IContextMenu does not contain "close".
 		},
 
 		/**
@@ -301,12 +282,7 @@ sap.ui.define([
 		 * @private
 		 */
 		_closeDefaultContentCellContextMenu: function(oTable) {
-			var oDefaultMenu = oTable._oCellContextMenu;
-			var bDefaultMenuOpen = oDefaultMenu ? oDefaultMenu.bOpen : false;
-
-			if (bDefaultMenuOpen) {
-				oDefaultMenu.close();
-			}
+			oTable._oCellContextMenu?.close();
 		},
 
 		/**