Merge branch 'master' into improve-plPL-locale

mui · Jan 21, 2025 · f36d2af · f36d2af
2 parents afa093d + 4497258
commit f36d2af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/packages/x-data-grid/src/components/panel/GridPanel.tsx b/packages/x-data-grid/src/components/panel/GridPanel.tsx
@@ -125,7 +125,7 @@ const GridPanel = forwardRef<HTMLDivElement, GridPanelProps>((props, ref) => {
       {...other}
       ref={ref}
     >
-      <ClickAwayListener mouseEvent="onMouseUp" onClickAway={handleClickAway}>
+      <ClickAwayListener mouseEvent="onPointerUp" touchEvent={false} onClickAway={handleClickAway}>
         <GridPaperRoot
           className={classes.paper}
           ownerState={rootProps}

diff --git a/packages/x-data-grid/src/components/toolbar/GridToolbarColumnsButton.tsx b/packages/x-data-grid/src/components/toolbar/GridToolbarColumnsButton.tsx
@@ -70,6 +70,11 @@ const GridToolbarColumnsButton = forwardRef<HTMLButtonElement, GridToolbarColumn
           aria-controls={isOpen ? columnPanelId : undefined}
           startIcon={<rootProps.slots.columnSelectorIcon />}
           onClick={showColumns}
+          onPointerUp={(event) => {
+            if (preferencePanel.open) {
+              event.stopPropagation();
+            }
+          }}
           {...rootProps.slotProps?.baseButton}
           {...buttonProps}
           ref={ref}

diff --git a/packages/x-data-grid/src/components/toolbar/GridToolbarFilterButton.tsx b/packages/x-data-grid/src/components/toolbar/GridToolbarFilterButton.tsx
@@ -160,6 +160,11 @@ const GridToolbarFilterButton = forwardRef<HTMLButtonElement, GridToolbarFilterB
             </rootProps.slots.baseBadge>
           }
           onClick={toggleFilter}
+          onPointerUp={(event) => {
+            if (preferencePanel.open) {
+              event.stopPropagation();
+            }
+          }}
           {...rootProps.slotProps?.baseButton}
           {...buttonProps}
           ref={ref}