Skip to content

Commit d73e484

Browse files
authored
DataGrid - Vertical borders disappear from banded/multi-line headers when there are fixed columns (T1282595) (DevExpress#29993)
1 parent be0bdeb commit d73e484

File tree

7 files changed

+77
-8
lines changed

7 files changed

+77
-8
lines changed
42.7 KB
Loading
61.3 KB
Loading
42.5 KB
Loading
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
2+
import DataGrid from 'devextreme-testcafe-models/dataGrid';
3+
import { safeSizeTest } from '../../../../helpers/safeSizeTest';
4+
import { createWidget } from '../../../../helpers/createWidget';
5+
import url from '../../../../helpers/getPageUrl';
6+
import { defaultConfig } from '../helpers/data';
7+
import { changeTheme } from '../../../../helpers/changeTheme';
8+
import { Themes } from '../../../../helpers/themes';
9+
10+
const DATA_GRID_SELECTOR = '#container';
11+
12+
fixture.disablePageReloads`Sticky columns - Multi Row Header Columns`
13+
.page(url(__dirname, '../../../container.html'));
14+
15+
[Themes.genericLight, Themes.materialBlue, Themes.fluentBlue].forEach((theme) => {
16+
safeSizeTest(`The multi row header columns should have vertical borders when a column is fixed (${theme} theme) (T1282595)`, async (t) => {
17+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
18+
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
19+
20+
await t.expect(dataGrid.isReady()).ok();
21+
22+
await takeScreenshot(`multi_row_header_columns_(${theme}).png`, dataGrid.element);
23+
24+
await t
25+
.expect(compareResults.isValid())
26+
.ok(compareResults.errorMessages());
27+
}, [800, 800])
28+
.before(async () => {
29+
await changeTheme(theme);
30+
await createWidget('dxDataGrid', {
31+
...defaultConfig,
32+
columns: [
33+
{
34+
dataField: 'ID',
35+
fixed: true,
36+
},
37+
{
38+
caption: 'Order',
39+
columns: [
40+
'OrderNumber',
41+
'OrderDate',
42+
],
43+
},
44+
'SaleAmount',
45+
'Terms',
46+
],
47+
showBorders: true,
48+
});
49+
})
50+
.after(async () => {
51+
await changeTheme(Themes.genericLight);
52+
});
53+
});

packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,15 @@ $datagrid-text-stub-background-image-path: null !default;
399399
}
400400

401401
.dx-datagrid, .dx-rtl .dx-datagrid {
402-
.dx-datagrid-sticky-columns .dx-datagrid-table .dx-row {
403-
td.dx-datagrid-sticky-column-border-right {
404-
border-right: 2px solid $datagrid-border-color;
405-
}
402+
.dx-datagrid-sticky-columns .dx-datagrid-table {
403+
.dx-row {
404+
td.dx-datagrid-sticky-column-border-right {
405+
border-right: 2px solid $datagrid-border-color;
406+
}
406407

407-
td.dx-datagrid-sticky-column-border-left {
408-
border-left: 2px solid $datagrid-border-color;
408+
td.dx-datagrid-sticky-column-border-left {
409+
border-left: 2px solid $datagrid-border-color;
410+
}
409411
}
410412
}
411413
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,14 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig
735735
}
736736
}
737737
}
738+
739+
.dx-row {
740+
&.dx-header-row {
741+
> td {
742+
border-right: 1px solid $fluent-grid-base-border-color;
743+
}
744+
}
745+
}
738746
}
739747

740748
&.dx-header-multi-row:not(.dx-#{$widget-name}-sticky-columns) {
@@ -743,7 +751,6 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig
743751
.dx-row {
744752
&.dx-header-row {
745753
> td {
746-
border-right: 1px solid $fluent-grid-base-border-color;
747754
border-left: 1px solid $fluent-grid-base-border-color;
748755

749756
&:first-child {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,14 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-
710710
}
711711
}
712712
}
713+
714+
.dx-row {
715+
&.dx-header-row {
716+
> td {
717+
border-right: 1px solid $material-grid-base-border-color;
718+
}
719+
}
720+
}
713721
}
714722

715723
&.dx-header-multi-row:not(.dx-#{$widget-name}-sticky-columns) {
@@ -718,7 +726,6 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-
718726
.dx-row {
719727
&.dx-header-row {
720728
> td {
721-
border-right: 1px solid $material-grid-base-border-color;
722729
border-left: 1px solid $material-grid-base-border-color;
723730

724731
&:first-child {

0 commit comments

Comments
 (0)