[DataGrid] Deselect selected row on click (#15509)

Co-authored-by: Andrew Cherniavskyi <[email protected]>
mui · Dec 10, 2024 · 1b53854 · 1b53854
1 parent 3a67270
commit 1b53854
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/x-data-grid/src/hooks/features/rowSelection/useGridRowSelection.ts b/packages/x-data-grid/src/hooks/features/rowSelection/useGridRowSelection.ts
@@ -534,13 +534,13 @@ export const useGridRowSelection = (
       const isMultipleSelectionDisabled =
         !checkboxSelection && !hasCtrlKey && !isKeyboardEvent(event);
       const resetSelection = !canHaveMultipleSelection || isMultipleSelectionDisabled;
+      const selectedRowsCount = apiRef.current.getSelectedRows().size;
 
-      const isSelected = apiRef.current.isRowSelected(id);
-
-      if (resetSelection) {
-        apiRef.current.selectRow(id, !isMultipleSelectionDisabled ? !isSelected : true, true);
+      if (canHaveMultipleSelection && selectedRowsCount > 1 && !hasCtrlKey) {
+        apiRef.current.selectRow(id, true, resetSelection);
       } else {
-        apiRef.current.selectRow(id, !isSelected, false);
+        const isSelected = apiRef.current.isRowSelected(id);
+        apiRef.current.selectRow(id, !isSelected, resetSelection);
       }
     },
     [apiRef, canHaveMultipleSelection, checkboxSelection],

diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx
@@ -91,12 +91,12 @@ describe('<DataGrid /> - Row selection', () => {
       expect(getSelectedRowIds()).to.deep.equal([1]);
     });
 
-    it(`should not deselect the selected row on click WITHOUT ctrl or meta pressed`, () => {
+    it(`should deselect the selected row on click`, () => {
       render(<TestDataGridSelection />);
       fireEvent.click(getCell(0, 0));
       expect(getSelectedRowIds()).to.deep.equal([0]);
       fireEvent.click(getCell(0, 0));
-      expect(getSelectedRowIds()).to.deep.equal([0]);
+      expect(getSelectedRowIds()).to.deep.equal([]);
     });
 
     ['metaKey', 'ctrlKey'].forEach((key) => {