Skip to content

Commit 4497258

Browse files
authored
[DataGrid] Fix toggling preference panel from toolbar (#16274)
1 parent d10486f commit 4497258

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

packages/x-data-grid/src/components/panel/GridPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const GridPanel = forwardRef<HTMLDivElement, GridPanelProps>((props, ref) => {
125125
{...other}
126126
ref={ref}
127127
>
128-
<ClickAwayListener mouseEvent="onMouseUp" onClickAway={handleClickAway}>
128+
<ClickAwayListener mouseEvent="onPointerUp" touchEvent={false} onClickAway={handleClickAway}>
129129
<GridPaperRoot
130130
className={classes.paper}
131131
ownerState={rootProps}

packages/x-data-grid/src/components/toolbar/GridToolbarColumnsButton.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ const GridToolbarColumnsButton = forwardRef<HTMLButtonElement, GridToolbarColumn
7070
aria-controls={isOpen ? columnPanelId : undefined}
7171
startIcon={<rootProps.slots.columnSelectorIcon />}
7272
onClick={showColumns}
73+
onPointerUp={(event) => {
74+
if (preferencePanel.open) {
75+
event.stopPropagation();
76+
}
77+
}}
7378
{...rootProps.slotProps?.baseButton}
7479
{...buttonProps}
7580
ref={ref}

packages/x-data-grid/src/components/toolbar/GridToolbarFilterButton.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ const GridToolbarFilterButton = forwardRef<HTMLButtonElement, GridToolbarFilterB
160160
</rootProps.slots.baseBadge>
161161
}
162162
onClick={toggleFilter}
163+
onPointerUp={(event) => {
164+
if (preferencePanel.open) {
165+
event.stopPropagation();
166+
}
167+
}}
163168
{...rootProps.slotProps?.baseButton}
164169
{...buttonProps}
165170
ref={ref}

0 commit comments

Comments
 (0)