From b7e2ac4cd99038a39a08a8d5b5b2f7f5ccce9ad2 Mon Sep 17 00:00:00 2001 From: "anna.shakhova" <68295572+anna-shakhova@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:24:34 +0200 Subject: [PATCH 1/3] Grids: remove m_ prefix from rows_view, header_panel --- .../js/__internal/grids/data_grid/export/m_export.ts | 4 ++-- .../js/__internal/grids/data_grid/grouping/m_grouping.ts | 4 ++-- .../grids/data_grid/module_not_extended/header_panel.ts | 2 +- .../js/__internal/grids/data_grid/module_not_extended/rows.ts | 2 +- .../js/__internal/grids/data_grid/summary/m_summary.ts | 2 +- .../grid_core/adaptivity/extenders/adaptivity_rows_view.ts | 2 +- .../js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts | 2 +- .../grid_core/ai_assistant/ai_assistant_view_controller.ts | 2 +- .../grids/grid_core/column_chooser/m_column_chooser.ts | 4 ++-- .../grids/grid_core/column_fixing/m_column_fixing.ts | 2 +- .../grids/grid_core/column_headers/m_column_headers.ts | 2 +- .../m_columns_resizing_reordering.ts | 4 ++-- .../grids/grid_core/columns_resizing_reordering/types.ts | 2 +- .../js/__internal/grids/grid_core/editing/m_editing.ts | 4 ++-- .../grids/grid_core/editing/m_editing_cell_based.ts | 2 +- .../grids/grid_core/editing/m_editing_form_based.ts | 2 +- .../__internal/grids/grid_core/editing/m_editing_row_based.ts | 2 +- .../grids/grid_core/editor_factory/m_editor_factory.ts | 2 +- .../error_handling/error_handling_view_controller.ts | 2 +- .../js/__internal/grids/grid_core/filter_row/m_filter_row.ts | 2 +- .../devextreme/js/__internal/grids/grid_core/focus/m_focus.ts | 2 +- .../grids/grid_core/header_filter/m_header_filter.ts | 2 +- .../header_panel/{m_header_panel.ts => header_panel.ts} | 0 .../grid_core/keyboard_navigation/m_keyboard_navigation.ts | 2 +- .../grids/grid_core/master_detail/m_master_detail.ts | 2 +- .../__internal/grids/grid_core/row_dragging/m_row_dragging.ts | 2 +- .../js/__internal/grids/grid_core/search/m_search.ts | 4 ++-- .../js/__internal/grids/grid_core/selection/m_selection.ts | 2 +- .../js/__internal/grids/grid_core/sorting/m_sorting.ts | 2 +- .../grids/grid_core/state_storing/m_state_storing.ts | 2 +- .../grids/grid_core/sticky_columns/m_sticky_columns.ts | 4 ++-- packages/devextreme/js/__internal/grids/grid_core/types.ts | 4 ++-- .../js/__internal/grids/grid_core/validating/m_validating.ts | 2 +- .../js/__internal/grids/grid_core/views/grid_view.ts | 2 +- .../grids/grid_core/views/{m_rows_view.ts => rows_view.ts} | 0 .../grids/grid_core/virtual_columns/m_virtual_columns.ts | 2 +- .../grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts | 2 +- .../js/__internal/grids/tree_list/editing/m_editing.ts | 2 +- .../js/__internal/grids/tree_list/m_virtual_scrolling.ts | 2 +- .../grids/tree_list/module_not_extended/header_panel.ts | 2 +- .../devextreme/js/__internal/grids/tree_list/rows/m_rows.ts | 2 +- .../js/__internal/grids/tree_list/selection/m_selection.ts | 2 +- 42 files changed, 48 insertions(+), 48 deletions(-) rename packages/devextreme/js/__internal/grids/grid_core/header_panel/{m_header_panel.ts => header_panel.ts} (100%) rename packages/devextreme/js/__internal/grids/grid_core/views/{m_rows_view.ts => rows_view.ts} (100%) diff --git a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts index 06faa54092b5..34b9ead9cbff 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts @@ -18,10 +18,10 @@ import type { ColumnsController } from '../../grid_core/columns_controller/colum import type { DataController } from '../../grid_core/data_controller/data_controller'; import type { DataSourceController } from '../../grid_core/data_source/data_source_controller'; import type { EditingController } from '../../grid_core/editing/m_editing'; -import type { HeaderPanel } from '../../grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '../../grid_core/header_panel/header_panel'; import type { SelectionController } from '../../grid_core/selection/m_selection'; import type { ModuleType } from '../../grid_core/types'; -import type { RowsView } from '../../grid_core/views/m_rows_view'; +import type { RowsView } from '../../grid_core/views/rows_view'; import dataGridCore from '../core'; import { isDataColumn } from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts index 1e336c2736b9..10e8d1783bac 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts @@ -13,8 +13,8 @@ import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { ColumnHeadersView } from '../../grid_core/column_headers/m_column_headers'; -import type { HeaderPanel } from '../../grid_core/header_panel/m_header_panel'; -import type { RowsView } from '../../grid_core/views/m_rows_view'; +import type { HeaderPanel } from '../../grid_core/header_panel/header_panel'; +import type { RowsView } from '../../grid_core/views/rows_view'; import gridCore from '../core'; import dataSourceAdapterProvider from '../data_source_adapter'; import { diff --git a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/header_panel.ts b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/header_panel.ts index ad07f2e2735d..587d7c54090d 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/header_panel.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/header_panel.ts @@ -1,4 +1,4 @@ -import { headerPanelModule } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import { headerPanelModule } from '@ts/grids/grid_core/header_panel/header_panel'; import gridCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/rows.ts b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/rows.ts index 6e675a0aff1b..685b58c76e93 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/rows.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/rows.ts @@ -1,4 +1,4 @@ -import { rowsModule } from '@ts/grids/grid_core/views/m_rows_view'; +import { rowsModule } from '@ts/grids/grid_core/views/rows_view'; import gridCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index 09b2e1504c3a..2fba1b185ea2 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -16,7 +16,7 @@ import { ColumnsView } from '@ts/grids/grid_core/views/columns_view'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { EditingController } from '../../grid_core/editing/m_editing'; -import type { RowsView } from '../../grid_core/views/m_rows_view'; +import type { RowsView } from '../../grid_core/views/rows_view'; import gridCore from '../core'; import AggregateCalculator from '../m_aggregate_calculator'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_rows_view.ts index 96bf2a8fc963..321ed75bac2d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_rows_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_rows_view.ts @@ -8,7 +8,7 @@ import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts index 54836de81d59..cf3548d0652c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts @@ -29,7 +29,7 @@ import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyb import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { OptionChanged, RowKey } from '../types'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; import type { ColumnWidth, ViewCellOptions } from '../views/types'; import { isPercentWidth } from '../views/utils'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view_controller.ts index f851a84f229e..b24128deca2e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view_controller.ts @@ -5,7 +5,7 @@ import { AI_ASSISTANT_ICON_NAME, CLASSES, } from '@ts/grids/grid_core/ai_assistant/const'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import type { OptionChanged } from '@ts/grids/grid_core/types'; import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts index 861ab2020f0e..a299d1761283 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts @@ -14,12 +14,12 @@ import Popup from '@js/ui/popup/ui.popup'; import type { Item } from '@js/ui/tree_view'; import TreeView from '@js/ui/tree_view'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; import type { ColumnsController } from '../columns_controller/columns_controller'; import type { DropLocationNames } from '../columns_controller/types'; -import type { HeaderPanel } from '../header_panel/m_header_panel'; +import type { HeaderPanel } from '../header_panel/header_panel'; import modules from '../modules/modules'; import type { ModuleType } from '../types'; import { ColumnsView } from '../views/columns_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts index 90144ff8bb00..0c53837bf7ec 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts @@ -33,7 +33,7 @@ import type { ColumnPoint, ModuleType } from '../types'; import type { ColumnsView } from '../views/columns_view'; import { normalizeWidth } from '../views/columns_view'; import type { ResizingController } from '../views/grid_view'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; import type { RowsViewScrollEvent } from '../views/types'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts index ac080dde444e..277551363cd8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts @@ -10,7 +10,7 @@ import { isDefined, isString } from '@js/core/utils/type'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import { ColumnContextMenuMixin } from '@ts/grids/grid_core/context_menu/m_column_context_menu_mixin'; import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m_header_filter'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import { CLASSES as REORDERING_CLASSES } from '../columns_resizing_reordering/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts index c6f6e15288a4..e914d3c7d35e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts @@ -26,12 +26,12 @@ import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_he import { getDraggingPanelBoundingRects } from '@ts/grids/grid_core/columns_resizing_reordering/utils'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import type { ColumnPoint, ModuleType } from '@ts/grids/grid_core/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ColumnChooserView } from '../column_chooser/m_column_chooser'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; import type { ColumnsController } from '../columns_controller/columns_controller'; -import type { HeaderPanel } from '../header_panel/m_header_panel'; +import type { HeaderPanel } from '../header_panel/header_panel'; import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { PagerView } from '../pager/m_pager'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/types.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/types.ts index e041c11ad0b9..dad0f12a1f35 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/types.ts @@ -1,6 +1,6 @@ import type { ColumnChooserView } from '../column_chooser/m_column_chooser'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; -import type { HeaderPanel } from '../header_panel/m_header_panel'; +import type { HeaderPanel } from '../header_panel/header_panel'; export type DraggingPanel = ColumnHeadersView | ColumnChooserView | HeaderPanel; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index c9c39a4d17e7..bfc748d24477 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -30,9 +30,9 @@ import domUtils from '@ts/core/utils/m_dom'; import type Store from '@ts/data/abstract_store'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import { generateRowValues } from '@ts/grids/grid_core/data_controller/utils/row_values'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { DataChange, diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts index 2fba4c003ec7..4d51f4a4f75e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts @@ -13,7 +13,7 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { isElementInDom } from '@js/core/utils/dom'; import { isDefined, isString } from '@js/core/utils/type'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ModuleType } from '../types'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts index c1670178eb66..6cc8ec5f49a1 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts @@ -15,7 +15,7 @@ import Button from '@js/ui/button'; import Form from '@js/ui/form'; import Popup from '@js/ui/popup/ui.popup'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_row_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_row_based.ts index 9d7102d91399..e63bc5d26f69 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_row_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_row_based.ts @@ -1,6 +1,6 @@ /* eslint-disable max-classes-per-file */ import { equalByValue } from '@js/core/utils/common'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ModuleType } from '../types'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts index 1ef148962c23..735c1de9250d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts @@ -30,7 +30,7 @@ import gridCoreUtils from '../m_utils'; import type { ViewController } from '../modules/modules'; import modules from '../modules/modules'; import type { Module, ModuleType } from '../types'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; const EDITOR_INLINE_BLOCK = 'dx-editor-inline-block'; const CELL_FOCUS_DISABLED_CLASS = 'dx-cell-focus-disabled'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts index 51f4a04782f4..573df04f7b0d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts @@ -13,7 +13,7 @@ import modules from '@ts/grids/grid_core/modules/modules'; import type { ToastViewController } from '@ts/grids/grid_core/toast/toast_controller'; import type { OptionChanged } from '@ts/grids/grid_core/types'; import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { CLASSES } from './const'; import type { GridError } from './types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts b/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts index 41850bfdabd2..595d86fd0ae3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts @@ -21,7 +21,7 @@ import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; import type { DataFilter, FilterSourceContext, } from '@ts/grids/grid_core/filter/types'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import modules from '@ts/grids/grid_core/modules/modules'; import type { ModuleType } from '@ts/grids/grid_core/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts index ab7b2e90e7cb..c0be7ce51540 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts @@ -21,7 +21,7 @@ import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyb import gridCoreUtils from '../m_utils'; import core from '../modules/modules'; import type { ModuleType } from '../types'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; import type { VirtualScrollingDataControllerExtension } from '../virtual_scrolling/index'; import type { FocusDataSourceControllerExtension } from './extenders/focus_data_source_controller'; import { UiGridCoreFocusUtils } from './focus_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts index ea1992f1f0c9..5789b1f17cdb 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts @@ -19,7 +19,7 @@ import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_ import type { DataFilter, FilterSourceContext, } from '@ts/grids/grid_core/filter/types'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import Modules from '@ts/grids/grid_core/modules/modules'; import type { ModuleType } from '@ts/grids/grid_core/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts rename to packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts index b1bed1e79cd4..321c3260996d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts @@ -34,7 +34,7 @@ import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_ import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; import { CLASSES as FILTER_ROW_CLASSES } from '@ts/grids/grid_core/filter_row/const'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { RowsViewScrollEvent } from '@ts/grids/grid_core/views/types'; import type { VirtualScrollingDataControllerExtension } from '@ts/grids/grid_core/virtual_scrolling/index'; import type Scrollable from '@ts/ui/scroll_view/scrollable'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts index 2736f7c5bc40..af4248f3bff7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts @@ -13,7 +13,7 @@ import type { DataController } from '@ts/grids/grid_core/data_controller/data_co import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { DataChange, diff --git a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts index 38abe0c3ad2d..de038207ad98 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts @@ -10,7 +10,7 @@ import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_he import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import gridCoreUtils from '../m_utils'; import { ATTRIBUTES, CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts index f73f97d99a7b..e2beb3d069b4 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts @@ -14,11 +14,11 @@ import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types'; import type { DataController } from '../data_controller/data_controller'; import type { DataChange, UserState } from '../data_controller/types'; import type { DataFilter, FilterSourceContext } from '../filter/types'; -import type { HeaderPanel } from '../header_panel/m_header_panel'; +import type { HeaderPanel } from '../header_panel/header_panel'; import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { ModuleType, OptionChanged } from '../types'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; import { allowSearch, createSearchExpression, parseValue } from './utils'; const SEARCH_PANEL_CLASS = 'search-panel'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts index 1582f800c60d..b5272fb069a6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts @@ -22,7 +22,7 @@ import type { ContextMenuController } from '@ts/grids/grid_core/context_menu/m_c import type { StateStoringController } from '@ts/grids/grid_core/state_storing/state_storing_controller_core'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import Selection from '@ts/ui/selection/selection'; import type { SelectionChangeEvent, SelectionFilter, SelectionOptions } from '@ts/ui/selection/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts index c4e8db3cd1e7..1425486910a0 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts @@ -6,7 +6,7 @@ import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; -import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import type { ModuleType } from '@ts/grids/grid_core/types'; import sortingMixin from './m_sorting_mixin'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts index 832e199f4219..169b19a75686 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts @@ -2,7 +2,7 @@ import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { SelectionController } from '@ts/grids/grid_core/selection/m_selection'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { StateStoringDataControllerExtension } from './extenders/state_storing_data_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts index 63b8ba607e6d..0040210aa9e3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts @@ -27,8 +27,8 @@ import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; import { isDetailRow } from '../master_detail/utils'; import type { ModuleType } from '../types'; import type { ColumnsView } from '../views/columns_view'; -import type { RowsView } from '../views/m_rows_view'; -import { isGroupRow } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; +import { isGroupRow } from '../views/rows_view'; import type { RowsViewScrollEvent } from '../views/types'; import { CLASSES, StickyPosition } from './const'; import { GridCoreStickyColumnsDom } from './dom'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/types.ts b/packages/devextreme/js/__internal/grids/grid_core/types.ts index 6d7addf7bcae..d7d63c00820f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/types.ts @@ -312,9 +312,9 @@ type ControllerTypes = { export interface Views { columnChooserView: import('./column_chooser/m_column_chooser').ColumnChooserView; columnHeadersView: import('./column_headers/m_column_headers').ColumnHeadersView; - headerPanel: import('./header_panel/m_header_panel').HeaderPanel; + headerPanel: import('./header_panel/header_panel').HeaderPanel; headerFilterView: import('./header_filter/m_header_filter_core').HeaderFilterView; - rowsView: import('./views/m_rows_view').RowsView; + rowsView: import('./views/rows_view').RowsView; pagerView: import('./pager/m_pager').PagerView; columnsSeparatorView: import('./columns_resizing_reordering/m_columns_resizing_reordering').ColumnsSeparatorView; blockSeparatorView: import('./columns_resizing_reordering/m_columns_resizing_reordering').BlockSeparatorView; diff --git a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts index 6f9148d318a7..ea4409bc481d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts @@ -30,7 +30,7 @@ import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/c import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_handling/error_handling_view_controller'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { EDITORS_INPUT_SELECTOR, EDITORS_TEXTAREA_SELECTOR } from '../editing/const'; import type { EditingController } from '../editing/m_editing'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts index a309a7dcac86..709f4f9281b8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts @@ -33,7 +33,7 @@ import type { } from '../types'; import type { ColumnsView } from './columns_view'; import { CLASSES } from './const'; -import type { RowsView } from './m_rows_view'; +import type { RowsView } from './rows_view'; import type { ColumnWidth, ScrollPosition, ViewDataChange } from './types'; import { isPercentWidth } from './utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts rename to packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts index 6765dd45c921..cc1b891138a1 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts @@ -12,7 +12,7 @@ import type { ColumnsController } from '../columns_controller/columns_controller import gridCoreUtils from '../m_utils'; import type { ModuleType } from '../types'; import type { ColumnsView } from '../views/columns_view'; -import type { RowsView } from '../views/m_rows_view'; +import type { RowsView } from '../views/rows_view'; import type { RowsViewScrollEvent } from '../views/types'; import { createColumnsInfo } from './m_virtual_columns_core'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts index aa84791e1163..97552378db77 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts @@ -18,7 +18,7 @@ import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_hand import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ChangedEvent, RawItemData } from '../data_source_adapter/types'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts index 664a712f6a4a..b73e92945e1d 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts @@ -13,7 +13,7 @@ import { editingModule } from '@ts/grids/grid_core/editing/m_editing'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import type { RowsView } from '../../grid_core/views/m_rows_view'; +import type { RowsView } from '../../grid_core/views/rows_view'; import treeListCore from '../core'; import type { TreeListDataController } from '../data_controller/data_controller'; import type { TreeListDataSourceController } from '../data_source/data_source_controller'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts index 727fccbe4978..88ca0f113171 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts @@ -5,7 +5,7 @@ import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_ import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { dataSourceAdapterExtender as virtualScrollingDataSourceAdapterExtender, rowsView as virtualScrollingRowsViewExtender, diff --git a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/header_panel.ts b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/header_panel.ts index 64788ae3139c..3d3e7a364b98 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/header_panel.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/header_panel.ts @@ -1,4 +1,4 @@ -import { headerPanelModule } from '@ts/grids/grid_core/header_panel/m_header_panel'; +import { headerPanelModule } from '@ts/grids/grid_core/header_panel/header_panel'; import treeListCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts index adb99cee1646..a41c587e3cda 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts @@ -3,7 +3,7 @@ import { removeEvent } from '@js/common/core/events/remove'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import { rowsModule, RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import { rowsModule, RowsView } from '@ts/grids/grid_core/views/rows_view'; import treeListCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/tree_list/selection/m_selection.ts index 5be27a02b2e7..6051299679a4 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/selection/m_selection.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/selection/m_selection.ts @@ -16,7 +16,7 @@ import { } from '@ts/grids/grid_core/selection/m_selection'; import { selectionModule } from '@ts/grids/grid_core/selection/selection_module'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import treeListCore from '../core'; From 4d8c2407d71a83dade8addb65d7f207634968ff0 Mon Sep 17 00:00:00 2001 From: "anna.shakhova" <68295572+anna-shakhova@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:45:23 +0200 Subject: [PATCH 2/3] Grids: move grid_view to separate folder --- .../__docs__/scripts/grid_core/constants.ts | 1 + .../module_not_extended/grid_view.ts | 2 +- .../adaptivity_resizing_view_controller.ts | 2 +- .../column_fixing/m_column_fixing.ts | 2 +- .../error_handling_view_controller.ts | 2 +- .../grid_view.free_width.integration.test.ts | 2 +- ...normalize_widths_by_expand_columns.test.ts | 0 .../a11y_status_container_component.ts | 0 .../grids/grid_core/grid_view/const.ts | 30 +++++++++ .../{views => grid_view}/grid_view.ts | 67 ++++++------------- .../grid_core/header_panel/header_panel.ts | 2 +- .../master_detail/m_master_detail.ts | 2 +- .../grid_core/row_dragging/m_row_dragging.ts | 3 +- .../sticky_columns/m_sticky_columns.ts | 2 +- .../js/__internal/grids/grid_core/types.ts | 6 +- .../grids/grid_core/views/rows_view.ts | 2 +- .../virtual_columns/m_virtual_columns.ts | 2 +- .../virtual_scrolling/m_virtual_scrolling.ts | 2 +- .../__internal/grids/tree_list/grid_view.ts | 5 +- 19 files changed, 69 insertions(+), 65 deletions(-) rename packages/devextreme/js/__internal/grids/grid_core/{views => grid_view}/__tests__/grid_view.free_width.integration.test.ts (98%) rename packages/devextreme/js/__internal/grids/grid_core/{views => grid_view}/__tests__/grid_view.normalize_widths_by_expand_columns.test.ts (100%) rename packages/devextreme/js/__internal/grids/grid_core/{views => grid_view}/a11y_status_container_component.ts (100%) create mode 100644 packages/devextreme/js/__internal/grids/grid_core/grid_view/const.ts rename packages/devextreme/js/__internal/grids/grid_core/{views => grid_view}/grid_view.ts (94%) diff --git a/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/constants.ts b/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/constants.ts index 976452e84065..562b1531d9bc 100644 --- a/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/constants.ts +++ b/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/constants.ts @@ -21,6 +21,7 @@ const CORE_DIRECTORY_FEATURE_MAP: Record = { data_controller: 'Data', views: 'Core', + grid_view: 'Core', editor_factory: 'Core', error_handling: 'Core', toast: 'Core', diff --git a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/grid_view.ts b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/grid_view.ts index 17935848e6fd..e4c3c1ae28d1 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/grid_view.ts @@ -1,4 +1,4 @@ -import { gridViewModule } from '@ts/grids/grid_core/views/grid_view'; +import { gridViewModule } from '@ts/grids/grid_core/grid_view/grid_view'; import gridCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_resizing_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_resizing_view_controller.ts index ce21315f3fae..11a94202f77e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_resizing_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_resizing_view_controller.ts @@ -4,8 +4,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable prefer-rest-params */ import type { Column } from '@ts/grids/grid_core/columns_controller/types'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import { COLUMN_VIEWS } from '../const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts index 0c53837bf7ec..05a95e82c092 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts @@ -27,12 +27,12 @@ import type { DraggingHeaderViewController, } from '../columns_resizing_reordering/m_columns_resizing_reordering'; import type { Coordinates } from '../columns_resizing_reordering/types'; +import type { ResizingController } from '../grid_view/grid_view'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; import gridCoreUtils from '../m_utils'; import type { ColumnPoint, ModuleType } from '../types'; import type { ColumnsView } from '../views/columns_view'; import { normalizeWidth } from '../views/columns_view'; -import type { ResizingController } from '../views/grid_view'; import type { RowsView } from '../views/rows_view'; import type { RowsViewScrollEvent } from '../views/types'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts index 573df04f7b0d..9e0799aaf4b3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/error_handling_view_controller.ts @@ -9,10 +9,10 @@ import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/c import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import modules from '@ts/grids/grid_core/modules/modules'; import type { ToastViewController } from '@ts/grids/grid_core/toast/toast_controller'; import type { OptionChanged } from '@ts/grids/grid_core/types'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/__tests__/grid_view.free_width.integration.test.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/__tests__/grid_view.free_width.integration.test.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/grid_core/views/__tests__/grid_view.free_width.integration.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/grid_view/__tests__/grid_view.free_width.integration.test.ts index a688083f3b45..81cf2c032a80 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/__tests__/grid_view.free_width.integration.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/grid_view/__tests__/grid_view.free_width.integration.test.ts @@ -3,12 +3,12 @@ import { } from '@jest/globals'; import $ from '@js/core/renderer'; import type { Properties as DataGridProperties } from '@js/ui/data_grid'; +import type { ColumnWidth } from '@ts/grids/grid_core/views/types'; import type { DataGridInstance } from '../../__tests__/__mock__/helpers/utils'; import { afterTest, beforeTest, createDataGrid, } from '../../__tests__/__mock__/helpers/utils'; -import type { ColumnWidth } from '../types'; const CONTENT_WIDTH = 1000; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/__tests__/grid_view.normalize_widths_by_expand_columns.test.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/__tests__/grid_view.normalize_widths_by_expand_columns.test.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/views/__tests__/grid_view.normalize_widths_by_expand_columns.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/grid_view/__tests__/grid_view.normalize_widths_by_expand_columns.test.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/a11y_status_container_component.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/a11y_status_container_component.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/views/a11y_status_container_component.ts rename to packages/devextreme/js/__internal/grids/grid_core/grid_view/a11y_status_container_component.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/grid_view/const.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/const.ts new file mode 100644 index 000000000000..ca69fe0c6360 --- /dev/null +++ b/packages/devextreme/js/__internal/grids/grid_core/grid_view/const.ts @@ -0,0 +1,30 @@ +export const CLASSES = { + gridBaseContainer: 'dx-gridbase-container', + borders: 'borders', + importantMargin: 'important-margin', + bestFit: 'best-fit', +}; + +export const E2E_ATTRIBUTES = { + a11yStatusContainer: 'e2e-a11y-general-status-container', +}; + +export const VIEW_NAMES = [ + 'columnsSeparatorView', + 'blockSeparatorView', + 'trackerView', + 'headerPanel', + 'columnHeadersView', + 'rowsView', + 'footerView', + 'columnChooserView', + 'filterPanelView', + 'pagerView', + 'draggingHeaderView', + 'contextMenuView', + 'headerFilterView', + 'filterBuilderView', + 'toastView', + 'aiPromptEditorView', + 'aiAssistantView', +] as const; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts similarity index 94% rename from packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts rename to packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts index 709f4f9281b8..5a16157bbfe4 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts @@ -14,8 +14,13 @@ import { setHeight } from '@js/core/utils/style'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; import * as accessibility from '@js/ui/shared/accessibility'; +import { HIDDEN_COLUMNS_WIDTH } from '@ts/grids/grid_core/adaptivity/const'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; -import { A11yStatusContainerComponent } from '@ts/grids/grid_core/views/a11y_status_container_component'; +import type { ColumnsView } from '@ts/grids/grid_core/views/columns_view'; +import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; +import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; +import type { ColumnWidth, ScrollPosition, ViewDataChange } from '@ts/grids/grid_core/views/types'; +import { isPercentWidth } from '@ts/grids/grid_core/views/utils'; import type { FooterView } from '../../data_grid/summary/m_summary'; import type { AdaptiveColumnsViewController } from '../adaptivity/m_adaptivity'; @@ -31,42 +36,8 @@ import modules from '../modules/modules'; import type { InternalGridOptions, OptionChanged, SelectionRange, Views, } from '../types'; -import type { ColumnsView } from './columns_view'; -import { CLASSES } from './const'; -import type { RowsView } from './rows_view'; -import type { ColumnWidth, ScrollPosition, ViewDataChange } from './types'; -import { isPercentWidth } from './utils'; - -const BORDERS_CLASS = 'borders'; -const IMPORTANT_MARGIN_CLASS = 'important-margin'; -const GRIDBASE_CONTAINER_CLASS = 'dx-gridbase-container'; -const GROUP_ROW_SELECTOR = `tr.${CLASSES.groupRow}`; - -const HIDDEN_COLUMNS_WIDTH = 'adaptiveHidden'; - -const VIEW_NAMES = [ - 'columnsSeparatorView', - 'blockSeparatorView', - 'trackerView', - 'headerPanel', - 'columnHeadersView', - 'rowsView', - 'footerView', - 'columnChooserView', - 'filterPanelView', - 'pagerView', - 'draggingHeaderView', - 'contextMenuView', - 'headerFilterView', - 'filterBuilderView', - 'toastView', - 'aiPromptEditorView', - 'aiAssistantView', -] as const; - -const E2E_ATTRIBUTES = { - a11yStatusContainer: 'e2e-a11y-general-status-container', -}; +import { A11yStatusContainerComponent } from './a11y_status_container_component'; +import { CLASSES, E2E_ATTRIBUTES, VIEW_NAMES } from './const'; const isPixelWidth = (width: ColumnWidth): boolean => isString(width) && width.endsWith('px'); @@ -242,7 +213,7 @@ export class ResizingController extends modules.ViewController { ? `${widgetStatusText}. ${expandableWidgetAriaLabel}` : widgetStatusText; - const $ariaLabelElement = this.component.$element().children(`.${GRIDBASE_CONTAINER_CLASS}`); + const $ariaLabelElement = this.component.$element().children(`.${CLASSES.gridBaseContainer}`); this.component.setAria('label', labelText, $ariaLabelElement); if (!e?.isFirstRender) { @@ -257,7 +228,7 @@ export class ResizingController extends modules.ViewController { if (!widths?.length) { const headersTableElement = columnHeadersView.getTableElement(); - columnHeadersView.setTableElement(rowsView.getTableElement()?.children(`.${CLASSES.headerBody}`)); + columnHeadersView.setTableElement(rowsView.getTableElement()?.children(`.${VIEW_CLASSES.headerBody}`)); widths = columnHeadersView.getColumnWidths(); columnHeadersView.setTableElement(headersTableElement); } @@ -297,7 +268,7 @@ export class ResizingController extends modules.ViewController { : $rowsTable.children(`.${className}`).appendTo($viewTable); $tableBody.toggleClass(className, isBestFit); - $tableBody.toggleClass(this.addWidgetPrefix('best-fit'), isBestFit); + $tableBody.toggleClass(this.addWidgetPrefix(CLASSES.bestFit), isBestFit); } }); } @@ -317,14 +288,14 @@ export class ResizingController extends modules.ViewController { $rowsTable.children('colgroup').css('display', isBestFit ? 'none' : ''); // NOTE T1156153: Hide group row column to get correct fixed column widths. - $rowsFixedTable.find(GROUP_ROW_SELECTOR).toArray().forEach((item) => { + $rowsFixedTable.find(`tr.${VIEW_CLASSES.groupRow}`).toArray().forEach((item) => { $(item).css('display', isBestFit ? 'none' : ''); }); - $rowsFixedTable.toggleClass(this.addWidgetPrefix(CLASSES.tableFixed), !isBestFit); + $rowsFixedTable.toggleClass(this.addWidgetPrefix(VIEW_CLASSES.tableFixed), !isBestFit); - this._toggleBestFitModeForView(this._columnHeadersView, CLASSES.headerBody, isBestFit); - this._toggleBestFitModeForView(this._footerView, CLASSES.footerBody, isBestFit); + this._toggleBestFitModeForView(this._columnHeadersView, VIEW_CLASSES.headerBody, isBestFit); + this._toggleBestFitModeForView(this._footerView, VIEW_CLASSES.footerBody, isBestFit); if (this._needStretch()) { ($rowsTable.get(0) as HTMLElement).style.width = isBestFit ? 'auto' : ''; @@ -668,7 +639,7 @@ export class ResizingController extends modules.ViewController { public updateSize(rootElement: dxElementWrapper): void { const $rootElement = $(rootElement); - const importantMarginClass = this.addWidgetPrefix(IMPORTANT_MARGIN_CLASS); + const importantMarginClass = this.addWidgetPrefix(CLASSES.importantMargin); if (this._hasHeight === undefined && $rootElement && $rootElement.is(':visible') && getWidth($rootElement)) { const $groupElement = $rootElement.children(`.${this.getWidgetContainerClass()}`); @@ -965,7 +936,7 @@ export class GridView extends modules.View { public optionChanged(args: OptionChanged): void { if (isDefined(this._groupElement) && args.name === 'showBorders') { - this._groupElement.toggleClass(this.addWidgetPrefix(BORDERS_CLASS), !!args.value); + this._groupElement.toggleClass(this.addWidgetPrefix(CLASSES.borders), !!args.value); args.handled = true; } else { super.optionChanged(args); @@ -990,8 +961,8 @@ export class GridView extends modules.View { const isFirstRender = !this._groupElement; const $groupElement = this._groupElement ?? $('
').addClass(this.getWidgetContainerClass()); - $groupElement.addClass(GRIDBASE_CONTAINER_CLASS); - $groupElement.toggleClass(this.addWidgetPrefix(BORDERS_CLASS), !!this.option('showBorders')); + $groupElement.addClass(CLASSES.gridBaseContainer); + $groupElement.toggleClass(this.addWidgetPrefix(CLASSES.borders), !!this.option('showBorders')); this.setAria('role', 'presentation', $rootElement); diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts index 7bba327c439d..55a671139e4c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_panel/header_panel.ts @@ -15,9 +15,9 @@ import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types'; import { normalizeToolbarItems } from '@ts/grids/new/grid_core/toolbar/utils'; import type { Column } from '../columns_controller/types'; +import type { ResizingController } from '../grid_view/grid_view'; import type { InternalGridOptions, ModuleType, OptionChanged } from '../types'; import { ColumnsView } from '../views/columns_view'; -import type { ResizingController } from '../views/grid_view'; import type { ContextMenuItemsOptions } from '../views/types'; import { CLASSES, DEFAULT_TOOLBAR_ITEM_NAMES, TOOLBAR_ARIA_LABEL } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts index af4248f3bff7..6ade8fe8ee44 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts @@ -10,9 +10,9 @@ import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts index de038207ad98..20bd9eb49cbd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts @@ -8,6 +8,7 @@ import { isDefined } from '@js/core/utils/type'; import Sortable from '@js/ui/sortable'; import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_headers/const'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; +import { CLASSES as GRID_VIEW_CLASSES } from '@ts/grids/grid_core/grid_view/const'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; @@ -247,7 +248,7 @@ const rowsView = (Base: ModuleType) => class RowsViewRowDraggingExtend // @ts-expect-error this._createComponent($dataGridContainer, this.component.NAME, gridOptions); $dataGridContainer - .find('.dx-gridbase-container') + .find(`.${GRID_VIEW_CLASSES.gridBaseContainer}`) .children(`:not(.${this.addWidgetPrefix(VIEW_CLASSES.rowsView)})`) .hide(); diff --git a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts index 0040210aa9e3..b1f2de0dc973 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts @@ -6,8 +6,8 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getWidth, setWidth } from '@js/core/utils/size'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import { HIDDEN_COLUMNS_WIDTH } from '../adaptivity/const'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/types.ts b/packages/devextreme/js/__internal/grids/grid_core/types.ts index d7d63c00820f..65132f94ac0d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/types.ts @@ -291,12 +291,12 @@ export interface Controllers { keyboardNavigation: import('./keyboard_navigation/m_keyboard_navigation').KeyboardNavigationController; columnFocusDispatcher: import('./keyboard_navigation/column_focus_dispatcher').ColumnFocusDispatcher; headersKeyboardNavigation: import('./keyboard_navigation/m_headers_keyboard_navigation').HeadersKeyboardNavigationController; - resizing: import('./views/grid_view').ResizingController; + resizing: import('./grid_view/grid_view').ResizingController; selection: import('./selection/m_selection').SelectionController; validating: import('./validating/m_validating').ValidatingController; searchPanel: import('./search/m_search').SearchPanelViewController; stateStoring: import('./state_storing/state_storing_controller_core').StateStoringController; - synchronizeScrolling: import('./views/grid_view').SynchronizeScrollingController; + synchronizeScrolling: import('./grid_view/grid_view').SynchronizeScrollingController; tablePosition: import('./columns_resizing_reordering/m_columns_resizing_reordering').TablePositionViewController; toastViewController: import('./toast/toast_controller').ToastViewController; aiColumn: import('./ai_column/controllers/ai_column_controller').AIColumnController; @@ -322,7 +322,7 @@ export interface Views { trackerView: import('./columns_resizing_reordering/m_columns_resizing_reordering').TrackerView; contextMenuView: import('./context_menu/m_context_menu').ContextMenuView; footerView: import('../data_grid/summary/m_summary').FooterView; - gridView: import('./views/grid_view').GridView; + gridView: import('./grid_view/grid_view').GridView; filterBuilderView: import('./filter_builder/filter_builder').FilterBuilderView; filterPanelView: import('./filter_panel/filter_panel').FilterPanelView; toastView: import('./toast/toast_view').ToastView; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts index 6f87af960d93..5d0d189a5720 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts @@ -38,12 +38,12 @@ import { generateRowValues } from '@ts/grids/grid_core/data_controller/utils/row import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; import type { FocusController } from '@ts/grids/grid_core/focus/m_focus'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { KeyboardNavigationController, } from '@ts/grids/grid_core/keyboard_navigation/m_keyboard_navigation'; import type { OptionChanged, SummaryTextItem } from '@ts/grids/grid_core/types'; import type { ValidatingController } from '@ts/grids/grid_core/validating/m_validating'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import Scrollable from '@ts/ui/scroll_view/scrollable'; import type { ElementOffset } from '@ts/ui/scroll_view/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts index cc1b891138a1..fec3d0733cb5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts @@ -6,7 +6,7 @@ import { getHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { ColumnsController } from '../columns_controller/columns_controller'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts index 97552378db77..55b5ce1a53e7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts @@ -15,9 +15,9 @@ import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_handling/error_handling_view_controller'; +import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; -import type { ResizingController } from '@ts/grids/grid_core/views/grid_view'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ChangedEvent, RawItemData } from '../data_source_adapter/types'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/grid_view.ts b/packages/devextreme/js/__internal/grids/tree_list/grid_view.ts index 0cc00f51b2bc..22298a6fff18 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/grid_view.ts @@ -1,4 +1,5 @@ -import { gridViewModule, ResizingController } from '@ts/grids/grid_core/views/grid_view'; +import { CLASSES as GRID_VIEW_CLASSES } from '@ts/grids/grid_core/grid_view/const'; +import { gridViewModule, ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import treeListCore from './core'; @@ -16,7 +17,7 @@ class TreeListResizingController extends ResizingController { const $rowsTable = this._rowsView.getTableElement(); - $rowsTable?.find('.dx-treelist-cell-expandable').toggleClass(this.addWidgetPrefix('best-fit'), isBestFit); + $rowsTable?.find('.dx-treelist-cell-expandable').toggleClass(this.addWidgetPrefix(GRID_VIEW_CLASSES.bestFit), isBestFit); } } From a3dc360c639bc0c22c517995fe3ffd488680b75c Mon Sep 17 00:00:00 2001 From: "anna.shakhova" <68295572+anna-shakhova@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:49:24 +0200 Subject: [PATCH 3/3] Grids: reuse HIDDEN_COLUMNS_WIDTH instead of literals --- .../__internal/grids/grid_core/editing/m_editing.ts | 3 ++- .../js/__internal/grids/grid_core/m_utils.ts | 3 ++- .../__internal/grids/grid_core/views/columns_view.ts | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index bfc748d24477..4b9663e3249f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -28,6 +28,7 @@ import { confirm } from '@js/ui/dialog'; import { current, isFluent } from '@js/ui/themes'; import domUtils from '@ts/core/utils/m_dom'; import type Store from '@ts/data/abstract_store'; +import { HIDDEN_COLUMNS_WIDTH } from '@ts/grids/grid_core/adaptivity/const'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import { generateRowValues } from '@ts/grids/grid_core/data_controller/utils/row_values'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; @@ -1225,7 +1226,7 @@ class EditingControllerImpl extends modules.ViewController { protected _getEditRowIndexCorrection(columnName?) { const editColumn = columnName ? this._getColumnByName(columnName) : this._getEditColumn(); - const isColumnHidden = editColumn?.visibleWidth === 'adaptiveHidden'; + const isColumnHidden = editColumn?.visibleWidth === HIDDEN_COLUMNS_WIDTH; return isColumnHidden ? 1 : 0; } diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts index 592ff35d263d..c0f237cd8048 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts @@ -52,6 +52,7 @@ import type { WrappedLookupDataSource, } from '@ts/grids/grid_core/types'; +import { HIDDEN_COLUMNS_WIDTH } from './adaptivity/const'; import { AI_COLUMN_NAME } from './ai_column/const'; import type DataSourceAdapter from './data_source_adapter/data_source_adapter'; import type { RawItemData } from './data_source_adapter/types'; @@ -624,7 +625,7 @@ export default { const width = resultWidths && resultWidths[lastColumnIndex]; const allowResizing = !hasResizableColumns || column.allowResizing !== false; - if (!column.command && !column.fixed && width !== 'adaptiveHidden' && allowResizing) { + if (!column.command && !column.fixed && width !== HIDDEN_COLUMNS_WIDTH && allowResizing) { break; } } diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts index 3ff7761b0982..c2a0ccf32e8f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts @@ -29,6 +29,7 @@ import { getWindow, hasWindow } from '@js/core/utils/window'; import type { DxEvent } from '@js/events'; import type { ActionEvent } from '@ts/core/action'; import supportUtils from '@ts/core/utils/m_support'; +import { HIDDEN_COLUMNS_WIDTH } from '@ts/grids/grid_core/adaptivity/const'; import type { AdaptiveColumnsViewController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; import type { ColumnChooserController, ColumnChooserView } from '@ts/grids/grid_core/column_chooser/m_column_chooser'; import { CLASSES as COLUMN_FIXING_CLASSES } from '@ts/grids/grid_core/column_fixing/const'; @@ -77,7 +78,7 @@ import type { } from './types'; import { isRowElementVisible } from './utils'; -const HIDDEN_COLUMNS_WIDTH = '0.0001px'; +const HIDDEN_COLUMN_CSS_WIDTH = '0.0001px'; const CELL_HINT_VISIBLE = 'dxCellHintVisible'; @@ -135,8 +136,8 @@ export const normalizeWidth = (width: string | number | undefined): string | und return `${width.toFixed(3)}px`; } - if (width === 'adaptiveHidden') { - return HIDDEN_COLUMNS_WIDTH; + if (width === HIDDEN_COLUMNS_WIDTH) { + return HIDDEN_COLUMN_CSS_WIDTH; } return width; @@ -597,8 +598,8 @@ export class ColumnsView extends ColumnStateMixin(modules.View) { // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 0 falls back let width = column.visibleWidth || column.width; - if (width === 'adaptiveHidden') { - width = HIDDEN_COLUMNS_WIDTH; + if (width === HIDDEN_COLUMNS_WIDTH) { + width = HIDDEN_COLUMN_CSS_WIDTH; } const col = $('');