Skip to content

Commit 15b71e6

Browse files
DataGrid - Fix boolean column checkboxes overlapping fixed columns (T1303134) (#32746)
(cherry picked from commit d9ca20f)
1 parent c72ee50 commit 15b71e6

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed
Loading

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/stickyColumns.ts

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,34 @@ test.meta({ browserSize: [1000, 800] })('The grid should display correctly when
232232
...defaultConfig,
233233
dataSource: [],
234234
}));
235+
236+
test('Boolean column checkboxes should display correctly when there are fixed columns (T1303134)', async (t) => {
237+
// arrange
238+
const dataGrid = new DataGrid('#container');
239+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
240+
241+
await t.expect(dataGrid.isReady()).ok();
242+
243+
// act
244+
await dataGrid.scrollTo(t, { x: 100 });
245+
246+
await testScreenshot(t, takeScreenshot, 'T1303134_boolean_column_checkboxes_with_fixed_columns.png', { element: dataGrid.element });
247+
248+
// assert
249+
await t
250+
.expect(compareResults.isValid())
251+
.ok(compareResults.errorMessages());
252+
}).before(async () => createWidget('dxDataGrid', {
253+
dataSource: [
254+
{ id: 1, text: 'item 1', enabled: false },
255+
{ id: 2, text: 'item 2', enabled: true },
256+
{ id: 3, text: 'item 3' },
257+
],
258+
keyExpr: 'id',
259+
columns: [{
260+
dataField: 'id',
261+
fixed: true,
262+
}, 'enabled', 'text'],
263+
columnWidth: 200,
264+
width: 400,
265+
}));

packages/devextreme-scss/scss/widgets/fluent/checkBox/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
font-size: $fluent-checkbox-icon-font-size;
2222

2323
&::before {
24-
z-index: 2;
24+
z-index: 1;
2525
}
2626
}
2727

packages/devextreme-scss/scss/widgets/material/checkBox/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ $material-checkbox-ripple-transition: all 0.4s cubic-bezier(0.23, 1, 0.32, 1);
8686
}
8787

8888
&::before {
89-
z-index: 2;
89+
z-index: 1;
9090
}
9191

9292
.dx-checkbox-checked & {

0 commit comments

Comments
 (0)