Skip to content

DataGrid: Fix an issue in the setAria method that occurred when the value was undefined #32274

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
Alyar666 merged 1 commit into from
Jan 22, 2026
Merged

DataGrid: Fix an issue in the setAria method that occurred when the value was undefined #32274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export const renderSummaryCell = function (cell, options, setAria) {
const $summaryItems: any = [];

if (!column.command && summaryItems) {
for (let i = 0; i < summaryItems.length; i++) {
const summaryItem = summaryItems[i];
for (const summaryItem of summaryItems) {
const text = gridCore.getSummaryText(summaryItem, options.summaryTexts);
const $summaryItemElement = $('<div>')
.css('textAlign', summaryItem.alignment || column.alignment)
Expand All @@ -55,7 +54,7 @@ export const renderSummaryCell = function (cell, options, setAria) {
.toggleClass(DATAGRID_GROUP_TEXT_CONTENT_CLASS, options.rowType === 'group')
.text(text);

setAria('label', `${column.caption} ${text}`, $summaryItemElement);
setAria('label', `${column.caption ?? ''} ${text ?? ''}`, $summaryItemElement);
$summaryItems.push($summaryItemElement);
}
$cell.append($summaryItems);
Expand Down
6 changes: 5 additions & 1 deletion packages/devextreme/js/__internal/grids/grid_core/m_modules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Callbacks from '@js/core/utils/callbacks';
// @ts-expect-error
import { grep } from '@js/core/utils/common';
import { each } from '@js/core/utils/iterator';
import { isFunction } from '@js/core/utils/type';
import { isDefined, isFunction } from '@js/core/utils/type';
import { hasWindow } from '@js/core/utils/window';
import errors from '@js/ui/widget/ui.errors';

Expand Down Expand Up @@ -150,6 +150,10 @@ export class ModuleItem {
value: string | number | boolean | undefined,
$target: dxElementWrapper,
) {
if (!isDefined(value)) {
return;
}

const target = $target.get(0);
const prefix = name !== 'role' && name !== 'id' ? 'aria-' : '';
const normalizedValue = String(value).replace(/\s+/g, ' ').trim();
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ export const rowsViewSelectionExtenderMixin = (Base: ModuleType<RowsView>) => cl
$row
.toggleClass(ROW_SELECTION_CLASS, isSelected === undefined ? false : isSelected)
.find(`.${SELECT_CHECKBOX_CLASS}`).dxCheckBox('option', 'value', isSelected);
that.setAria('selected', isSelected, $row);
that.setAria('selected', String(isSelected), $row);
}
}
});
Expand Down Expand Up @@ -949,7 +949,7 @@ export const rowsViewSelectionExtenderMixin = (Base: ModuleType<RowsView>) => cl

const selectionMode = this.option(SELECTION_MODE);
if (selectionMode !== 'none') {
this.setAria('selected', isSelected, $row);
this.setAria('selected', String(isSelected), $row);
}
}

Expand Down
20 changes: 10 additions & 10 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,9 @@ QUnit.module('Grid view', {
],
totalItem: {
summaryCells: [
{ summaryType: 'count', value: 100 },
{ summaryType: 'min', value: 0 },
{ summaryType: 'max', value: 120001 }
[{ summaryType: 'count', value: 100 }],
[{ summaryType: 'min', value: 0 }],
[{ summaryType: 'max', value: 120001 }]
]
}
})
Expand Down Expand Up @@ -592,7 +592,7 @@ QUnit.module('Grid view', {
],
totalItem: {
summaryCells: [
{ summaryType: 'count', value: 100 }
[{ summaryType: 'count', value: 100 }]
]
}
})
Expand Down Expand Up @@ -1626,9 +1626,9 @@ QUnit.module('Synchronize columns', {
items: [{ values: [''] }],
totalItem: {
summaryCells: [
{ summaryType: 'count', value: 100 },
{ summaryType: 'min', value: 0 },
{ summaryType: 'max', value: 120001 }
[{ summaryType: 'count', value: 100 }],
[{ summaryType: 'min', value: 0 }],
[{ summaryType: 'max', value: 120001 }]
]
}
})
Expand Down Expand Up @@ -1663,9 +1663,9 @@ QUnit.module('Synchronize columns', {
items: [{ values: [''] }],
totalItem: {
summaryCells: [
{ summaryType: 'count', value: 100 },
{ summaryType: 'min', value: 0 },
{ summaryType: 'max', value: 120001 }
[{ summaryType: 'count', value: 100 }],
[{ summaryType: 'min', value: 0 }],
[{ summaryType: 'max', value: 120001 }]
]
}
})
Expand Down
Loading