Skip to content
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

DataGrid - In the Fluent theme, a padding is set when Toolbar is not visible (T1261773) #28551

Draft
wants to merge 2 commits into
base: 24_2
Choose a base branch
from
Draft

DataGrid - In the Fluent theme, a padding is set when Toolbar is not visible (T1261773) #28551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa257e
fix
pomahtri Dec 13, 2024
f14b45e
fix: test
pomahtri Dec 13, 2024
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
4 changes: 0 additions & 4 deletions packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,10 +886,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ExportHeaderPanelEx
this.setToolbarItemDisabled('exportButton', disabled);
});
}

public isVisible() {
return super.isVisible() || this._isExportButtonVisible();
}
};

dataGridCore.registerModule('export', {
Expand Down
4 changes: 0 additions & 4 deletions packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,6 @@ export const GroupingHeaderPanelExtender = (Base: ModuleType<HeaderPanel>) => cl
return items;
}

public isVisible() {
return super.isVisible() || this._isGroupPanelVisible();
}

public hasGroupedColumns(): boolean {
return this._isGroupPanelVisible() && !!this.getColumns().length;
}
Expand Down
7 changes: 0 additions & 7 deletions packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,13 +579,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ColumnChooserHeader
super.optionChanged(args);
}
}

public isVisible() {
const that = this;
const columnChooserEnabled = that.option('columnChooser.enabled')!;

return super.isVisible() || columnChooserEnabled;
}
};

const columns = (Base: ModuleType<ColumnsController>) => class ColumnsChooserColumnsControllerExtender extends Base {
Expand Down
7 changes: 0 additions & 7 deletions packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,13 +2873,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class HeaderPanelEditingE

return editButtonItems.concat(items);
}

public isVisible() {
const editingOptions = this._editingController.option('editing');

// @ts-expect-error
return super.isVisible() || editingOptions?.allowAdding;
}
};

export const editingModule = {
Expand Down
11 changes: 0 additions & 11 deletions packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import type { DeferredObj } from '@js/core/utils/deferred';
import { Deferred, when } from '@js/core/utils/deferred';
import { isElementInDom } from '@js/core/utils/dom';
import { isDefined, isString } from '@js/core/utils/type';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';

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

const headerPanel = (Base: ModuleType<HeaderPanel>) => class HeaderPanelEditingCellBasedExtender extends Base {
public isVisible() {
const editingOptions = this._editingController.option('editing');

// @ts-expect-error
return super.isVisible() || editingOptions && (editingOptions.allowUpdating || editingOptions.allowDeleting) && editingOptions.mode === EDIT_MODE_BATCH;
}
};

export const editingCellBasedModule = {
extenders: {
controllers: {
editing: editingControllerExtender,
},
views: {
rowsView,
headerPanel,
},
},
};
4 changes: 0 additions & 4 deletions packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,10 +1013,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
private enableApplyButton(value) {
this.setToolbarItemDisabled('applyFilterButton', !value);
}

public isVisible() {
return super.isVisible() || this._isShowApplyFilterButton();
}
};

export const filterRowModule = {
Expand Down
3 changes: 1 addition & 2 deletions packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ export class HeaderPanel extends ColumnsView {
} else if (parts[1] === 'items') {
if (parts.length === 2) {
// `toolbar.items` case
const toolbarOptions = this._getToolbarOptions();
this._toolbar?.option('items', toolbarOptions.items);
this._invalidate();
} else if (parts.length === 3) {
// `toolbar.items[i]` case
const normalizedItem = this._normalizeToolbarItems(this._getToolbarItems(), args.value);
Expand Down
5 changes: 0 additions & 5 deletions packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,6 @@ const headerPanel = (
}
return null;
}

public isVisible() {
const searchPanelOptions = this.option('searchPanel');
return super.isVisible() || !!searchPanelOptions?.visible;
}
};

const rowsView = (
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2879,7 +2879,7 @@ QUnit.module('Assign options', baseModuleConfig, () => {
dataGrid.option('toolbar.visible', false);

// assert
assert.ok($toolbar.hasClass('dx-state-invisible'), 'toolbar is hidden');
assert.ok($toolbar.parent().hasClass('dx-hidden'), 'toolbar is hidden');

// act
dataGrid.option('toolbar.disabled', true);
Expand Down
Loading