diff --git a/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/resolver.ts b/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/resolver.ts index 82263365bd05..d0cb5aab78cc 100644 --- a/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/resolver.ts +++ b/packages/devextreme/js/__internal/grids/__docs__/scripts/grid_core/resolver.ts @@ -36,7 +36,7 @@ const EXTENDER_KINDS: ExtenderKind[] = ['controllers', 'views']; * Key: className, Value: class info + sourceFile. * * When there are duplicate class names across files (e.g. KeyboardNavigationController - * in both m_keyboard_navigation_core.ts and m_keyboard_navigation.ts), we keep BOTH: + * in both keyboard_navigation_core.ts and m_keyboard_navigation.ts), we keep BOTH: * - The "base" version (doesn't extend a class of the same name) goes in the main registry * - The "shadow" version goes in a separate list to be handled during chain building */ diff --git a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_column_keyboard_navigation_mixin.ts b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/column_keyboard_navigation_mixin.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_column_keyboard_navigation_mixin.ts rename to packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/column_keyboard_navigation_mixin.ts diff --git a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_group_panel_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/group_panel_keyboard_navigation.ts similarity index 97% rename from packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_group_panel_keyboard_navigation.ts rename to packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/group_panel_keyboard_navigation.ts index 1b7c6e5a734f..8d169db54159 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_group_panel_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/group_panel_keyboard_navigation.ts @@ -9,15 +9,15 @@ import type { DxEvent } from '@js/events'; import { hiddenFocus } from '@js/ui/shared/accessibility'; import type { KeyboardKeyDownEvent } from '@ts/events/core/keyboard_processor'; import type { Column, GroupColumn } from '@ts/grids/grid_core/columns_controller/types'; +import { ColumnKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/column_keyboard_navigation_core'; import { Direction } from '@ts/grids/grid_core/keyboard_navigation/const'; -import { ColumnKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core'; import type { FocusedCellPosition } from '@ts/grids/grid_core/keyboard_navigation/types'; import type { Views } from '@ts/grids/grid_core/types'; import type { ViewDataChange } from '@ts/grids/grid_core/views/types'; import gridCore from '../core'; import { CLASSES as GROUPING_CLASSES } from '../grouping/const'; -import { ColumnKeyboardNavigationMixin } from './m_column_keyboard_navigation_mixin'; +import { ColumnKeyboardNavigationMixin } from './column_keyboard_navigation_mixin'; export class GroupPanelKeyboardNavigationController extends ColumnKeyboardNavigationMixin(ColumnKeyboardNavigationController) { diff --git a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/headers_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/headers_keyboard_navigation.ts index 684dc2f13980..6f7f271ad624 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/headers_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/headers_keyboard_navigation.ts @@ -3,12 +3,12 @@ import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import { KEY_CODES } from '@ts/grids/grid_core/keyboard_navigation/const'; -import type { HeadersKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation'; -import { headersKeyboardNavigationModule } from '@ts/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation'; +import type { HeadersKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/headers_keyboard_navigation'; +import { headersKeyboardNavigationModule } from '@ts/grids/grid_core/keyboard_navigation/headers_keyboard_navigation'; import type { ModuleType } from '@ts/grids/grid_core/types'; import gridCore from '../core'; -import { ColumnKeyboardNavigationMixin } from './m_column_keyboard_navigation_mixin'; +import { ColumnKeyboardNavigationMixin } from './column_keyboard_navigation_mixin'; const headersKeyboardNavigation: ( Base: ModuleType, diff --git a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/types.ts b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/types.ts index bc71db0a7cea..da866b2263a6 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/types.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/types.ts @@ -1,4 +1,4 @@ -import type { ColumnKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core'; +import type { ColumnKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/column_keyboard_navigation_core'; import type { ModuleType } from '@ts/grids/grid_core/types'; export type MixinBase = ModuleType; diff --git a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/editor_factory.ts b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/editor_factory.ts index bb3da7da4f2a..87ea4afcc3dc 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/editor_factory.ts @@ -1,4 +1,4 @@ -import { editorFactoryModule } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import { editorFactoryModule } from '@ts/grids/grid_core/editor_factory/editor_factory'; import gridCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/widget.ts b/packages/devextreme/js/__internal/grids/data_grid/widget.ts index 77c894eaef04..0718377965de 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/widget.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/widget.ts @@ -24,7 +24,7 @@ import './module_not_extended/pager'; import './module_not_extended/columns_resizing_reordering'; import './module_not_extended/keyboard_navigation'; import './keyboard_navigation/headers_keyboard_navigation'; -import './keyboard_navigation/m_group_panel_keyboard_navigation'; +import './keyboard_navigation/group_panel_keyboard_navigation'; import './summary/summary_module'; import './module_not_extended/sticky_columns'; import './module_not_extended/column_fixing'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts similarity index 96% rename from packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts rename to packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts index cf3548d0652c..6a68cd9f57ae 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts @@ -24,31 +24,24 @@ import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import { AI_COLUMN_NAME } from '../ai_column/const'; import type { ColumnsController } from '../columns_controller/columns_controller'; import type { ProcessedItem } from '../data_controller/types'; +import { EDIT_MODE_FORM, EDIT_MODE_POPUP, EDIT_MODE_ROW } from '../editing/const'; import type { EditingController } from '../editing/m_editing'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; import gridCoreUtils from '../m_utils'; +import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; import modules from '../modules/modules'; import type { OptionChanged, RowKey } from '../types'; import type { RowsView } from '../views/rows_view'; import type { ColumnWidth, ViewCellOptions } from '../views/types'; import { isPercentWidth } from '../views/utils'; import { - ADAPTIVE_COLUMN_BUTTON_CLASS, ADAPTIVE_COLUMN_NAME, - ADAPTIVE_COLUMN_NAME_CLASS, - ADAPTIVE_ITEM_TEXT_CLASS, ADAPTIVE_NAMESPACE, ADAPTIVE_ROW_TYPE, + CLASSES, COLUMN_HEADERS_VIEW, COLUMN_VIEWS, - COMMAND_ADAPTIVE_HIDDEN_CLASS, - EDIT_MODE_FORM, - EDIT_MODE_POPUP, - EDIT_MODE_ROW, - FORM_ITEM_MODIFIED, - HIDDEN_COLUMN_CLASS, HIDDEN_COLUMNS_WIDTH, - MASTER_DETAIL_CELL_CLASS, ROWS_VIEW, } from './const'; import type { @@ -71,7 +64,7 @@ function adaptiveCellTemplate(container: DxElement, options: ViewCellOptions): v if (options.rowType === 'data') { const $adaptiveColumnButton = $('') - .addClass(adaptiveColumnsController.addWidgetPrefix(ADAPTIVE_COLUMN_BUTTON_CLASS)); + .addClass(adaptiveColumnsController.addWidgetPrefix(CLASSES.adaptiveColumnButton)); eventsEngine.on( $adaptiveColumnButton, @@ -117,7 +110,7 @@ export class AdaptiveColumnsViewController extends modules.ViewController { command: ADAPTIVE_COLUMN_NAME, visible: true, adaptiveHidden: true, - cssClass: ADAPTIVE_COLUMN_NAME_CLASS, + cssClass: CLASSES.commandAdaptive, alignment: 'center', width: 'auto', cellTemplate: adaptiveCellTemplate, @@ -228,14 +221,14 @@ export class AdaptiveColumnsViewController extends modules.ViewController { container.innerHTML = text; } - $container.addClass(ADAPTIVE_ITEM_TEXT_CLASS); + $container.addClass(CLASSES.adaptiveItemText); if (!isDefined(text) || text === '') { $container.html(' '); } if (!this._isRowEditMode()) { if (this._isItemModified(item, cellOptions)) { - $container.addClass(FORM_ITEM_MODIFIED); + $container.addClass(CLASSES.itemModified); } } @@ -281,7 +274,7 @@ export class AdaptiveColumnsViewController extends modules.ViewController { value: this._getValueFromCellOptions(columnIndex, cellOptions), }), () => { $container.contents().remove(); - $container.removeClass(ADAPTIVE_ITEM_TEXT_CLASS); + $container.removeClass(CLASSES.adaptiveItemText); renderFormTemplate(); }); @@ -501,9 +494,9 @@ export class AdaptiveColumnsViewController extends modules.ViewController { * @extended: keyboard_navigation */ protected _showHiddenCellsInView({ $cells, isCommandColumn }: HiddenCellsInViewOptions): void { - let cssClassNameToRemove = this.addWidgetPrefix(HIDDEN_COLUMN_CLASS); + let cssClassNameToRemove = this.addWidgetPrefix(CLASSES.hiddenColumn); if (isCommandColumn) { - cssClassNameToRemove = COMMAND_ADAPTIVE_HIDDEN_CLASS; + cssClassNameToRemove = CLASSES.commandAdaptiveHidden; $cells.attr({ tabIndex: 0, 'aria-hidden': null, @@ -519,14 +512,14 @@ export class AdaptiveColumnsViewController extends modules.ViewController { if (view && view.isVisible() && view.element()) { const viewName = view.name; // @ts-expect-error the view is rendered here - const $hiddenCommandCells = view.element().find(`.${COMMAND_ADAPTIVE_HIDDEN_CLASS}`); + const $hiddenCommandCells = view.element().find(`.${CLASSES.commandAdaptiveHidden}`); this._showHiddenCellsInView({ viewName, $cells: $hiddenCommandCells, isCommandColumn: true, }); // @ts-expect-error the view is rendered here - const $hiddenCells = view.element().find(`.${this.addWidgetPrefix(HIDDEN_COLUMN_CLASS)}`); + const $hiddenCells = view.element().find(`.${this.addWidgetPrefix(CLASSES.hiddenColumn)}`); this._showHiddenCellsInView({ viewName, $cells: $hiddenCells, @@ -559,7 +552,7 @@ export class AdaptiveColumnsViewController extends modules.ViewController { private _isCellValid($cell: dxElementWrapper | undefined): boolean | number | undefined { return $cell?.length - && !$cell.hasClass(MASTER_DETAIL_CELL_CLASS) + && !$cell.hasClass(MASTER_DETAIL_CLASSES.detailCell) && !$cell.hasClass(VIEW_CLASSES.groupCell); } @@ -636,8 +629,8 @@ export class AdaptiveColumnsViewController extends modules.ViewController { */ protected _hideVisibleCellInView({ $cell, isCommandColumn }: HiddenCellInViewOptions): void { const cssClassNameToAdd = isCommandColumn - ? COMMAND_ADAPTIVE_HIDDEN_CLASS - : this.addWidgetPrefix(HIDDEN_COLUMN_CLASS); + ? CLASSES.commandAdaptiveHidden + : this.addWidgetPrefix(CLASSES.hiddenColumn); $cell.attr({ tabIndex: -1, 'aria-hidden': true, diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity_module.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity_module.ts index 9fd7c9310679..cf164f8285c6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity_module.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity_module.ts @@ -1,4 +1,5 @@ import type { InternalGridOptions, Module } from '../types'; +import { AdaptiveColumnsViewController } from './adaptivity'; import { adaptivityColumnsControllerExtender } from './extenders/adaptivity_columns_controller'; import { adaptivityColumnsResizerViewControllerExtender } from './extenders/adaptivity_columns_resizer_view_controller'; import { adaptivityDataControllerExtender } from './extenders/adaptivity_data_controller'; @@ -9,7 +10,6 @@ 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 { AdaptiveColumnsViewController } from './m_adaptivity'; export const adaptivityModule: Module = { defaultOptions(): Pick { diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/const.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/const.ts index c77fd774e6e0..00fd3d070b21 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/const.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/const.ts @@ -7,23 +7,19 @@ export const ADAPTIVE_NAMESPACE = 'dxDataGridAdaptivity'; export const HIDDEN_COLUMNS_WIDTH = 'adaptiveHidden'; export const ADAPTIVE_ROW_TYPE = 'detailAdaptive'; -export const FORM_ITEM_MODIFIED = 'dx-item-modified'; +export const CLASSES = { + itemModified: 'dx-item-modified', + hiddenColumn: 'hidden-column', + adaptiveColumnButton: 'adaptive-more', + commandAdaptive: 'dx-command-adaptive', + commandAdaptiveHidden: 'dx-command-adaptive-hidden', + adaptiveDetailRow: 'dx-adaptive-detail-row', + adaptiveItemText: 'dx-adaptive-item-text', + lastDataCell: 'dx-last-data-cell', + revertTooltip: 'revert-tooltip', +}; -export const HIDDEN_COLUMN_CLASS = 'hidden-column'; -export const ADAPTIVE_COLUMN_BUTTON_CLASS = 'adaptive-more'; -export const ADAPTIVE_COLUMN_NAME_CLASS = 'dx-command-adaptive'; -export const COMMAND_ADAPTIVE_HIDDEN_CLASS = 'dx-command-adaptive-hidden'; -export const ADAPTIVE_DETAIL_ROW_CLASS = 'dx-adaptive-detail-row'; -export const ADAPTIVE_ITEM_TEXT_CLASS = 'dx-adaptive-item-text'; -export const MASTER_DETAIL_CELL_CLASS = 'dx-master-detail-cell'; -export const LAST_DATA_CELL_CLASS = 'dx-last-data-cell'; export const ADAPTIVE_COLUMN_NAME = 'adaptive'; -export const EDIT_MODE_BATCH = 'batch'; -export const EDIT_MODE_ROW = 'row'; -export const EDIT_MODE_FORM = 'form'; -export const EDIT_MODE_POPUP = 'popup'; -export const REVERT_TOOLTIP_CLASS = 'revert-tooltip'; export const EXPAND_ARIA_NAME = 'dxDataGrid-ariaAdaptiveExpand'; export const COLLAPSE_ARIA_NAME = 'dxDataGrid-ariaAdaptiveCollapse'; -export const LEGACY_SCROLLING_MODE = 'scrolling.legacyMode'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_columns_controller.ts index e3a1694ebb35..78208ef8e850 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_columns_controller.ts @@ -4,8 +4,8 @@ import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/c import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { ModuleType } from '@ts/grids/grid_core/types'; +import type { AdaptiveColumnsViewController } from '../adaptivity'; import { HIDDEN_COLUMNS_WIDTH } from '../const'; -import type { AdaptiveColumnsViewController } from '../m_adaptivity'; export const adaptivityColumnsControllerExtender = ( Base: ModuleType, diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts index ea74f2356aec..72ea40dbb6b4 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts @@ -6,13 +6,9 @@ import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { MasterDetailDataControllerExtension } from '@ts/grids/grid_core/master_detail/m_master_detail'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; -import { - ADAPTIVE_ROW_TYPE, - COLLAPSE_ARIA_NAME, - EXPAND_ARIA_NAME, - LEGACY_SCROLLING_MODE, -} from '../const'; -import type { AdaptiveColumnsViewController } from '../m_adaptivity'; +import { LEGACY_SCROLLING_MODE } from '../../virtual_scrolling/const'; +import type { AdaptiveColumnsViewController } from '../adaptivity'; +import { ADAPTIVE_ROW_TYPE, COLLAPSE_ARIA_NAME, EXPAND_ARIA_NAME } from '../const'; import type { AdaptivityDataController } from '../types'; import { getAdaptiveDetailRowIndex, resolveAdaptiveDetailRowTarget } from '../utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts index 5e3c7931d775..83651aebb3e6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts @@ -9,11 +9,8 @@ import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; -import { - ADAPTIVE_ROW_TYPE, - EDIT_MODE_BATCH, - EDIT_MODE_ROW, -} from '../const'; +import { EDIT_MODE_BATCH, EDIT_MODE_ROW } from '../../editing/const'; +import { ADAPTIVE_ROW_TYPE } from '../const'; import type { AdaptivityDataController } from '../types'; export const adaptivityEditingViewControllerExtender = ( diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editor_factory_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editor_factory_view_controller.ts index 1c30e513c222..350d6faee60c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editor_factory_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editor_factory_view_controller.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; -import { REVERT_TOOLTIP_CLASS } from '../const'; +import { CLASSES } from '../const'; export const adaptivityEditorFactoryViewControllerExtender = ( Base: ModuleType, @@ -21,6 +21,6 @@ export const adaptivityEditorFactoryViewControllerExtender = ( * Overrides interface */ public _getRevertTooltipsSelector() { - return `${super._getRevertTooltipsSelector()}, .${FIELD_ITEM_CONTENT_CLASS} .${this.addWidgetPrefix(REVERT_TOOLTIP_CLASS)}`; + return `${super._getRevertTooltipsSelector()}, .${FIELD_ITEM_CONTENT_CLASS} .${this.addWidgetPrefix(CLASSES.revertTooltip)}`; } }; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_headers_keyboard_navigation_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_headers_keyboard_navigation_view_controller.ts index db4f24b2891a..b13a73de1c52 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_headers_keyboard_navigation_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_headers_keyboard_navigation_view_controller.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { Direction } from '@ts/grids/grid_core/keyboard_navigation/const'; -import type { HeadersKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation'; +import type { HeadersKeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/headers_keyboard_navigation'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { HIDDEN_COLUMNS_WIDTH } from '../const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_keyboard_navigation_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_keyboard_navigation_view_controller.ts index c20c67ea5da5..acd023329731 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_keyboard_navigation_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_keyboard_navigation_view_controller.ts @@ -6,12 +6,7 @@ import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { KeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_keyboard_navigation'; import type { ModuleType } from '@ts/grids/grid_core/types'; -import { - ADAPTIVE_ITEM_TEXT_CLASS, - COMMAND_ADAPTIVE_HIDDEN_CLASS, - HIDDEN_COLUMN_CLASS, - HIDDEN_COLUMNS_WIDTH, -} from '../const'; +import { CLASSES, HIDDEN_COLUMNS_WIDTH } from '../const'; function focusCellHandler(e): void { const $nextCell = e.data?.$nextCell; @@ -28,8 +23,8 @@ export const adaptivityKeyboardNavigationViewControllerExtender = ( public _isCellValid($cell, isClick?) { return ( super._isCellValid($cell, isClick) - && !$cell.hasClass(this.addWidgetPrefix(HIDDEN_COLUMN_CLASS)) - && !$cell.hasClass(COMMAND_ADAPTIVE_HIDDEN_CLASS) + && !$cell.hasClass(this.addWidgetPrefix(CLASSES.hiddenColumn)) + && !$cell.hasClass(CLASSES.commandAdaptiveHidden) ); } @@ -58,6 +53,6 @@ export const adaptivityKeyboardNavigationViewControllerExtender = ( } public _isCellElement($cell) { - return super._isCellElement($cell) || $cell.hasClass(ADAPTIVE_ITEM_TEXT_CLASS); + return super._isCellElement($cell) || $cell.hasClass(CLASSES.adaptiveItemText); } }; 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 321ed75bac2d..fd9581fef2ad 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 @@ -12,13 +12,7 @@ import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import { - ADAPTIVE_COLUMN_NAME_CLASS, - ADAPTIVE_DETAIL_ROW_CLASS, - ADAPTIVE_ROW_TYPE, - EXPAND_ARIA_NAME, - HIDDEN_COLUMN_CLASS, - HIDDEN_COLUMNS_WIDTH, - LAST_DATA_CELL_CLASS, + ADAPTIVE_ROW_TYPE, CLASSES, EXPAND_ARIA_NAME, HIDDEN_COLUMNS_WIDTH, } from '../const'; import type { AdaptivityDataController } from '../types'; @@ -47,7 +41,7 @@ export const adaptivityRowsViewExtender = ( const $row = super._createRow.apply(this, arguments as any); if (row?.rowType === ADAPTIVE_ROW_TYPE && row.key === this._dataController.getAdaptiveExpandedKey()) { - $row.addClass(ADAPTIVE_DETAIL_ROW_CLASS); + $row.addClass(CLASSES.adaptiveDetailRow); } return $row; } @@ -59,7 +53,7 @@ export const adaptivityRowsViewExtender = ( const hiddenColumnsLength = this.adaptiveColumnsController.getHiddenColumns().length; if (hidingColumnsQueueLength && !hiddenColumnsLength) { - getDataCellElements($row).last().addClass(LAST_DATA_CELL_CLASS); + getDataCellElements($row).last().addClass(CLASSES.lastDataCell); } if (options.row.rowType === 'data') { @@ -81,7 +75,7 @@ export const adaptivityRowsViewExtender = ( super._cellPrepared.apply(this, arguments as any); if (options.row.rowType !== ADAPTIVE_ROW_TYPE && options.column.visibleWidth === HIDDEN_COLUMNS_WIDTH) { - $cell.addClass(this.addWidgetPrefix(HIDDEN_COLUMN_CLASS)); + $cell.addClass(this.addWidgetPrefix(CLASSES.hiddenColumn)); } } @@ -120,6 +114,6 @@ export const adaptivityRowsViewExtender = ( // @ts-expect-error const isClickable = super.isClickableElement?.($target) ?? false; - return isClickable || !!$target.closest(`.${ADAPTIVE_COLUMN_NAME_CLASS}`).length; + return isClickable || !!$target.closest(`.${CLASSES.commandAdaptive}`).length; } }; 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 05a95e82c092..ad1eb309d236 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 @@ -17,7 +17,7 @@ import { setWidth } from '@js/core/utils/style'; import { isDefined } from '@js/core/utils/type'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; 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 { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; import { CLASSES as MASTER_DETAIL_CLASSES } from '@ts/grids/grid_core/master_detail/const'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/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 277551363cd8..5c7b5245e0ae 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 @@ -14,7 +14,7 @@ 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'; -import type { HeadersKeyboardNavigationController } from '../keyboard_navigation/m_headers_keyboard_navigation'; +import type { HeadersKeyboardNavigationController } from '../keyboard_navigation/headers_keyboard_navigation'; import { registerKeyboardAction } from '../m_accessibility'; import { ColumnsView } from '../views/columns_view'; import type { ColumnViewTemplate } from '../views/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts index 27de75d39e11..d9176d86c289 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts @@ -2340,7 +2340,7 @@ export class ColumnsController extends modules.Controller { } /** - * @extended: m_adaptivity + * @extended: adaptivity */ // eslint-disable-next-line @typescript-eslint/no-unused-vars public isAdaptiveHiddenColumn(column: Column): boolean { 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 e914d3c7d35e..16aa4ceb4465 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 @@ -24,7 +24,7 @@ import { isDefined, isObject, isString } from '@js/core/utils/type'; import swatchContainer from '@ts/core/utils/swatch_container'; import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_headers/const'; 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 { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; import type { ColumnPoint, ModuleType } from '@ts/grids/grid_core/types'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_column_context_menu_mixin.ts b/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_column_context_menu_mixin.ts index 17ad56ebbecc..073ba047f9fb 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_column_context_menu_mixin.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_column_context_menu_mixin.ts @@ -1,7 +1,7 @@ import messageLocalization from '@js/common/core/localization/message'; +import type { ColumnKeyboardNavigationController } from '../keyboard_navigation/column_keyboard_navigation_core'; import { Direction } from '../keyboard_navigation/const'; -import type { ColumnKeyboardNavigationController } from '../keyboard_navigation/m_column_keyboard_navigation_core'; import type { ModuleType } from '../types'; import type { ColumnsView } from '../views/columns_view'; import { CONTEXT_MENU_MOVE_NEXT_ICON_NAME, CONTEXT_MENU_MOVE_PREVIOUS_ICON_NAME } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/const.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/const.ts index dadb76065519..f722debc51b9 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/const.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/const.ts @@ -104,3 +104,6 @@ export const BUTTON_CLASS = 'dx-button'; export const FORM_BUTTONS_CONTAINER_CLASS = 'form-buttons-container'; export const EDIT_ROW = 'dx-edit-row'; + +export const NEW_ROW_TEMP_KEY_PREFIX = '_DX_KEY_'; +export const GUID_LENGTH = 36; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/editing_utils.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_utils.ts rename to packages/devextreme/js/__internal/grids/grid_core/editing/editing_utils.ts index 2c94fc50aca8..5de9a7f47e92 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/editing_utils.ts @@ -7,6 +7,7 @@ import type { EditingTexts } from '@js/ui/tree_list'; import type { ProcessedItem } from '../data_controller/types'; import type { InternalGrid, RowKey } from '../types'; +import { GUID_LENGTH, NEW_ROW_TEMP_KEY_PREFIX } from './const'; import type { EditFormColumnItem, EditFormItemNode, @@ -15,9 +16,6 @@ import type { EditingCellOptions, } from './types'; -const NEW_ROW_TEMP_KEY_PREFIX = '_DX_KEY_'; -const GUID_LENGTH = 36; - export const createFailureHandler = ( deferred: DeferredObj, ): ((arg: unknown) => void) => (arg: unknown): void => { diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts index a5391cd1dc50..ade3e81adac6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts @@ -14,8 +14,8 @@ import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType, OptionChanged } from '@ts/grids/grid_core/types'; import { EDITING_EDITROWKEY_OPTION_NAME } from '../const'; +import { isCellModified } from '../editing_utils'; import type { EditingController } from '../m_editing'; -import { isCellModified } from '../m_editing_utils'; export interface EditingDataControllerExtension { _editingController: EditingController; 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 4b9663e3249f..214915a77a1d 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 @@ -92,9 +92,6 @@ import { VIEWPORT_BOTTOM_NEW_ROW_POSITION, VIEWPORT_TOP_NEW_ROW_POSITION, } from './const'; -import { editingDataControllerExtender } from './extenders/editing_data_controller'; -import type { ICellBasedEditingControllerExtender } from './m_editing_cell_based'; -import type { IFormBasedEditingControllerExtender } from './m_editing_form_based'; import { createFailureHandler, generateNewRowTempKey, @@ -103,7 +100,10 @@ import { getEditingTexts, isEditingCell, isEditingOrShowEditorAlwaysDataCell, -} from './m_editing_utils'; +} from './editing_utils'; +import { editingDataControllerExtender } from './extenders/editing_data_controller'; +import type { ICellBasedEditingControllerExtender } from './m_editing_cell_based'; +import type { IFormBasedEditingControllerExtender } from './m_editing_form_based'; import type { AllowEditActionValue, EditActionOptions, 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 4d51f4a4f75e..5c91af8281e8 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 @@ -30,8 +30,8 @@ import { ROW_REMOVED, TARGET_COMPONENT_NAME, } from './const'; +import { isEditable } from './editing_utils'; import type { EditingController } from './m_editing'; -import { isEditable } from './m_editing_utils'; import type { NormalizedEditCellOptions } from './types'; export interface ICellBasedEditingControllerExtender { 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 6cc8ec5f49a1..f786978873b1 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 @@ -34,9 +34,9 @@ import { FOCUSABLE_ELEMENT_SELECTOR, FORM_BUTTONS_CONTAINER_CLASS, } from './const'; +import { forEachFormItems, getEditorType } from './editing_utils'; import { editingFormBasedDataControllerExtender } from './extenders/editing_form_based_data_controller'; import type { EditingController } from './m_editing'; -import { forEachFormItems, getEditorType } from './m_editing_utils'; export interface IFormBasedEditingControllerExtender { // eslint-disable-next-line @typescript-eslint/method-signature-style diff --git a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/const.ts b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/const.ts new file mode 100644 index 000000000000..2e5bfa6bf081 --- /dev/null +++ b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/const.ts @@ -0,0 +1,12 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import { addNamespace } from '@js/common/core/events/utils/index'; + +export const CLASSES = { + editorInlineBlock: 'dx-editor-inline-block', + focusedCellModified: 'dx-focused-cell-modified', + focusedCellInvalid: 'dx-focused-cell-invalid', + hidden: 'dx-hidden', +}; + +export const MODULE_NAMESPACE = 'dxDataGridEditorFactory'; +export const UPDATE_FOCUS_EVENTS = addNamespace([clickEventName, 'focusin'].join(' '), MODULE_NAMESPACE); 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/editor_factory.ts similarity index 90% rename from packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts rename to packages/devextreme/js/__internal/grids/grid_core/editor_factory/editor_factory.ts index 735c1de9250d..3e4c65f7dcab 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/editor_factory.ts @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/method-signature-style */ import positionUtils from '@js/common/core/animation/position'; -import { name as clickEventName } from '@js/common/core/events/click'; import eventsEngine from '@js/common/core/events/core/events_engine'; import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; @@ -24,25 +23,17 @@ import type { ValidatingController } from '@ts/grids/grid_core/validating/m_vali import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { ColumnsController } from '../columns_controller/columns_controller'; +import { CELL_FOCUS_DISABLED_CLASS, CELL_MODIFIED_CLASS, FOCUS_OVERLAY_CLASS } from '../editing/const'; import type { EditingController } from '../editing/m_editing'; +import { CLASSES as KEYBOARD_NAVIGATION_CLASSES } from '../keyboard_navigation/const'; import { isDataRow } from '../keyboard_navigation/utils'; import gridCoreUtils from '../m_utils'; import type { ViewController } from '../modules/modules'; import modules from '../modules/modules'; import type { Module, ModuleType } from '../types'; +import { INVALIDATE_CLASS } from '../validating/const'; import type { RowsView } from '../views/rows_view'; - -const EDITOR_INLINE_BLOCK = 'dx-editor-inline-block'; -const CELL_FOCUS_DISABLED_CLASS = 'dx-cell-focus-disabled'; -const CELL_MODIFIED_CLASS = 'dx-cell-modified'; -const CELL_INVALID_CLASS = 'invalid'; -const FOCUSED_CELL_MODIFIED_CLASS = 'dx-focused-cell-modified'; -const FOCUSED_CELL_INVALID_CLASS = 'dx-focused-cell-invalid'; -const FOCUS_OVERLAY_CLASS = 'focus-overlay'; -const FOCUSED_ELEMENT_CLASS = 'dx-focused'; -const MODULE_NAMESPACE = 'dxDataGridEditorFactory'; -const UPDATE_FOCUS_EVENTS = addNamespace([clickEventName, 'focusin'].join(' '), MODULE_NAMESPACE); -const DX_HIDDEN = 'dx-hidden'; +import { CLASSES, MODULE_NAMESPACE, UPDATE_FOCUS_EVENTS } from './const'; interface EditorFactoryMixinType { createEditor($container: dxElementWrapper, options: object): void; @@ -171,7 +162,7 @@ export class EditorFactory extends ViewControllerWithMixin { const isRowsView = !!rowsViewElement && $element.closest(rowsViewElement).length > 0; const isEditing = this._editingController.isEditing(); - return $element.hasClass(EDITOR_INLINE_BLOCK) || (isRowsView && !isEditing); + return $element.hasClass(CLASSES.editorInlineBlock) || (isRowsView && !isEditing); } private _updateFocus(e: { event?: DxEvent }): void { @@ -229,18 +220,18 @@ export class EditorFactory extends ViewControllerWithMixin { const $focusOverlay: dxElementWrapper = this._$focusOverlay; if (isHideBorder || isDataRow($element)) { - $focusOverlay.addClass(DX_HIDDEN); + $focusOverlay.addClass(CLASSES.hidden); } else if ($element.length) { const align = browser.mozilla ? 'right bottom' : 'left top'; - const isFocusedCellInvalid = $element.hasClass(this.addWidgetPrefix(CELL_INVALID_CLASS)); + const isFocusedCellInvalid = $element.hasClass(this.addWidgetPrefix(INVALIDATE_CLASS)); const isFocusedCellModified = $element.hasClass(CELL_MODIFIED_CLASS) && !isFocusedCellInvalid; const $content = this.getFocusOverlayContainer($element); const focusOverlaySize = this.getFocusOverlaySize($element); $focusOverlay - .removeClass(DX_HIDDEN) - .toggleClass(FOCUSED_CELL_INVALID_CLASS, isFocusedCellInvalid) - .toggleClass(FOCUSED_CELL_MODIFIED_CLASS, isFocusedCellModified) + .removeClass(CLASSES.hidden) + .toggleClass(CLASSES.focusedCellInvalid, isFocusedCellInvalid) + .toggleClass(CLASSES.focusedCellModified, isFocusedCellModified) .appendTo($content); setOuterHeight($focusOverlay, focusOverlaySize.height); @@ -289,7 +280,7 @@ export class EditorFactory extends ViewControllerWithMixin { if (!$element.is(this._$focusedElement)) { // TODO: this code should be before timeout // else focus is not will move to adaptive form by shift + tab key - this._$focusedElement?.removeClass(FOCUSED_ELEMENT_CLASS); + this._$focusedElement?.removeClass(KEYBOARD_NAVIGATION_CLASSES.focused); } this._$focusedElement = $element; @@ -299,7 +290,7 @@ export class EditorFactory extends ViewControllerWithMixin { this.renderFocusOverlay($element, isHideBorder); - $element.addClass(FOCUSED_ELEMENT_CLASS); + $element.addClass(KEYBOARD_NAVIGATION_CLASSES.focused); this.focused.fire($element); }); } @@ -325,9 +316,9 @@ export class EditorFactory extends ViewControllerWithMixin { */ // eslint-disable-next-line @typescript-eslint/no-unused-vars -- overridable signature public loseFocus(skipValidator?: boolean): void { - this._$focusedElement?.removeClass(FOCUSED_ELEMENT_CLASS); + this._$focusedElement?.removeClass(KEYBOARD_NAVIGATION_CLASSES.focused); this._$focusedElement = null; - this._$focusOverlay?.addClass(DX_HIDDEN); + this._$focusOverlay?.addClass(CLASSES.hidden); } private _getContainerRoot(): Node { @@ -361,7 +352,7 @@ export class EditorFactory extends ViewControllerWithMixin { } public hasOverlayElements(): boolean { - return !!this._$focusOverlay?.length && !this._$focusOverlay.hasClass(DX_HIDDEN); + return !!this._$focusOverlay?.length && !this._$focusOverlay.hasClass(CLASSES.hidden); } } 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 c0be7ce51540..72f6be3e932f 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 @@ -13,9 +13,9 @@ import type { ColumnsController } from '../columns_controller/columns_controller import type { ColumnDataSourceParameter } from '../columns_controller/types'; import type { DataController } from '../data_controller/data_controller'; import type { DataChange } from '../data_controller/types'; +import { isNewRowTempKey } from '../editing/editing_utils'; import type { EditingController } from '../editing/m_editing'; -import { isNewRowTempKey } from '../editing/m_editing_utils'; -import type { EditorFactory } from '../editor_factory/m_editor_factory'; +import type { EditorFactory } from '../editor_factory/editor_factory'; import { combineFilters } from '../filter/utils'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts index 5a16157bbfe4..592f69cc7688 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts @@ -15,7 +15,7 @@ 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 type { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; 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'; @@ -23,7 +23,7 @@ import type { ColumnWidth, ScrollPosition, ViewDataChange } from '@ts/grids/grid 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'; +import type { AdaptiveColumnsViewController } from '../adaptivity/adaptivity'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; import type { ColumnsController } from '../columns_controller/columns_controller'; import { GROUP_COMMAND_COLUMN_NAME } from '../columns_controller/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_focus_dispatcher.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_focus_dispatcher.ts index 5c1021463700..ad151f4734c0 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_focus_dispatcher.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_focus_dispatcher.ts @@ -1,7 +1,7 @@ import { isDefined } from '@js/core/utils/type'; import { Controller } from '../modules/modules'; -import type { ColumnKeyboardNavigationController } from './m_column_keyboard_navigation_core'; +import type { ColumnKeyboardNavigationController } from './column_keyboard_navigation_core'; export class ColumnFocusDispatcher extends Controller { private readonly keyboardNavigationControllers: ColumnKeyboardNavigationController[] = []; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_keyboard_navigation_core.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core.ts rename to packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_keyboard_navigation_core.ts index a837b427f11b..ddd2abd93106 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/column_keyboard_navigation_core.ts @@ -4,7 +4,7 @@ import type { Column, DropLocationNames } from '@ts/grids/grid_core/columns_cont import type { ColumnFocusDispatcher } from './column_focus_dispatcher'; import { Direction } from './const'; -import { KeyboardNavigationController as KeyboardNavigationControllerCore } from './m_keyboard_navigation_core'; +import { KeyboardNavigationController as KeyboardNavigationControllerCore } from './keyboard_navigation_core'; import type { FocusedCellPosition } from './types'; export class ColumnKeyboardNavigationController extends KeyboardNavigationControllerCore { diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/const.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/const.ts index d7e36d2586da..2ac1fc8ebbcb 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/const.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/const.ts @@ -3,24 +3,16 @@ export const ATTRIBUTES = { dragCell: 'dx-drag-cell', }; -export const EDIT_FORM_CLASS = 'edit-form'; -export const GROUP_FOOTER_CLASS = 'group-footer'; -export const EDIT_FORM_ITEM_CLASS = 'edit-form-item'; -export const VIRTUAL_ROW_CLASS = 'dx-virtual-row'; -export const MASTER_DETAIL_CELL_CLASS = 'dx-master-detail-cell'; -export const EDITOR_CELL_CLASS = 'dx-editor-cell'; -export const DROPDOWN_EDITOR_OVERLAY_CLASS = 'dx-dropdowneditor-overlay'; -export const ADAPTIVE_COLUMN_NAME_CLASS = 'dx-command-adaptive'; -export const ADAPTIVE_ITEM_TEXT_CLASS = 'dx-adaptive-item-text'; -export const COMMAND_SELECT_CLASS = 'dx-command-select'; -export const COMMAND_EDIT_CLASS = 'dx-command-edit'; +export const CLASSES = { + groupFooter: 'group-footer', + focusState: 'dx-state-focused', + widget: 'dx-widget', + revertButton: 'dx-revert-button', + focused: 'dx-focused', +}; + export const COMMAND_CELL_SELECTOR = '[class^=dx-command]'; -export const CELL_FOCUS_DISABLED_CLASS = 'dx-cell-focus-disabled'; export const DATEBOX_WIDGET_NAME = 'dxDateBox'; -export const FOCUS_STATE_CLASS = 'dx-state-focused'; -export const WIDGET_CLASS = 'dx-widget'; -export const REVERT_BUTTON_CLASS = 'dx-revert-button'; -export const FOCUSED_CLASS = 'dx-focused'; export const FAST_EDITING_DELETE_KEY = 'delete'; @@ -35,8 +27,6 @@ export const INTERACTIVE_ELEMENTS_SELECTOR = ` `; export const NON_FOCUSABLE_ELEMENTS_SELECTOR = `${INTERACTIVE_ELEMENTS_SELECTOR}, .dx-dropdowneditor-icon`; -export const EDIT_MODE_FORM = 'form'; - export const FOCUS_TYPE_ROW = 'row'; export const FOCUS_TYPE_CELL = 'cell'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/headers_keyboard_navigation.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation.ts rename to packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/headers_keyboard_navigation.ts index 2e767484df1a..3bcf17d2aa60 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/headers_keyboard_navigation.ts @@ -15,8 +15,8 @@ import { GridCoreStickyColumnsDom } from '../sticky_columns/dom'; import { getColumnFixedPosition } from '../sticky_columns/utils'; import type { Views } from '../types'; import { ColumnFocusDispatcher } from './column_focus_dispatcher'; +import { ColumnKeyboardNavigationController } from './column_keyboard_navigation_core'; import { Direction } from './const'; -import { ColumnKeyboardNavigationController } from './m_column_keyboard_navigation_core'; import type { FocusedCellPosition } from './types'; export class HeadersKeyboardNavigationController extends ColumnKeyboardNavigationController { diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation_core.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation_core.ts rename to packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.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 321c3260996d..b0de0af203f8 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 @@ -25,7 +25,7 @@ import * as accessibility from '@js/ui/shared/accessibility'; import { isElementInDom } from '@ts/core/utils/m_dom'; import { focused } from '@ts/core/utils/selectors'; import type { KeyboardKeyDownEvent } from '@ts/events/core/keyboard_processor'; -import type { AdaptiveColumnsViewController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; +import type { AdaptiveColumnsViewController } from '@ts/grids/grid_core/adaptivity/adaptivity'; import { CLASSES as COLUMNS_CONTROLLER_CLASSES } from '@ts/grids/grid_core/columns_controller/const'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; @@ -40,8 +40,13 @@ import type { VirtualScrollingDataControllerExtension } from '@ts/grids/grid_cor import type Scrollable from '@ts/ui/scroll_view/scrollable'; import { memoize } from '@ts/utils/memoize'; +import { CLASSES as ADAPTIVITY_CLASSES } from '../adaptivity/const'; import { + CELL_FOCUS_DISABLED_CLASS, + COMMAND_EDIT_CLASS, + DROPDOWN_EDITOR_OVERLAY_CLASS, EDIT_FORM_CLASS, + EDIT_FORM_ITEM_CLASS, EDIT_MODE_BATCH, EDIT_MODE_CELL, EDIT_MODE_FORM, @@ -50,36 +55,28 @@ import { FOCUSABLE_ELEMENT_SELECTOR, } from '../editing/const'; import gridCoreUtils from '../m_utils'; +import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; +import { COMMAND_SELECT_CLASS } from '../selection/const'; import type { Controllers, ModuleType, RowKey, Views, } from '../types'; import { - ADAPTIVE_COLUMN_NAME_CLASS, - CELL_FOCUS_DISABLED_CLASS, + CLASSES, COLUMN_HEADERS_VIEW, COMMAND_CELL_SELECTOR, - COMMAND_EDIT_CLASS, - COMMAND_SELECT_CLASS, DATEBOX_WIDGET_NAME, DRAG_COLUMN_NAME, - DROPDOWN_EDITOR_OVERLAY_CLASS, - EDIT_FORM_ITEM_CLASS, FAST_EDITING_DELETE_KEY, - FOCUS_STATE_CLASS, FOCUS_TYPE_CELL, FOCUS_TYPE_ROW, FOCUSED_CELL_KEYS, - FOCUSED_CLASS, FUNCTIONAL_KEYS, INTERACTIVE_ELEMENTS_SELECTOR, - MASTER_DETAIL_CELL_CLASS, NON_FOCUSABLE_ELEMENTS_SELECTOR, - REVERT_BUTTON_CLASS, ROWS_VIEW, - WIDGET_CLASS, } from './const'; import { GridCoreKeyboardNavigationDom } from './dom'; -import { KeyboardNavigationController as KeyboardNavigationControllerCore } from './m_keyboard_navigation_core'; +import { KeyboardNavigationController as KeyboardNavigationControllerCore } from './keyboard_navigation_core'; import { keyboardNavigationScrollableA11yExtender } from './scrollable_a11y'; import type { FocusedCellPosition, KeyDownEvent, NavigationDirection, NavigationElementType, NavigationKeyCode, @@ -707,7 +704,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo } private isInsideMasterDetail($target): boolean { - const $masterDetail = $target.closest(`.${MASTER_DETAIL_CELL_CLASS}`); + const $masterDetail = $target.closest(`.${MASTER_DETAIL_CLASSES.detailCell}`); return !!$masterDetail.get(0) && this.elementIsInsideGrid($masterDetail) && !$target.is($masterDetail); @@ -858,7 +855,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo return; } - $(this._focusedView?.element()).addClass(FOCUS_STATE_CLASS); + $(this._focusedView?.element()).addClass(CLASSES.focusState); const { isLastValidCell, isOriginalHandlerRequired } = this.getTabBoundaryInfo(event); @@ -1273,7 +1270,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo const needExpandGroupRow = this.option('grouping.allowCollapsing') && isGroupRow($row); const needExpandMasterDetailRow = this.option('masterDetail.enabled') && $cell?.hasClass(COLUMNS_CONTROLLER_CLASSES.commandExpand); - const needExpandAdaptiveRow = $cell?.hasClass(ADAPTIVE_COLUMN_NAME_CLASS); + const needExpandAdaptiveRow = $cell?.hasClass(ADAPTIVITY_CLASSES.commandAdaptive); if (needExpandGroupRow || needExpandMasterDetailRow) { const item = this._dataController.items()[rowIndex]; @@ -1609,7 +1606,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo const isInteractiveElement = $(event.target).is( INTERACTIVE_ELEMENTS_SELECTOR, ); - const isRevertButton = !!$(event.target).closest(`.${REVERT_BUTTON_CLASS}`) + const isRevertButton = !!$(event.target).closest(`.${CLASSES.revertButton}`) .length; const isExpandCommandCell = $target.hasClass(COLUMNS_CONTROLLER_CLASSES.commandExpand); @@ -1624,7 +1621,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo $target = this._isInsideEditForm($target) ? $(event.target) : $target; this._focusView(); - $(focusedViewElement).removeClass(FOCUS_STATE_CLASS); + $(focusedViewElement).removeClass(CLASSES.focusState); if ($parent.hasClass(VIEW_CLASSES.freeSpaceRow)) { this._updateFocusedCellPosition($target); @@ -1832,7 +1829,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo .filter((i, node) => gridCoreUtils.isElementInCurrentGrid(this, $(node))) .not($focusElement) .removeClass(CELL_FOCUS_DISABLED_CLASS) - .removeClass(FOCUSED_CLASS) + .removeClass(CLASSES.focused) .removeAttr('tabindex'); } @@ -1840,7 +1837,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo if (e.relatedTarget) { $focusElement .removeClass(CELL_FOCUS_DISABLED_CLASS) - .removeClass(FOCUSED_CLASS); + .removeClass(CLASSES.focused); } }); if (!skipFocusEvent) { @@ -1960,7 +1957,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo } private _focusEditFormCell($cell) { - if ($cell.hasClass(MASTER_DETAIL_CELL_CLASS)) { + if ($cell.hasClass(MASTER_DETAIL_CLASSES.detailCell)) { this._editorFactory.focus($cell, true); } } @@ -2475,7 +2472,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo const inputValue = this._getKeyPressInputValue($input, editorValue); $input.val(inputValue); - const $widgetContainer = $input.closest(`.${WIDGET_CLASS}`); + const $widgetContainer = $input.closest(`.${CLASSES.widget}`); eventsEngine.off($widgetContainer, 'focusout'); // for NumberBox to save entered symbol eventsEngine.one($widgetContainer, 'focusout', () => { // @ts-expect-error @@ -2833,7 +2830,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo public getMasterDetailCell(element): dxElementWrapper | null { const $masterDetailCell = $(element).closest( - `.${MASTER_DETAIL_CELL_CLASS}`, + `.${MASTER_DETAIL_CLASSES.detailCell}`, ); if ($masterDetailCell.length && this.elementIsInsideGrid($masterDetailCell)) { diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/utils.ts index 75c0ce3142ad..212a94d59c8e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/utils.ts @@ -5,17 +5,14 @@ import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_he import { CLASSES as MASTER_DETAIL_CLASSES } from '@ts/grids/grid_core/master_detail/const'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; +import { CLASSES as ADAPTIVITY_CLASSES } from '../adaptivity/const'; import type { Column } from '../columns_controller/types'; -import { EDIT_ROW, EDITOR_CELL_CLASS } from '../editing/const'; -import { - ADAPTIVE_ITEM_TEXT_CLASS, - COMMAND_SELECT_CLASS, - EDIT_FORM_CLASS, - INTERACTIVE_ELEMENTS_SELECTOR, - VIRTUAL_ROW_CLASS, -} from './const'; +import { EDIT_FORM_CLASS, EDIT_ROW, EDITOR_CELL_CLASS } from '../editing/const'; +import { COMMAND_SELECT_CLASS } from '../selection/const'; +import { VIRTUAL_ROW_CLASS } from '../virtual_scrolling/const'; +import { INTERACTIVE_ELEMENTS_SELECTOR } from './const'; +import type { KeyboardNavigationController as KeyboardNavigationControllerCore } from './keyboard_navigation_core'; import type { KeyboardNavigationController } from './m_keyboard_navigation'; -import type { KeyboardNavigationController as KeyboardNavigationControllerCore } from './m_keyboard_navigation_core'; import type { NavigationDirection } from './types'; const DATAGRID_GROUP_FOOTER_CLASS = 'dx-datagrid-group-footer'; @@ -35,7 +32,7 @@ export const isDetailRow = ( export const isAdaptiveItem = ( $element: dxElementWrapper, -): boolean => $element?.hasClass(ADAPTIVE_ITEM_TEXT_CLASS); +): boolean => $element?.hasClass(ADAPTIVITY_CLASSES.adaptiveItemText); export const isEditRow = ($row: dxElementWrapper): boolean => $row?.hasClass(EDIT_ROW); 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 b1f2de0dc973..0d6658249804 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 @@ -5,7 +5,7 @@ import type { DeferredObj } from '@js/core/utils/deferred'; 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 { EditorFactory } from '@ts/grids/grid_core/editor_factory/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'; @@ -16,7 +16,7 @@ import type { ColumnsResizerViewController, DraggingHeaderViewController, } from '../columns_resizing_reordering/m_columns_resizing_reordering'; -import type { HeadersKeyboardNavigationController } from '../keyboard_navigation/m_headers_keyboard_navigation'; +import type { HeadersKeyboardNavigationController } from '../keyboard_navigation/headers_keyboard_navigation'; import { isAdaptiveItem, isGroupFooterRow, diff --git a/packages/devextreme/js/__internal/grids/grid_core/types.ts b/packages/devextreme/js/__internal/grids/grid_core/types.ts index 65132f94ac0d..ca515f29db30 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/types.ts @@ -269,7 +269,7 @@ export type OptionChangedFor = { export type OptionChanged = OptionChangedFor; export interface Controllers { - adaptiveColumns: import('./adaptivity/m_adaptivity').AdaptiveColumnsViewController; + adaptiveColumns: import('./adaptivity/adaptivity').AdaptiveColumnsViewController; applyFilter: import('./filter_row/m_filter_row').ApplyFilterViewController; columnChooser: import('./column_chooser/m_column_chooser').ColumnChooserController; columns: import('./columns_controller/columns_controller').ColumnsController; @@ -279,7 +279,7 @@ export interface Controllers { dataSource: import('./data_source/data_source_controller').DataSourceController; draggingHeader: import('./columns_resizing_reordering/m_columns_resizing_reordering').DraggingHeaderViewController; editing: import('./editing/m_editing').EditingController; - editorFactory: import('./editor_factory/m_editor_factory').EditorFactory; + editorFactory: import('./editor_factory/editor_factory').EditorFactory; errorHandling: import('./error_handling/error_handling_view_controller').ErrorHandlingViewController; // todo: export is dataGrid-only controller export: import('../data_grid/export/m_export').ExportController; @@ -290,7 +290,7 @@ export interface Controllers { headerFilter: import('./header_filter/m_header_filter').HeaderFilterController; 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; + headersKeyboardNavigation: import('./keyboard_navigation/headers_keyboard_navigation').HeadersKeyboardNavigationController; resizing: import('./grid_view/grid_view').ResizingController; selection: import('./selection/m_selection').SelectionController; validating: import('./validating/m_validating').ValidatingController; 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 ea4409bc481d..791f6190ae75 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 @@ -27,7 +27,7 @@ import Validator from '@js/ui/validator'; import errors from '@js/ui/widget/ui.errors'; import { focused } from '@ts/core/utils/selectors'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; -import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/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/rows_view'; 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 c2a0ccf32e8f..478593987de9 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,8 +29,8 @@ 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 type { AdaptiveColumnsViewController } from '@ts/grids/grid_core/adaptivity/adaptivity'; 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'; import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_headers/const'; @@ -42,7 +42,7 @@ import type { } from '@ts/grids/grid_core/columns_controller/types'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataChange, ProcessedItem } from '@ts/grids/grid_core/data_controller/types'; -import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; import { CLASSES as ERROR_HANDLING_CLASSES } from '@ts/grids/grid_core/error_handling/const'; import { CLASSES as FILTER_ROW_CLASSES } from '@ts/grids/grid_core/filter_row/const'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/editing/controller.ts b/packages/devextreme/js/__internal/grids/new/grid_core/editing/controller.ts index 6fe980ed0d9d..c3e584f7d081 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/editing/controller.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/editing/controller.ts @@ -4,7 +4,7 @@ import { applyChanges } from '@js/common/data'; import { isDefined } from '@js/core/utils/type'; import messageLocalization from '@js/localization/message'; import { computed, type Signal } from '@ts/core/state_manager/index'; -import { generateNewRowTempKey } from '@ts/grids/grid_core/editing/m_editing_utils'; +import { generateNewRowTempKey } from '@ts/grids/grid_core/editing/editing_utils'; import { OptionsValidationController } from '@ts/grids/new/grid_core/options_validation/index'; import { ColumnsController } from '../columns_controller/columns_controller'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/editing/popup/view.ts b/packages/devextreme/js/__internal/grids/new/grid_core/editing/popup/view.ts index acdb6378a253..3baac4771cc8 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/editing/popup/view.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/editing/popup/view.ts @@ -8,7 +8,7 @@ import type * as dxForm from '@js/ui/form'; import type { ReadonlySignal } from '@ts/core/state_manager/index'; import { computed, signal } from '@ts/core/state_manager/index'; import { extend } from '@ts/core/utils/m_extend'; -import { forEachFormItems } from '@ts/grids/grid_core/editing/m_editing_utils'; +import { forEachFormItems } from '@ts/grids/grid_core/editing/editing_utils'; import { createRef } from 'inferno'; import { ColumnsController } from '../../columns_controller/columns_controller'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/editor_factory.ts b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/editor_factory.ts index 4c3c9b7bc06f..6765462cc72b 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/editor_factory.ts @@ -1,4 +1,4 @@ -import { editorFactoryModule } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; +import { editorFactoryModule } from '@ts/grids/grid_core/editor_factory/editor_factory'; import treeListCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/headers_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/headers_keyboard_navigation.ts index 7851e06d4b7a..08c1c2051af5 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/headers_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/headers_keyboard_navigation.ts @@ -1,4 +1,4 @@ -import { headersKeyboardNavigationModule } from '@ts/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation'; +import { headersKeyboardNavigationModule } from '@ts/grids/grid_core/keyboard_navigation/headers_keyboard_navigation'; import treeListCore from '../core'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js index 786227fb4416..f52a96905a85 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import 'ui/data_grid'; import { keyboardNavigationModule } from '__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation'; -import { headersKeyboardNavigationModule } from '__internal/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation'; +import { headersKeyboardNavigationModule } from '__internal/grids/grid_core/keyboard_navigation/headers_keyboard_navigation'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import publicComponentUtils from 'core/utils/public_component';