Skip to content

Commit 3486cf5

Browse files
authored
DataGrid - In the Fluent theme, a padding is set when Toolbar is not visible (T1261773) (#28602)
1 parent 1d09e9b commit 3486cf5

File tree

13 files changed

+32
-45
lines changed

13 files changed

+32
-45
lines changed

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
@@ -884,10 +884,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ExportHeaderPanelEx
884884
this.setToolbarItemDisabled('exportButton', disabled);
885885
});
886886
}
887-
888-
public isVisible() {
889-
return super.isVisible() || this._isExportButtonVisible();
890-
}
891887
};
892888

893889
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
@@ -577,13 +577,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ColumnChooserHeader
577577
super.optionChanged(args);
578578
}
579579
}
580-
581-
public isVisible() {
582-
const that = this;
583-
const columnChooserEnabled = that.option('columnChooser.enabled')!;
584-
585-
return super.isVisible() || columnChooserEnabled;
586-
}
587580
};
588581

589582
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
@@ -2874,13 +2874,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class HeaderPanelEditingE
28742874

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

28862879
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 eventsEngine from '@js/events/core/events_engine';
1212
import holdEvent from '@js/events/hold';
1313
import pointerEvents from '@js/events/pointer';
1414
import { addNamespace } from '@js/events/utils/index';
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
@@ -1004,10 +1004,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
10041004
private enableApplyButton(value) {
10051005
this.setToolbarItemDisabled('applyFilterButton', !value);
10061006
}
1007-
1008-
public isVisible() {
1009-
return super.isVisible() || this._isShowApplyFilterButton();
1010-
}
10111007
};
10121008

10131009
export const filterRowModule = {

packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ export class HeaderPanel extends ColumnsView {
214214
} else if (parts[1] === 'items') {
215215
if (parts.length === 2) {
216216
// `toolbar.items` case
217-
const toolbarOptions = this._getToolbarOptions();
218-
this._toolbar?.option('items', toolbarOptions.items);
217+
this._invalidate();
219218
} else if (parts.length === 3) {
220219
// `toolbar.items[i]` case
221220
const normalizedItem = this._normalizeToolbarItems(this._getToolbarItems(), args.value);

packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ const headerPanel = (
194194
}
195195
return null;
196196
}
197-
198-
public isVisible() {
199-
const searchPanelOptions = this.option('searchPanel');
200-
return super.isVisible() || !!searchPanelOptions?.visible;
201-
}
202197
};
203198

204199
const rowsView = (
16.6 KB
Loading
15.7 KB
Loading

0 commit comments

Comments
 (0)