Skip to content

Commit

Permalink
clearSorting method
Browse files Browse the repository at this point in the history
  • Loading branch information
Raushen committed Mar 5, 2025
1 parent b294055 commit ab759ec
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// { CompatibilityDataController } from './compatibility';
export { defaultOptions, type Options } from './options';
// export { PublicMethods } from './public_methods';
export { PublicMethods } from './public_methods';
export { SortingController } from './sorting_controller';
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable spellcheck/spell-checker */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import type { Constructor } from '@ts/grids/new/grid_core/types';

import type { GridCoreNewBase } from '../widget';

export function PublicMethods<T extends Constructor<GridCoreNewBase>>(GridCore: T) {
return class GridCoreWithSortingController extends GridCore {
public clearSorting(): void {
this.sortingController.clearSorting();
}
};
}
13 changes: 8 additions & 5 deletions packages/devextreme/js/__internal/grids/new/grid_core/widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { MainView } from './main_view';
import { defaultOptions, defaultOptionsRules, type Options } from './options';
import { PagerView } from './pager/view';
import { Search } from './search/controller';
import { SortingController } from './sorting_controller/sorting_controller';
import * as SortingControllerModule from './sorting_controller/index';
import type { SortingController } from './sorting_controller/sorting_controller';
import { ToolbarController } from './toolbar/controller';
import { ToolbarView } from './toolbar/view';
import { WidgetMock } from './widget_mock';
Expand All @@ -36,7 +37,7 @@ export class GridCoreNewBase<

protected columnsController!: ColumnsControllerModule.ColumnsController;

private sortingController!: SortingController;
protected sortingController!: SortingController;

private editingController!: EditingController;

Expand All @@ -58,7 +59,7 @@ export class GridCoreNewBase<
this.diContext.register(DataControllerModule.CompatibilityDataController);
this.diContext.register(ColumnsControllerModule.ColumnsController);
this.diContext.register(ColumnsControllerModule.CompatibilityColumnsController);
this.diContext.register(SortingController);
this.diContext.register(SortingControllerModule.SortingController);
this.diContext.register(ToolbarController);
this.diContext.register(ToolbarView);
this.diContext.register(EditingController);
Expand All @@ -81,7 +82,7 @@ export class GridCoreNewBase<
this.columnsChooser = this.diContext.get(ColumnsChooserView);
this.dataController = this.diContext.get(DataControllerModule.DataController);
this.columnsController = this.diContext.get(ColumnsControllerModule.ColumnsController);
this.sortingController = this.diContext.get(SortingController);
this.sortingController = this.diContext.get(SortingControllerModule.SortingController);
this.toolbarController = this.diContext.get(ToolbarController);
this.toolbarView = this.diContext.get(ToolbarView);
this.editingController = this.diContext.get(EditingController);
Expand Down Expand Up @@ -130,6 +131,8 @@ export class GridCoreNewBase<

export class GridCoreNew extends ColumnsControllerModule.PublicMethods(
DataControllerModule.PublicMethods(
GridCoreNewBase,
SortingControllerModule.PublicMethods(
GridCoreNewBase,
),
),
) {}

0 comments on commit ab759ec

Please sign in to comment.