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

[DataGrid] Remove old string class constants #2788

Merged
merged 5 commits into from
Oct 12, 2021
Merged

[DataGrid] Remove old string class constants #2788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
986c16d
[DataGrid] Remove old string class constants
flaviendelangle Oct 6, 2021
a3e5024
Prettier
flaviendelangle Oct 6, 2021
ccb3575
Fix
flaviendelangle Oct 12, 2021
59ad575
Code review
flaviendelangle Oct 12, 2021
8640fdb
Merge branch 'next' into classes
flaviendelangle Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions packages/grid/_modules_/grid/constants/cssClassesConstants.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/grid/_modules_/grid/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from './envConstants';
export * from './eventsConstants';
export * from './cssClassesConstants';
export * from './localeTextConstants';
7 changes: 2 additions & 5 deletions packages/grid/x-grid/src/tests/columnHeaders.DataGridPro.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ import {
waitFor,
} from 'test/utils';
import { expect } from 'chai';
import {
GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS,
DataGridPro,
} from '@mui/x-data-grid-pro';
import { gridClasses, DataGridPro } from '@mui/x-data-grid-pro';
import { getColumnHeaderCell } from 'test/utils/helperFn';

const isJSDOM = /jsdom/.test(window.navigator.userAgent);
Expand Down Expand Up @@ -108,7 +105,7 @@ describe('<DataGridPro /> - Column Headers', () => {
await waitFor(() => expect(screen.queryByRole('menu')).not.to.equal(null));

const separator = columnToResizeCell.querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
`.${gridClasses['columnSeparator--resizable']}`,
);
fireEvent.mouseDown(separator);
await waitFor(() => expect(screen.queryByRole('menu')).to.equal(null));
Expand Down
26 changes: 9 additions & 17 deletions packages/grid/x-grid/src/tests/columns.DataGridPro.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
GridComponentProps,
useGridApiRef,
DataGridPro,
GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS,
gridClasses,
} from '@mui/x-data-grid-pro';
import { getColumnHeaderCell, getCell } from 'test/utils/helperFn';

Expand Down Expand Up @@ -101,9 +101,7 @@ describe('<DataGridPro /> - Columns', () => {

it('should allow to resize columns with the mouse', () => {
render(<Test columns={columns} />);
const separator = document.querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
);
const separator = document.querySelector(`.${gridClasses['columnSeparator--resizable']}`);
fireEvent.mouseDown(separator, { clientX: 100 });
fireEvent.mouseMove(separator, { clientX: 110, buttons: 1 });
fireEvent.mouseUp(separator);
Expand All @@ -119,9 +117,7 @@ describe('<DataGridPro /> - Columns', () => {
this.skip();
}
render(<Test columns={columns} />);
const separator = document.querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
)!;
const separator = document.querySelector(`.${gridClasses['columnSeparator--resizable']}`)!;
const now = Date.now();
fireEvent.touchStart(separator, {
changedTouches: [new Touch({ identifier: now, target: separator, clientX: 100 })],
Expand All @@ -141,9 +137,7 @@ describe('<DataGridPro /> - Columns', () => {
it('should call onColumnResize during resizing', () => {
const onColumnResize = spy();
render(<Test onColumnResize={onColumnResize} columns={columns} />);
const separator = document.querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
);
const separator = document.querySelector(`.${gridClasses['columnSeparator--resizable']}`);
fireEvent.mouseDown(separator, { clientX: 100 });
fireEvent.mouseMove(separator, { clientX: 110, buttons: 1 });
fireEvent.mouseMove(separator, { clientX: 120, buttons: 1 });
Expand All @@ -156,9 +150,7 @@ describe('<DataGridPro /> - Columns', () => {
it('should call onColumnWidthChange after resizing', () => {
const onColumnWidthChange = spy();
render(<Test onColumnWidthChange={onColumnWidthChange} columns={columns} />);
const separator = document.querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
);
const separator = document.querySelector(`.${gridClasses['columnSeparator--resizable']}`);
fireEvent.mouseDown(separator, { clientX: 100 });
fireEvent.mouseMove(separator, { clientX: 110, buttons: 1 });
fireEvent.mouseMove(separator, { clientX: 120, buttons: 1 });
Expand Down Expand Up @@ -212,7 +204,7 @@ describe('<DataGridPro /> - Columns', () => {
expect(getColumnHeaderCell(1)).toHaveInlineStyle({ width: '100px' });

const separator = getColumnHeaderCell(1).querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
`.${gridClasses['columnSeparator--resizable']}`,
);

fireEvent.mouseDown(separator, { clientX: 100 });
Expand Down Expand Up @@ -260,7 +252,7 @@ describe('<DataGridPro /> - Columns', () => {
expect(getColumnHeaderCell(1)).toHaveInlineStyle({ width: '100px' });

const separator = getColumnHeaderCell(1).querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
`.${gridClasses['columnSeparator--resizable']}`,
);

fireEvent.mouseDown(separator, { clientX: 100 });
Expand Down Expand Up @@ -308,7 +300,7 @@ describe('<DataGridPro /> - Columns', () => {
expect(getColumnHeaderCell(1)).toHaveInlineStyle({ width: '100px' });

const separator = getColumnHeaderCell(1).querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
`.${gridClasses['columnSeparator--resizable']}`,
);

fireEvent.mouseDown(separator, { clientX: 100 });
Expand All @@ -333,7 +325,7 @@ describe('<DataGridPro /> - Columns', () => {
expect(getColumnHeaderCell(0)).toHaveInlineStyle({ width: '198px' });

const separator = getColumnHeaderCell(0).querySelector(
`.${GRID_COLUMN_HEADER_SEPARATOR_RESIZABLE_CSS_CLASS}`,
`.${gridClasses['columnSeparator--resizable']}`,
);

fireEvent.mouseDown(separator, { clientX: 200 });
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-grid/src/tests/events.DataGridPro.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {
GridRowsProp,
GridColumns,
GridEvents,
GRID_CELL_CSS_CLASS,
GridApiRef,
gridClasses,
} from '@mui/x-data-grid-pro';
import { getCell, getColumnHeaderCell, getRow } from 'test/utils/helperFn';
import { spy } from 'sinon';
Expand Down Expand Up @@ -237,7 +237,7 @@ describe('<DataGridPro /> - Events Params', () => {
const cell = getCell(1, 1);
fireEvent.doubleClick(cell);
expect(handleCellDoubleClick.callCount).to.equal(1);
expect(cell).not.to.have.class(`${GRID_CELL_CSS_CLASS}--editing`);
expect(cell).not.to.have.class(gridClasses['row--editing']);
});

it('should allow to prevent the default behavior while allowing the event to propagate', () => {
Expand Down
11 changes: 3 additions & 8 deletions packages/grid/x-grid/src/tests/reorder.DataGridPro.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ import {
getCell,
raf,
} from 'test/utils/helperFn';
import {
GridApiRef,
useGridApiRef,
DataGridPro,
GRID_COLUMN_HEADER_DRAGGING_CSS_CLASS,
} from '@mui/x-data-grid-pro';
import { GridApiRef, useGridApiRef, DataGridPro, gridClasses } from '@mui/x-data-grid-pro';
import { useData } from 'storybook/src/hooks/useData';
import { spy } from 'sinon';

Expand Down Expand Up @@ -200,7 +195,7 @@ describe('<DataGridPro /> - Reorder', () => {
const columnHeaderDraggableContainer = columnHeader.firstChild as HTMLElement;
fireEvent.dragStart(columnHeaderDraggableContainer.firstChild);
expect(
columnHeaderDraggableContainer.classList.contains(GRID_COLUMN_HEADER_DRAGGING_CSS_CLASS),
columnHeaderDraggableContainer.classList.contains(gridClasses['columnHeader--dragging']),
).to.equal(false);
});

Expand Down Expand Up @@ -331,7 +326,7 @@ describe('<DataGridPro /> - Reorder', () => {
fireEvent.dragStart(dragCol);

expect(dragCol).to.have.attribute('draggable', 'false');
expect(dragCol).not.to.have.class(GRID_COLUMN_HEADER_DRAGGING_CSS_CLASS);
expect(dragCol).not.to.have.class(gridClasses['columnHeader--dragging']);

fireEvent.dragEnter(targetCol);
const dragOverEvent = createDragOverEvent(targetCol);
Expand Down