Skip to content

Commit 28dcc3f

Browse files
authored
DataGrid: fix filter icon when filter cell focused (T1286345) (#29892) (24_1) (#29901)
1 parent 59dce4e commit 28dcc3f

File tree

5 files changed

+49
-0
lines changed

5 files changed

+49
-0
lines changed

e2e/testcafe-devextreme/tests/dataGrid/accessibility/contrast.ts

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,51 @@ fixture.disablePageReloads`DataGrid - contrast`
5454
},
5555
);
5656
});
57+
58+
[
59+
Themes.genericLight,
60+
Themes.fluentBlue,
61+
Themes.materialBlue,
62+
].forEach((theme) => {
63+
test('DataGrid - Filter icon should remain visible when it\'s focused', async (t) => {
64+
const dataGrid = new DataGrid('#container');
65+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
66+
67+
await t
68+
.expect(dataGrid.isReady())
69+
.ok();
70+
71+
const searchIconContainer = dataGrid
72+
.getHeaders()
73+
.getFilterRow()
74+
.getFilterCell(1)
75+
.getSearchIcon()
76+
.element;
77+
78+
await t
79+
.click(dataGrid.getFilterCell(0))
80+
.pressKey('tab')
81+
.expect(searchIconContainer.focused)
82+
.ok();
83+
84+
await t
85+
.expect(await takeScreenshot(`T1286345-datagrid-menu-icon-when-focused-${theme}.png`, dataGrid.element))
86+
.ok()
87+
.expect(compareResults.isValid())
88+
.ok(compareResults.errorMessages());
89+
}).before(
90+
async () => {
91+
await changeTheme(theme);
92+
await createWidget('dxDataGrid', {
93+
dataSource: getData(2, 2),
94+
filterRow: {
95+
visible: true,
96+
},
97+
});
98+
},
99+
).after(
100+
async () => {
101+
await changeTheme(Themes.genericLight);
102+
},
103+
);
104+
});
5.08 KB
Loading
5.43 KB
Loading
5.37 KB
Loading

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ $generic-grid-base-group-panel-message-line-height: $generic-button-text-line-he
490490
.dx-menu-item {
491491
&.dx-state-focused {
492492
background-color: transparent;
493+
color: $datagrid-menu-icon-color;
493494

494495
&::after {
495496
border: 2px solid $datagrid-focused-border-color;

0 commit comments

Comments
 (0)