Skip to content

Commit 1945d65

Browse files
authored
DataGrid - In the Fluent theme, a padding is set when Toolbar is not visible (T1261773) (#28551)
1 parent c967e9e commit 1945d65

File tree

13 files changed

+32
-45
lines changed

13 files changed

+32
-45
lines changed
16.6 KB
Loading
15.7 KB
Loading
16 KB
Loading

e2e/testcafe-devextreme/tests/dataGrid/headerPanel.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,33 @@ test('Toolbar should not reset its widget values when changing the disabled prop
180180
}],
181181
},
182182
}));
183+
184+
[
185+
Themes.genericLight,
186+
Themes.materialBlue,
187+
Themes.fluentBlue,
188+
].forEach((theme) => {
189+
test(`Invisible toolbar doesn't have additional paddings (T1261773) in ${theme}`, async (t) => {
190+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
191+
const dataGrid = new DataGrid('#container');
192+
193+
await t
194+
.expect(await takeScreenshot(`invisible-toolbar-buttons-${theme}.png`, dataGrid.element))
195+
.ok()
196+
.expect(compareResults.isValid())
197+
.ok(compareResults.errorMessages());
198+
}).before(async () => {
199+
await changeTheme(theme);
200+
201+
return createWidget('dxDataGrid', {
202+
dataSource: getData(5, 3),
203+
keyExpr: 'field_0',
204+
toolbar: {
205+
items: ['columnChooserButton'],
206+
visible: false,
207+
},
208+
});
209+
}).after(async () => {
210+
await changeTheme(Themes.genericLight);
211+
});
212+
});

packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ExportHeaderPanelEx
886886
this.setToolbarItemDisabled('exportButton', disabled);
887887
});
888888
}
889-
890-
public isVisible() {
891-
return super.isVisible() || this._isExportButtonVisible();
892-
}
893889
};
894890

895891
dataGridCore.registerModule('export', {

packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,6 @@ export const GroupingHeaderPanelExtender = (Base: ModuleType<HeaderPanel>) => cl
584584
return items;
585585
}
586586

587-
public isVisible() {
588-
return super.isVisible() || this._isGroupPanelVisible();
589-
}
590-
591587
public hasGroupedColumns(): boolean {
592588
return this._isGroupPanelVisible() && !!this.getColumns().length;
593589
}

packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -579,13 +579,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ColumnChooserHeader
579579
super.optionChanged(args);
580580
}
581581
}
582-
583-
public isVisible() {
584-
const that = this;
585-
const columnChooserEnabled = that.option('columnChooser.enabled')!;
586-
587-
return super.isVisible() || columnChooserEnabled;
588-
}
589582
};
590583

591584
const columns = (Base: ModuleType<ColumnsController>) => class ColumnsChooserColumnsControllerExtender extends Base {

packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,13 +2873,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class HeaderPanelEditingE
28732873

28742874
return editButtonItems.concat(items);
28752875
}
2876-
2877-
public isVisible() {
2878-
const editingOptions = this._editingController.option('editing');
2879-
2880-
// @ts-expect-error
2881-
return super.isVisible() || editingOptions?.allowAdding;
2882-
}
28832876
};
28842877

28852878
export const editingModule = {

packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type { DeferredObj } from '@js/core/utils/deferred';
1212
import { Deferred, when } from '@js/core/utils/deferred';
1313
import { isElementInDom } from '@js/core/utils/dom';
1414
import { isDefined, isString } from '@js/core/utils/type';
15-
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
1615
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
1716

1817
import type { ModuleType } from '../m_types';
@@ -721,23 +720,13 @@ const rowsView = (Base: ModuleType<RowsView>) => class RowsViewEditingCellBasedE
721720
}
722721
};
723722

724-
const headerPanel = (Base: ModuleType<HeaderPanel>) => class HeaderPanelEditingCellBasedExtender extends Base {
725-
public isVisible() {
726-
const editingOptions = this._editingController.option('editing');
727-
728-
// @ts-expect-error
729-
return super.isVisible() || editingOptions && (editingOptions.allowUpdating || editingOptions.allowDeleting) && editingOptions.mode === EDIT_MODE_BATCH;
730-
}
731-
};
732-
733723
export const editingCellBasedModule = {
734724
extenders: {
735725
controllers: {
736726
editing: editingControllerExtender,
737727
},
738728
views: {
739729
rowsView,
740-
headerPanel,
741730
},
742731
},
743732
};

packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,10 +1013,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
10131013
private enableApplyButton(value) {
10141014
this.setToolbarItemDisabled('applyFilterButton', !value);
10151015
}
1016-
1017-
public isVisible() {
1018-
return super.isVisible() || this._isShowApplyFilterButton();
1019-
}
10201016
};
10211017

10221018
export const filterRowModule = {

0 commit comments

Comments
 (0)