Skip to content

GridCore - EditorFactory & Adaptivity - fix eslint & ts errors #35703

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
bit-byte0 merged 5 commits into from
Oct 16, 2026
Merged

GridCore - EditorFactory & Adaptivity - fix eslint & ts errors #35703

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8ab2f0
fix m_editor_factory.ts
Oct 14, 2026
31b2b2d
fix adaptivity
Oct 14, 2026
ac2de06
refactor(grids): address review
bit-byte0 Oct 15, 2026
84f6b35
Merge branch 'upstream_26_2' into editor_factory_26_2
Oct 16, 2026
dc137e3
fix ts error
Oct 16, 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
4 changes: 2 additions & 2 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 @@ -9,7 +9,7 @@ import { adaptivityHeadersKeyboardNavigationViewControllerExtender } from './ext
import { adaptivityKeyboardNavigationViewControllerExtender } from './extenders/adaptivity_keyboard_navigation_view_controller';
import { adaptivityResizingViewControllerExtender } from './extenders/adaptivity_resizing_view_controller';
import { adaptivityRowsViewExtender } from './extenders/adaptivity_rows_view';
import { AdaptiveColumnsController } from './m_adaptivity';
import { AdaptiveColumnsViewController } from './m_adaptivity';

export const adaptivityModule: Module = {
defaultOptions(): Pick<InternalGridOptions, 'columnHidingEnabled'> {
Expand All @@ -18,7 +18,7 @@ export const adaptivityModule: Module = {
};
},
controllers: {
adaptiveColumns: AdaptiveColumnsController,
adaptiveColumns: AdaptiveColumnsViewController,
},
extenders: {
views: {
Expand Down
4 changes: 2 additions & 2 deletions ...treme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_columns_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import type { Column } from '@ts/grids/grid_core/columns_controller/types';
import type { ModuleType } from '@ts/grids/grid_core/types';

import { HIDDEN_COLUMNS_WIDTH } from '../const';
import type { AdaptiveColumnsController } from '../m_adaptivity';
import type { AdaptiveColumnsViewController } from '../m_adaptivity';

export const adaptivityColumnsControllerExtender = (
Base: ModuleType<ColumnsController>,
): ModuleType<ColumnsController> => class AdaptivityColumnsControllerExtender extends Base {
private adaptiveColumnsController!: AdaptiveColumnsController;
private adaptiveColumnsController!: AdaptiveColumnsViewController;

public init(isApplyingUserState?: boolean): void {
super.init(isApplyingUserState);
Expand Down
4 changes: 2 additions & 2 deletions ...vextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
EXPAND_ARIA_NAME,
LEGACY_SCROLLING_MODE,
} from '../const';
import type { AdaptiveColumnsController } from '../m_adaptivity';
import type { AdaptiveColumnsViewController } from '../m_adaptivity';
import type { AdaptivityDataController } from '../types';
import { getAdaptiveDetailRowIndex, resolveAdaptiveDetailRowTarget } from '../utils';

Expand All @@ -23,7 +23,7 @@ export const adaptivityDataControllerExtender = (
): ModuleType<AdaptivityDataController> => class AdaptivityDataControllerExtender extends Base {
private adaptiveExpandedKey?: RowKey;

protected adaptiveColumnsController!: AdaptiveColumnsController;
protected adaptiveColumnsController!: AdaptiveColumnsViewController;

public init(): void {
super.init();
Expand Down
Loading
Loading