Skip to content

GridCore: add methods to HeaderPanel to add/remove toolbar items #33118

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

Open
anna-shakhova wants to merge 6 commits into
base: 26_1
Choose a base branch
from
Open

GridCore: add methods to HeaderPanel to add/remove toolbar items #33118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6e56e6
GridCore: add methods to HeaderPanel to add/remove toolbar items
anna-shakhova Apr 1, 2026
6ed0bec
GridCore: fix tests
anna-shakhova Apr 1, 2026
34b3519
GridCore: fix tests
anna-shakhova Apr 2, 2026
39dc044
GridCore: add tests for new functionality
anna-shakhova Apr 2, 2026
e612d24
GridCore: call _updateSearchPanelItem on visibility change only
anna-shakhova Apr 3, 2026
a437a97
GridCore: rename some methods for clarity
anna-shakhova Apr 3, 2026
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: 0 additions & 5 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 @@ -731,7 +731,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ExportHeaderPanelEx

if (exportButton) {
items.push(exportButton);
this._correctItemsPosition(items);
}

return items;
Expand Down Expand Up @@ -840,10 +839,6 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ExportHeaderPanelEx
return items;
}

private _correctItemsPosition(items) {
items.sort((itemA, itemB) => itemA.sortIndex - itemB.sortIndex);
}

private _isExportButtonVisible() {
return this.option('export.enabled');
}
Expand Down
9 changes: 5 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 @@ -13,6 +13,7 @@ import Menu from '@js/ui/menu';
import Overlay from '@js/ui/overlay/ui.overlay';
import { selectView } from '@js/ui/shared/accessibility';
import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller';
import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types';
import type MenuInternal from '@ts/ui/menu/menu';

import type { ColumnHeadersView } from '../column_headers/m_column_headers';
Expand Down Expand Up @@ -951,16 +952,16 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
}
}

protected _getToolbarItems() {
protected _getToolbarItems(): ToolbarItem[] {
const items = super._getToolbarItems();
const filterItem = this._prepareFilterItem();

return filterItem.concat(items);
}

private _prepareFilterItem() {
private _prepareFilterItem(): ToolbarItem[] {
const that = this;
const filterItem: object[] = [];
const filterItem: ToolbarItem[] = [];

if (that._isShowApplyFilterButton()) {
const hintText = that.option('filterRow.applyFilterText');
Expand All @@ -972,7 +973,7 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
const onClickHandler = function () {
that._applyFilterViewController.applyFilter();
};
const toolbarItem = {
const toolbarItem: ToolbarItem = {
widget: 'dxButton',
options: {
icon: 'apply-filter',
Expand Down
Loading
Loading