Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DataGrid] Don't start edit mode when pressing Shift + Space #6380

Merged
merged 1 commit into from Oct 4, 2022
Merged

[DataGrid] Don't start edit mode when pressing Shift + Space #6380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/grid/x-data-grid/src/hooks/features/editRows/useGridCellEditing.new.ts
View file
Open in desktop
Expand Up @@ -158,6 +158,10 @@ export const useGridCellEditing = (
} else if (params.isEditable) {
let reason: GridCellEditStartReasons | undefined;

if (event.key === ' ' && event.shiftKey) {
return; // Shift + Space is used to select the row
}

if (isPrintableKey(event)) {
reason = GridCellEditStartReasons.printableKeyDown;
} else if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
Expand Down
4 changes: 4 additions & 0 deletions packages/grid/x-data-grid/src/hooks/features/editRows/useGridRowEditing.new.ts
View file
Open in desktop
Expand Up @@ -220,6 +220,10 @@ export const useGridRowEditing = (
} else if (params.isEditable) {
let reason: GridRowEditStartReasons | undefined;

if (event.key === ' ' && event.shiftKey) {
return; // Shift + Space is used to select the row
}

if (isPrintableKey(event)) {
reason = GridRowEditStartReasons.printableKeyDown;
} else if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
Expand Down
73 changes: 40 additions & 33 deletions packages/grid/x-data-grid/src/tests/selection.DataGrid.test.tsx
View file
Open in desktop
Expand Up @@ -3,7 +3,13 @@ import { expect } from 'chai';
import { spy } from 'sinon';
// @ts-expect-error Remove once the test utils are typed
import { createRenderer, fireEvent, screen, act, userEvent } from '@mui/monorepo/test/utils';
import { DataGrid, DataGridProps, GridInputSelectionModel, GridRowId } from '@mui/x-data-grid';
import {
DataGrid,
DataGridProps,
GridInputSelectionModel,
GridRowId,
GridEditModes,
} from '@mui/x-data-grid';
import {
getCell,
getRow,
Expand Down Expand Up @@ -32,16 +38,13 @@ describe('<DataGrid /> - Selection', () => {

const defaultData = getBasicGridData(4, 2);

const TestDataGridSelection = (
props: Omit<DataGridProps, 'rows' | 'columns'> &
Partial<Pick<DataGridProps, 'rows' | 'columns'>>,
) => (
const TestDataGridSelection = (props: Partial<DataGridProps>) => (
<div style={{ width: 300, height: 300 }}>
<DataGrid
{...defaultData}
{...props}
autoHeight={isJSDOM}
experimentalFeatures={{ warnIfFocusStateIsNotSynced: true }}
experimentalFeatures={{ warnIfFocusStateIsNotSynced: true, ...props.experimentalFeatures }}
/>
</div>
);
Expand Down Expand Up @@ -105,38 +108,42 @@ describe('<DataGrid /> - Selection', () => {
expect(getSelectedRowIds()).to.deep.equal([1]);
});

it('should select row on Shift + Space without starting editing the cell', () => {
const onCellEditStart = spy();
render(
<TestDataGridSelection
columns={[
{ field: 'id', type: 'number' },
{ field: 'name', editable: true },
]}
rows={[
{ id: 0, name: 'React' },
{ id: 1, name: 'Vue' },
]}
onCellEditStart={onCellEditStart}
disableSelectionOnClick
/>,
);
expect(onCellEditStart.callCount).to.equal(0);
[GridEditModes.Cell, GridEditModes.Row].forEach((editMode) => {
it(`should select row on Shift + Space without starting editing the ${editMode}`, () => {
const onCellEditStart = spy();
render(
<TestDataGridSelection
columns={[
{ field: 'id', type: 'number' },
{ field: 'name', editable: true },
]}
rows={[
{ id: 0, name: 'React' },
{ id: 1, name: 'Vue' },
]}
onCellEditStart={onCellEditStart}
experimentalFeatures={{ newEditingApi: true }}
editMode={editMode}
disableSelectionOnClick
/>,
);
expect(onCellEditStart.callCount).to.equal(0);

const cell01 = getCell(0, 1);
userEvent.mousePress(cell01);
const cell01 = getCell(0, 1);
userEvent.mousePress(cell01);

fireEvent.keyDown(cell01, { key: ' ', shiftKey: true });
fireEvent.keyDown(cell01, { key: ' ', shiftKey: true });

expect(onCellEditStart.callCount).to.equal(0);
expect(getSelectedRowIds()).to.deep.equal([0]);
expect(onCellEditStart.callCount).to.equal(0);
expect(getSelectedRowIds()).to.deep.equal([0]);

const cell11 = getCell(1, 1);
userEvent.mousePress(cell11);
fireEvent.keyDown(cell11, { key: ' ', shiftKey: true });
const cell11 = getCell(1, 1);
userEvent.mousePress(cell11);
fireEvent.keyDown(cell11, { key: ' ', shiftKey: true });

expect(onCellEditStart.callCount).to.equal(0);
expect(getSelectedRowIds()).to.deep.equal([1]);
expect(onCellEditStart.callCount).to.equal(0);
expect(getSelectedRowIds()).to.deep.equal([1]);
});
});

it(`should deselect the selected row on Shift + Space`, () => {
Expand Down