Skip to content

T1303892 - DataGrid - Drag icon is vertically misaligned if column fixing is enabled in Generic Themes #34315

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

Merged
bit-byte0 merged 5 commits into from
Jul 17, 2026
Merged

T1303892 - DataGrid - Drag icon is vertically misaligned if column fixing is enabled in Generic Themes #34315

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
4494ef8
fix(dataGrid): center drag icon vertically with fixed columns
bit-byte0 Jul 15, 2026
1ba4ddb
test(dataGrid): add T1303892 etalons from CI rendering
bit-byte0 Jul 15, 2026
3439d89
fix(dataGrid): keep fluent sticky row height stable on focus and sele…
bit-byte0 Jul 16, 2026
dc1d792
test(dataGrid): update fluent etalons for stable focused row height
bit-byte0 Jul 16, 2026
0ae7946
fix(dataGrid): center drag icon vertically in fluent sticky focused rows
bit-byte0 Jul 16, 2026
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
43 changes: 43 additions & 0 deletions apps/react-storybook/stories/examples/datagrid/DataGrid.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,49 @@ export const AiColumn: Story = {
},
};

export const RowDraggingWithFixedColumns: Story = {
args: {
showBorders: true,
showRowLines: false,
rowDragging: {
showDragIcons: true,
},
},
render: ({ showBorders, showRowLines, rowDragging }) => {
const [data, setData] = useState(countries);

const onReorder = useCallback((e: DataGridTypes.RowDraggingReorderEvent) => {
setData((items) => {
const reorderedItems = [...items];
const [movedItem] = reorderedItems.splice(e.fromIndex, 1);

reorderedItems.splice(e.toIndex, 0, movedItem);

return reorderedItems;
});
}, []);

return (
<DataGrid
dataSource={data}
keyExpr="ID"
height={440}
showBorders={showBorders}
showRowLines={showRowLines}
columnFixing={{ enabled: true }}
focusedRowEnabled={true}
selection={{ mode: 'single' }}
rowDragging={{
allowReordering: true,
showDragIcons: rowDragging?.showDragIcons,
onReorder,
}}
columns={['Country', 'Area', 'Population_Total', 'GDP_Total']}
Comment thread
bit-byte0 marked this conversation as resolved.
/>
);
},
};

export const ColumnChooserStory: Story = {
name: 'ColumnChooser',
argTypes: columnChooserArgTypes,
Expand Down
Binary file modified ...rid_selected_focused_edit_state_with_showRowLines=false (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../sticky/common/etalons/drag-icons-focused-selected-rows (fluent.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Grid/sticky/common/etalons/drag-icons-focused-selected-rows (generic.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ticky/common/etalons/drag-icons-focused-selected-rows (material.blue.light).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withDragAndDrop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,42 @@ test('Fixed columns should work when drag and drop rows are enabled', async (t)
columns[9].fixedPosition = 'right';
},
}));

test.meta({
browserSize: [900, 800],
themes: ['generic.light', 'material.blue.light'],
})('Drag icons keep vertical centering in focused and selected rows with fixed columns (T1303892)', async (t) => {
Comment thread
bit-byte0 marked this conversation as resolved.
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

await t.expect(dataGrid.isReady()).ok();

await t.click(dataGrid.getDataCell(1, 1).element);

await testScreenshot(t, takeScreenshot, 'drag-icons-focused-selected-rows.png', { element: dataGrid.element });

await t
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => createWidget('dxDataGrid', {
dataSource: getData(10, 5),
keyExpr: 'field_0',
width: 500,
columnFixing: {
enabled: true,
},
focusedRowEnabled: true,
selection: {
mode: 'single',
},
showRowLines: false,
showColumnHeaders: true,
columnAutoWidth: true,
rowDragging: {
allowReordering: true,
},
scrolling: {
showScrollbar: 'never',
},
}));
Comment thread
bit-byte0 marked this conversation as resolved.
16 changes: 13 additions & 3 deletions packages/devextreme-scss/scss/widgets/fluent/gridBase/layout/cell.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
}

// (0,5,1)
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-top: $fluent-grid-base-cell-vertical-padding + 1px;
}

Expand All @@ -319,6 +319,16 @@
padding-top: $fluent-grid-base-cell-vertical-padding - 1px;
}

// (0,6,1)
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row.dx-row-focused:not(.dx-row-lines, .dx-edit-row, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-top: $fluent-grid-base-cell-vertical-padding + 1px;
}
Comment thread
bit-byte0 marked this conversation as resolved.

// (0,6,1)
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row.dx-row-focused:not(.dx-row-lines, .dx-edit-row, .dx-row-removed) > td.dx-command-drag {
padding-top: 1px;
}

// (0,6,1)
.dx-#{$widget-name}-headers.dx-header-multi-row .dx-#{$widget-name}-content .dx-#{$widget-name}-table .dx-row.dx-header-row > td {
padding-top: 12px;
Expand All @@ -337,8 +347,8 @@
}

// (0,8,1) T1303478
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-bottom: $fluent-grid-base-cell-vertical-padding - 1px;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/generic/gridBase/layout/cell.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@
}

// (0,7,1)
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-top: $generic-grid-base-cell-padding + 1px;
}

// (0,7,1) T1303478
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-bottom: $generic-grid-base-cell-padding - 1px;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/material/gridBase/layout/cell.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,13 @@
}

// (0,5,1)
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-data-row:not(.dx-row-lines, .dx-edit-row, .dx-selection, .dx-row-focused, .dx-row-removed) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-top: $material-grid-base-cell-vertical-padding + 1px;
}

// (0,6,1) T1303478
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell) {
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-selection:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag),
.dx-#{$widget-name}-rowsview.dx-#{$widget-name}-sticky-columns .dx-row.dx-row-focused:not(.dx-edit-row):not(.dx-row-lines):not(.dx-group-row) > td:not(.dx-editor-cell, .dx-master-detail-cell, .dx-command-drag) {
padding-bottom: $material-grid-base-cell-vertical-padding - 1px;
}

Expand Down
Loading