Skip to content

Grids: convert the pivot grid LocalStore into an ES6 class and remove the Class.inherit leftovers (26_1) #35412

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

Merged
EugeniyKiyashko merged 2 commits into from
Sep 30, 2026
Merged

Grids: convert the pivot grid LocalStore into an ES6 class and remove the Class.inherit leftovers (26_1) #35412

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
e531475
Grids: convert the pivot grid LocalStore into an ES6 class and remove…
EugeniyKiyashko Sep 29, 2026
5a654aa
Grids: keep the strict extender types and let a non-function extender…
EugeniyKiyashko Sep 30, 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
1 change: 1 addition & 0 deletions packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity_module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const adaptivityModule: Module = {
draggingHeader: adaptivityDraggingHeaderViewControllerExtender,
editing: adaptivityEditingViewControllerExtender,
resizing: adaptivityResizingViewControllerExtender,
// @ts-expect-error the extender assumes the master detail extension of DataController
data: adaptivityDataControllerExtender,
editorFactory: adaptivityEditorFactoryViewControllerExtender,
columns: adaptivityColumnsControllerExtender,
Expand Down
18 changes: 8 additions & 10 deletions packages/devextreme/js/__internal/grids/grid_core/m_modules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import errors from '@js/ui/widget/ui.errors';

import type {
Controllers, GridPropertyType, InternalGrid, InternalGridOptions, Module,
ModuleType,
OptionChanged,
Views,
} from './m_types';
Expand Down Expand Up @@ -381,21 +382,18 @@ export class View extends ModuleItem {

const MODULES_ORDER_MAX_INDEX = 1000000;

type ModuleTypeExtender = (Base: ModuleType<any>) => ModuleType<any>;

function getExtendedTypes(
types: Record<string, unknown>,
moduleExtenders: Record<string, unknown> = {},
): Record<string, typeof ModuleItem> {
types: Record<string, ModuleType<any>>,
moduleExtenders: Record<string, ModuleTypeExtender | undefined> = {},
): Record<string, ModuleType<any>> {
const extendTypes = { };
Object.entries(moduleExtenders)
.forEach(([name, extender]) => {
const currentType = types[name];
if (currentType) {
if (isFunction(extender)) {
extendTypes[name] = extender(currentType);
} else {
const classType = currentType as { inherit: (type: unknown) => unknown };
extendTypes[name] = classType.inherit(extender);
}
if (currentType && extender) {
extendTypes[name] = extender(currentType);
}
});
return extendTypes;
Expand Down
6 changes: 2 additions & 4 deletions packages/devextreme/js/__internal/grids/grid_core/m_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,11 @@ type ViewTypes = {
export type ModuleType<T extends ModuleItem> = (new (...args: any[]) => T);

type ControllersExtender = {
[P in keyof Controllers]: ((Base: ModuleType<Controllers[P]>) => ModuleType<Controllers[P]>)
| Record<string, any>;
[P in keyof Controllers]: (Base: ModuleType<Controllers[P]>) => ModuleType<Controllers[P]>;
};

type ViewsExtender = {
[P in keyof Views]: ((Base: ModuleType<Views[P]>) => ModuleType<Views[P]>)
| Record<string, any>;
[P in keyof Views]: (Base: ModuleType<Views[P]>) => ModuleType<Views[P]>;
};

export interface Module {
Expand Down
3 changes: 1 addition & 2 deletions packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils';
import Class from '@js/core/class';
import { EventsStrategy } from '@js/core/events_strategy';
import { normalizeIndexes } from '@js/core/utils/array';
import { Deferred, when } from '@js/core/utils/deferred';
Expand Down Expand Up @@ -368,7 +367,7 @@ class PivotGridDataSource {
|| (storeOptions instanceof Store)
|| Array.isArray(storeOptions)) {
store = this.createLocalOrRemoteStore(dataSourceOptions, notifyProgress);
} else if (storeOptions instanceof Class || storeOptions instanceof xmlaStore.XmlaStore) {
} else if (isFunction(storeOptions.load) && isFunction(storeOptions.getFields)) {
store = storeOptions;
}
}
Expand Down
Loading
Loading