Merge branch 'v7.x' into cherry-pick-15850

mui · Dec 13, 2024 · a336c53 · a336c53
2 parents 764f749 + c668591
commit a336c53
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/x-data-grid/src/components/cell/GridActionsCell.tsx b/packages/x-data-grid/src/components/cell/GridActionsCell.tsx
@@ -121,6 +121,13 @@ function GridActionsCell(props: GridActionsCellProps) {
   const hideMenu = () => {
     setOpen(false);
   };
+  const toggleMenu = () => {
+    if (open) {
+      hideMenu();
+    } else {
+      showMenu();
+    }
+  };
 
   const handleTouchRippleRef =
     (index: string | number) => (instance: TouchRippleActions | null) => {
@@ -213,7 +220,7 @@ function GridActionsCell(props: GridActionsCellProps) {
           aria-controls={open ? menuId : undefined}
           role="menuitem"
           size="small"
-          onClick={showMenu}
+          onClick={toggleMenu}
           touchRippleRef={handleTouchRippleRef(buttonId)}
           tabIndex={focusedButtonIndex === iconButtons.length ? tabIndex : -1}
           {...rootProps.slotProps?.baseIconButton}