Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ test('Header fields should have correct aria-label', async (t) => {
.expect(columnHeader.getHeaderFilterIcon(1).ariaLabel)
.eql('Show filter options for column \'Column2\'')
.expect(filterHeader.getHeaderFilterIcon(0).ariaLabel)
.eql('Show filter options for column \'Column3\'');
.eql('Show filter options for column \'Column3\'')
.expect(columnHeader.getHeaderFilterIcon(2).ariaLabel)
.notContains('undefined');
}).before(async () => {
await createWidget('dxPivotGrid', {
allowFiltering: true,
Expand All @@ -43,6 +45,8 @@ test('Header fields should have correct aria-label', async (t) => {
}, {
dataField: 'column2',
area: 'column',
}, {
area: 'column',
}, {
dataField: 'column3',
area: 'filter',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ export class FieldChooserBase extends mixinWidget {

renderField(field, showColumnLines) {
const that = this;
const caption = field.caption ?? field.dataField ?? '';
const $fieldContent = $(DIV).addClass(CLASSES.area.fieldContent)
.text(field.caption || field.dataField);
.text(caption);
const $fieldElement = $(DIV)
.addClass(CLASSES.area.field)
.addClass(CLASSES.area.box)
Expand All @@ -191,7 +192,7 @@ export class FieldChooserBase extends mixinWidget {
alignment: that.option('rtlEnabled') ? 'right' : 'left',
sortOrder: field.sortOrder === 'desc' ? 'desc' : 'asc',
allowSorting: field.allowSorting,
caption: field.caption || field.dataField,
caption,
},
showColumnLines,
});
Expand All @@ -205,7 +206,7 @@ export class FieldChooserBase extends mixinWidget {
filterValues: mainGroupField.filterValues,
allowFiltering: mainGroupField.allowFiltering && !field.groupIndex,
allowSorting: field.allowSorting,
caption: field.caption || field.dataField,
caption,
},
showColumnLines,
});
Expand Down
Loading