EugeniyKiyashko · Oct 7, 2026 · Oct 6, 2026 · Oct 6, 2026
@@ -77,7 +77,7 @@
 /packages/devextreme/js/ui/sortable.d.ts       @DevExpress/devextreme-grids
 
 /packages/devextreme/js/ui/sortable.js           @DevExpress/devextreme-grids
-/packages/devextreme/js/__internal/m_sortable.ts @DevExpress/devextreme-grids
+/packages/devextreme/js/__internal/sortable.ts @DevExpress/devextreme-grids
 
 /packages/devextreme-scss/scss/widgets/base/_sortable.scss  @DevExpress/devextreme-grids
 /packages/devextreme-scss/scss/widgets/fluent/sortable/**   @DevExpress/devextreme-grids
@@ -92,7 +92,7 @@
 /packages/devextreme/js/ui/draggable.d.ts       @DevExpress/devextreme-grids
 
 /packages/devextreme/js/ui/draggable.js           @DevExpress/devextreme-grids
-/packages/devextreme/js/__internal/m_draggable.ts @DevExpress/devextreme-grids
+/packages/devextreme/js/__internal/draggable.ts @DevExpress/devextreme-grids
 
 /packages/devextreme-scss/scss/widgets/base/_draggable.scss @DevExpress/devextreme-grids
 

@@ -1404,6 +1404,13 @@ class Draggable<
     this._stopAnimator();
   }
 
+  /// #DEBUG
+  // Test-only accessor, removed from production builds.
+  getDragInProgress(): boolean {
+    return !!this.dragInProgress;
+  }
+  /// #ENDDEBUG
+
   _fireDragEnterEvent(sourceEvent: DragEvent): void {
     const args = this._getEventArgs(sourceEvent);
 
@@ -1415,13 +1422,6 @@ class Draggable<
 
     this._getAction('onDragLeave')(args);
   }
-
-  /// #DEBUG
-  // Test-only accessor, removed from production builds.
-  getDragInProgress(): boolean {
-    return !!this.dragInProgress;
-  }
-  /// #ENDDEBUG
 }
 
 registerComponent(DRAGGABLE, Draggable);

@@ -1,7 +1,7 @@
 import { describe, expect, it } from '@jest/globals';
 import type { CustomOperation, Field } from '@js/ui/filter_builder';
 
-import { getCurrentValueText, getFilterOperations } from '../m_utils';
+import { getCurrentValueText, getFilterOperations } from '../utils';
 
 describe('Formatting', () => {
   it('empty string', () => {

@@ -22,7 +22,7 @@ import type { OptionChanged } from '@ts/core/widget/types';
 import Widget from '@ts/core/widget/widget';
 import { getElementMaxHeightByWindow } from '@ts/ui/overlay/utils';
 
-import type { EditorFactoryOwner } from './m_between';
+import type { EditorFactoryOwner } from './between';
 import type {
   Condition,
   ConditionValue,
@@ -32,7 +32,7 @@ import type {
   FilterExpression,
   GroupMenuItem,
   OperationMenuItem,
-} from './m_utils';
+} from './utils';
 import {
   addItem, convertToInnerStructure,
   createCondition, createEmptyGroup,
@@ -44,7 +44,7 @@ import {
   getOperationFromAvailable,
   getOperationValue, isCondition, isGroup, removeItem, renderValueText, setGroupValue,
   updateConditionByOperation,
-} from './m_utils';
+} from './utils';
 
 const FILTER_BUILDER_CLASS = 'dx-filterbuilder';
 const FILTER_BUILDER_GROUP_CLASS = `${FILTER_BUILDER_CLASS}-group`;

@@ -18,9 +18,9 @@ import filterUtils from '@js/ui/shared/filtering';
 import errors from '@js/ui/widget/ui.errors';
 import { getGlobalFormatByDataType } from '@ts/core/global_format_config';
 
-import type { EditorFactoryOwner } from './m_between';
-import { getConfig } from './m_between';
-import filterOperationsDictionary from './m_filter_operations_dictionary';
+import type { EditorFactoryOwner } from './between';
+import { getConfig } from './between';
+import filterOperationsDictionary from './filter_operations_dictionary';
 
 type FieldValue = string | number | boolean | Date | null | undefined;
 export type ConditionValue = FieldValue | FieldValue[];

@@ -189,11 +189,9 @@ export class ColumnsSeparatorView extends SeparatorView {
 
   private _isTransparent?: boolean;
 
-  /// #DEBUG
   private _testPosX?: number;
 
   private _testCursorName?: string;
-  /// #ENDDEBUG
 
   public init() {
     super.init();
@@ -410,9 +408,7 @@ export class DraggingHeaderView extends modules.View {
 
   private _onSelectStart: any;
 
-  /// #DEBUG
   private _testPointsByColumns: any;
-  /// #ENDDEBUG
 
   private getSourceDraggingPanel(): DraggingPanel {
     const {

@@ -8,7 +8,7 @@ import FilterBuilder from '@js/ui/filter_builder';
 import Popup from '@js/ui/popup/ui.popup';
 import ScrollView from '@js/ui/scroll_view';
 import { restoreFocus } from '@js/ui/shared/accessibility';
-import { getFilterExpression, removeFieldConditionsFromFilter } from '@ts/filter_builder/m_utils';
+import { getFilterExpression, removeFieldConditionsFromFilter } from '@ts/filter_builder/utils';
 import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
 import modules from '@ts/grids/grid_core/modules/modules';
 

@@ -11,7 +11,7 @@ import inflector from '@ts/core/utils/m_inflector';
 import {
   getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText,
   getCustomOperation, getField, getGroupValue, isCondition, isGroup,
-} from '@ts/filter_builder/m_utils';
+} from '@ts/filter_builder/utils';
 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 { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller';

@@ -1,4 +1,4 @@
-import { filterHasField } from '@ts/filter_builder/m_utils';
+import { filterHasField } from '@ts/filter_builder/utils';
 import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers';
 import type { FilterController } from '@ts/grids/grid_core/filter/filter_controller';
 import type { ModuleType, OptionChanged } from '@ts/grids/grid_core/types';

@@ -3,7 +3,7 @@ import {
   addItem,
   getMatchedConditions,
   getNormalizedFilter,
-} from '@ts/filter_builder/m_utils';
+} from '@ts/filter_builder/utils';
 import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
 import type {
   Column, ColumnUserState, FilterField,

@@ -7,7 +7,7 @@ import type { CustomOperation } from '@js/ui/filter_builder';
 import errors from '@js/ui/widget/ui.errors';
 import {
   getFilterExpression, isCondition, isGroup, renderValueText,
-} from '@ts/filter_builder/m_utils';
+} from '@ts/filter_builder/utils';
 
 function baseOperation(grid) {
   const calculateFilterExpression = function (filterValue, field, fields) {

@@ -5,7 +5,7 @@ import {
   getDefaultOperation,
   removeFieldConditionsFromFilter,
   syncFilters,
-} from '@ts/filter_builder/m_utils';
+} from '@ts/filter_builder/utils';
 import type { Column } from '@ts/grids/grid_core/columns_controller/types';
 import type { FilterValue, FilterValueCondition } from '@ts/grids/grid_core/filter/types';
 

@@ -3,7 +3,7 @@
 */
 import messageLocalization from '@js/localization/message';
 import { combineClasses } from '@ts/core/utils/combine_classes';
-import { filterHasField } from '@ts/filter_builder/m_utils';
+import { filterHasField } from '@ts/filter_builder/utils';
 import type { Column, VisibleColumn } from '@ts/grids/new/grid_core/columns_controller/types';
 import { Scrollable } from '@ts/grids/new/grid_core/inferno_wrappers/scrollable';
 import type { NavigationStrategyBase } from '@ts/grids/new/grid_core/keyboard_navigation/index';

@@ -2,7 +2,7 @@
 // import { computed } from '@ts/core/state_manager/index';
 import { equalByValue } from '@js/core/utils/common';
 import { batch, effect } from '@ts/core/state_manager/index';
-import { getMatchedConditions } from '@ts/filter_builder/m_utils';
+import { getMatchedConditions } from '@ts/filter_builder/utils';
 import type { HeaderFilterInfo } from '@ts/grids/new/grid_core/filtering/header_filter/types';
 import { SearchController } from '@ts/grids/new/grid_core/search/index';
 

@@ -1,7 +1,7 @@
 import type { FilterType } from '@js/common/grids';
 // 🚨🚨🚨 Complex utils functions from grid_core used here for merging filters
 // TODO filterSync: move these utils to the new grid_core
-import { removeFieldConditionsFromFilter, syncFilters } from '@ts/filter_builder/m_utils';
+import { removeFieldConditionsFromFilter, syncFilters } from '@ts/filter_builder/utils';
 import type { HeaderFilterInfo } from '@ts/grids/new/grid_core/filtering/header_filter/types';
 
 import type { FilterValue } from '../types';

@@ -1,7 +1,7 @@
 /* eslint-disable spellcheck/spell-checker */
 import type { ReadonlySignal } from '@ts/core/state_manager/index';
 import { signal } from '@ts/core/state_manager/index';
-import { removeFieldConditionsFromFilter } from '@ts/filter_builder/m_utils';
+import { removeFieldConditionsFromFilter } from '@ts/filter_builder/utils';
 import { combineFilters } from '@ts/grids/grid_core/filter/utils';
 
 import { ColumnsController } from '../../columns_controller/index';

@@ -17,7 +17,7 @@ import { extend } from '@js/core/utils/extend';
 import errors from '@js/ui/widget/ui.errors';
 import {
   getFilterExpression, isCondition, isGroup, renderValueText,
-} from '@ts/filter_builder/m_utils';
+} from '@ts/filter_builder/utils';
 
 import { getHeaderItemText } from './header_filter/legacy_header_filter';
 

@@ -1,6 +1,6 @@
 import type { FilterDescriptor } from '@js/data';
 import { isString } from '@ts/core/utils/m_type';
-import { getFilterExpression } from '@ts/filter_builder/m_utils';
+import { getFilterExpression } from '@ts/filter_builder/utils';
 
 import type { Column } from '../columns_controller/types';
 import { addDataFieldToComputedColumns } from '../columns_controller/utils';

diff --git a/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts b/packages/devextreme/js/__internal/integration/knockout/component_registrator.ts
@@ -10,7 +10,7 @@ import type { Lock } from '@ts/core/utils/locker';
 import { Locker } from '@ts/core/utils/locker';
 import Callbacks from '@ts/core/utils/m_callbacks';
 import { isPlainObject } from '@ts/core/utils/m_type';
-import Draggable from '@ts/m_draggable';
+import Draggable from '@ts/draggable';
 import Editor from '@ts/ui/editor/editor';
 import ScrollView from '@ts/ui/scroll_view/scroll_view';
 import VizWidget from '@ts/viz/core/base_widget';

@@ -18,8 +18,8 @@ import type { Properties } from '@js/ui/sortable';
 import type { OptionChanged } from '@ts/core/widget/types';
 import type {
   DragEvent, DragEventArgs, DraggableProperties, DragStartArgs, DragTemplateArgs,
-} from '@ts/m_draggable';
-import Draggable from '@ts/m_draggable';
+} from '@ts/draggable';
+import Draggable from '@ts/draggable';
 
 import { isDefined } from '../core/utils/type';
 

@@ -12,10 +12,10 @@ import { extend } from '@ts/core/utils/m_extend';
 import { getHeight, getOuterHeight, getWidth } from '@ts/core/utils/m_size';
 import type { OptionChanged } from '@ts/core/widget/types';
 import type { SupportedKeyHandler, SupportedKeys } from '@ts/core/widget/widget';
+import Draggable from '@ts/draggable';
 import { name as clickEventName } from '@ts/events/click';
 import eventsEngine from '@ts/events/core/events_engine';
 import { isCommandKeyPressed } from '@ts/events/utils/index';
-import Draggable from '@ts/m_draggable';
 import type { EditorProperties, ValueChangedEvent } from '@ts/ui/editor/editor';
 import Editor from '@ts/ui/editor/editor';
 import NumberBox from '@ts/ui/number_box/number_box';

@@ -930,7 +930,8 @@ class LayoutManager extends Widget<LayoutManagerProperties> {
         skipImmediate: true,
       },
       /// #DEBUG
-      { createWatcherDataField: dataField },
+      // eslint-disable-next-line @stylistic/comma-dangle
+      { createWatcherDataField: dataField }
       /// #ENDDEBUG
     );
 

@@ -17,7 +17,7 @@ import type {
   ReorderEvent,
 } from '@js/ui/sortable';
 import { isDefined } from '@ts/core/utils/m_type';
-import Sortable from '@ts/m_sortable';
+import Sortable from '@ts/sortable';
 import type { BagConfig } from '@ts/ui/list/list.edit.decorator';
 import EditDecorator from '@ts/ui/list/list.edit.decorator';
 import { register as registerDecorator } from '@ts/ui/list/list.edit.decorator_registry';

@@ -1,4 +1,4 @@
-import Draggable from '../__internal/m_draggable';
+import Draggable from '../__internal/draggable';
 export default Draggable;
 
 /**

@@ -1,4 +1,4 @@
-import FilterBuilder from '../__internal/filter_builder/m_filter_builder';
+import FilterBuilder from '../__internal/filter_builder/filter_builder';
 
 // STYLE filterBuilder
 

@@ -1,4 +1,4 @@
-import Sortable from '../__internal/m_sortable';
+import Sortable from '../__internal/sortable';
 export default Sortable;
 
 // STYLE sortable

@@ -4,7 +4,7 @@ import config from 'core/config';
 import renderer from 'core/renderer';
 import fields from '../../../helpers/filterBuilderTestData.js';
 
-import '__internal/filter_builder/m_filter_builder';
+import '__internal/filter_builder/filter_builder';
 import 'ui/drop_down_box';
 import 'ui/button';
 

@@ -17,7 +17,7 @@ import {
     clickByOutside
 } from './helpers.js';
 
-import '__internal/filter_builder/m_filter_builder';
+import '__internal/filter_builder/filter_builder';
 
 QUnit.module('Events', function() {
     QUnit.test('onEditorPreparing', function(assert) {

@@ -2,7 +2,7 @@ import $ from 'jquery';
 import keyboardMock from '../../../helpers/keyboardMock.js';
 import fields from '../../../helpers/filterBuilderTestData.js';
 
-import '__internal/filter_builder/m_filter_builder';
+import '__internal/filter_builder/filter_builder';
 
 import {
     FILTER_BUILDER_ITEM_OPERATION_CLASS,

@@ -1,5 +1,5 @@
-import * as utils from '__internal/filter_builder/m_utils';
-import * as between from '__internal/filter_builder/m_between';
+import * as utils from '__internal/filter_builder/utils';
+import * as between from '__internal/filter_builder/between';
 import { CustomStore } from 'common/data/custom_store';
 import messageLocalization from 'common/core/localization/message';
 import fields from '../../../helpers/filterBuilderTestData.js';