Skip to content

Commit 453cbc4

Browse files
authored
DataGrid: fix filter icon when filter cell focused (T1286345) (#29892) (24_2) (#29900)
1 parent 1fdd7a3 commit 453cbc4

File tree

5 files changed

+50
-0
lines changed

5 files changed

+50
-0
lines changed

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ $generic-grid-base-cell-input-height: round($generic-base-line-height * $generic
522522
.dx-menu-item {
523523
&.dx-state-focused {
524524
background-color: transparent;
525+
color: $datagrid-menu-icon-color;
525526

526527
&::after {
527528
border: 2px solid $datagrid-focused-border-color;

0 commit comments

Comments
 (0)