Toolbar: remove m_ prefix from file names (DevExpress#30395)

EugeniyKiyashko · web-flow · commit b24f97a186b0 · 2025-07-16T18:39:45.000+04:00
diff --git a/packages/devextreme/js/__internal/ui/form/m_form.ts b/packages/devextreme/js/__internal/ui/form/m_form.ts
@@ -70,7 +70,7 @@ import {
 } from '@ts/ui/form/m_form.utils';
 import Scrollable from '@ts/ui/scroll_view/scrollable';
 import { TEXTEDITOR_CLASS, TEXTEDITOR_INPUT_CLASS } from '@ts/ui/text_box/m_text_editor.base';
-import { TOOLBAR_CLASS } from '@ts/ui/toolbar/m_constants';
+import { TOOLBAR_CLASS } from '@ts/ui/toolbar/constants';
 
 import type ValidationSummary from '../m_validation_summary';
 import type LayoutManager from './m_form.layout_manager';
diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup.ts b/packages/devextreme/js/__internal/ui/popup/m_popup.ts
@@ -44,8 +44,8 @@ import windowUtils from '@ts/core/utils/m_window';
 import type { OptionChanged } from '@ts/core/widget/types';
 import Overlay from '@ts/ui/overlay/m_overlay';
 import * as zIndexPool from '@ts/ui/overlay/m_z_index';
-import { TOOLBAR_CLASS } from '@ts/ui/toolbar/m_constants';
-import type { ToolbarBaseProperties } from '@ts/ui/toolbar/m_toolbar.base';
+import { TOOLBAR_CLASS } from '@ts/ui/toolbar/constants';
+import type { ToolbarBaseProperties } from '@ts/ui/toolbar/toolbar.base';
 
 import PopupDrag from './m_popup_drag';
 import type { OverflowManager } from './m_popup_overflow_manager';
diff --git a/packages/devextreme/js/__internal/ui/toolbar/constants.ts b/packages/devextreme/js/__internal/ui/toolbar/constants.ts
diff --git a/packages/devextreme/js/__internal/ui/toolbar/internal/toolbar.menu.list.ts b/packages/devextreme/js/__internal/ui/toolbar/internal/toolbar.menu.list.ts
@@ -116,7 +116,6 @@ export default class ToolbarMenuList extends ListBase {
     return cssClasses;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getActionableComponents(): ActionableComponents[] {
     return ['dxButton', 'dxButtonGroup'];
   }
@@ -129,7 +128,6 @@ export default class ToolbarMenuList extends ListBase {
     return menuTemplate ?? template;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _dataSourceOptions(): DataSourceOptions {
     return {
       paginate: false,
diff --git a/packages/devextreme/js/__internal/ui/toolbar/internal/toolbar.menu.ts b/packages/devextreme/js/__internal/ui/toolbar/internal/toolbar.menu.ts
@@ -20,9 +20,8 @@ import type { Properties } from '@ts/core/widget/widget';
 import Widget from '@ts/core/widget/widget';
 import Button from '@ts/ui/button/wrapper';
 import type { ListBase } from '@ts/ui/list/m_list.base';
-
-import { toggleItemFocusableElementTabIndex } from '../m_toolbar.utils';
-import ToolbarMenuList from './m_toolbar.menu.list';
+import ToolbarMenuList from '@ts/ui/toolbar/internal/toolbar.menu.list';
+import { toggleItemFocusableElementTabIndex } from '@ts/ui/toolbar/toolbar.utils';
 
 const DROP_DOWN_MENU_CLASS = 'dx-dropdownmenu';
 const DROP_DOWN_MENU_POPUP_CLASS = 'dx-dropdownmenu-popup';
diff --git a/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.multiline.ts b/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.multiline.ts
@@ -1,6 +1,6 @@
 import { getOuterWidth, getWidth } from '@js/core/utils/size';
 import type { Item } from '@js/ui/toolbar';
-import type Toolbar from '@ts/ui/toolbar/m_toolbar';
+import type Toolbar from '@ts/ui/toolbar/toolbar';
 
 const TOOLBAR_LABEL_CLASS = 'dx-toolbar-label';
 
@@ -11,20 +11,15 @@ export class MultiLineStrategy {
     this._toolbar = toolbar;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _initMarkup(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _updateMenuVisibility(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _renderMenuItems(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _renderItem(): void {}
 
   // @ts-expect-error ts-error
-  // eslint-disable-next-line class-methods-use-this
   _getMenuItems(): Item[] {}
 
   _getToolbarItems(): Item[] {
@@ -49,15 +44,11 @@ export class MultiLineStrategy {
     $label.css('maxWidth', elementWidth - labelPaddings);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _hideOverflowItems(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _dimensionChanged(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _itemOptionChanged(): void {}
 
-  // eslint-disable-next-line class-methods-use-this
   _optionChanged(): void {}
 }
diff --git a/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts b/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts
@@ -7,9 +7,9 @@ import { compileGetter } from '@js/core/utils/data';
 import { each } from '@js/core/utils/iterator';
 import { getWidth } from '@js/core/utils/size';
 import type { Item } from '@js/ui/toolbar';
-import DropDownMenu from '@ts/ui/toolbar/internal/m_toolbar.menu';
-import type { Properties } from '@ts/ui/toolbar/m_toolbar';
-import type Toolbar from '@ts/ui/toolbar/m_toolbar';
+import DropDownMenu from '@ts/ui/toolbar/internal/toolbar.menu';
+import type { Properties } from '@ts/ui/toolbar/toolbar';
+import type Toolbar from '@ts/ui/toolbar/toolbar';
 
 const INVISIBLE_STATE_CLASS = 'dx-state-invisible';
 const TOOLBAR_DROP_DOWN_MENU_CONTAINER_CLASS = 'dx-toolbar-menu-container';
@@ -254,7 +254,6 @@ export class SingleLineStrategy {
     this.renderMenuItems();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _renderItem(item: Item, $itemElement: dxElementWrapper): void {
     if (item.locateInMenu === 'auto') {
       $itemElement.addClass(TOOLBAR_AUTO_HIDE_ITEM_CLASS);
diff --git a/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts b/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts
@@ -20,7 +20,7 @@ import type { OptionChanged } from '@ts/core/widget/types';
 import CollectionWidgetAsync from '@ts/ui/collection/collection_widget.async';
 import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/collection_widget.base';
 
-import { TOOLBAR_CLASS } from './m_constants';
+import { TOOLBAR_CLASS } from './constants';
 
 const TOOLBAR_BEFORE_CLASS = 'dx-toolbar-before';
 const TOOLBAR_CENTER_CLASS = 'dx-toolbar-center';
@@ -161,12 +161,10 @@ class ToolbarBase<
     ].join(','));
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _itemClass(): string {
     return TOOLBAR_ITEM_CLASS;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _itemDataKey(): string {
     return TOOLBAR_ITEM_DATA_KEY;
   }
@@ -310,7 +308,6 @@ class ToolbarBase<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _alignSectionLabels(
     labels: Element[],
     difference: number,
@@ -355,7 +352,6 @@ class ToolbarBase<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getCurrentLabelsWidth(labels: Element[]): number {
     let width = 0;
 
@@ -366,7 +362,6 @@ class ToolbarBase<
     return width;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getCurrentLabelsPaddings(labels: Element[]): number {
     let padding = 0;
 
@@ -444,7 +439,6 @@ class ToolbarBase<
     this._applyCompactMode();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _renderEmptyMessage(): void {}
 
   _clean(): void {
diff --git a/packages/devextreme/js/__internal/ui/toolbar/toolbar.ts b/packages/devextreme/js/__internal/ui/toolbar/toolbar.ts
@@ -3,11 +3,11 @@ import type { dxElementWrapper } from '@js/core/renderer';
 import type { Item } from '@js/ui/toolbar';
 import type { OptionChanged } from '@ts/core/widget/types';
 
-import type { ToolbarBaseProperties } from './m_toolbar.base';
-import ToolbarBase from './m_toolbar.base';
-import { toggleItemFocusableElementTabIndex } from './m_toolbar.utils';
-import { MultiLineStrategy } from './strategy/m_toolbar.multiline';
-import { SingleLineStrategy } from './strategy/m_toolbar.singleline';
+import { MultiLineStrategy } from './strategy/toolbar.multiline';
+import { SingleLineStrategy } from './strategy/toolbar.singleline';
+import type { ToolbarBaseProperties } from './toolbar.base';
+import ToolbarBase from './toolbar.base';
+import { toggleItemFocusableElementTabIndex } from './toolbar.utils';
 
 const TOOLBAR_MULTILINE_CLASS = 'dx-toolbar-multiline';
 const TOOLBAR_AUTO_HIDE_TEXT_CLASS = 'dx-toolbar-text-auto-hide';
@@ -160,12 +160,10 @@ class Toolbar extends ToolbarBase<Properties> {
     this._getToolbarItems().forEach((item) => toggleItemFocusableElementTabIndex(this, item));
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _isMenuItem(itemData: Item): boolean {
     return itemData.locateInMenu === 'always';
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _isToolbarItem(itemData: Item): boolean {
     return itemData.location === undefined || itemData.locateInMenu === 'never';
   }
diff --git a/packages/devextreme/js/__internal/ui/toolbar/toolbar.utils.ts b/packages/devextreme/js/__internal/ui/toolbar/toolbar.utils.ts
@@ -4,17 +4,17 @@ import type { Item } from '@js/ui/toolbar';
 import type Widget from '@ts/core/widget/widget';
 
 import type { ListBase } from '../list/m_list.base';
-import type Toolbar from './m_toolbar';
+import type Toolbar from './toolbar';
 
 const BUTTON_GROUP_CLASS = 'dx-buttongroup';
 const TOOLBAR_ITEMS = ['dxAutocomplete', 'dxButton', 'dxCheckBox', 'dxDateBox', 'dxMenu', 'dxSelectBox', 'dxTabs', 'dxTextBox', 'dxButtonGroup', 'dxDropDownButton'];
 
 const getItemInstance = ($element: dxElementWrapper): Widget => {
   // @ts-expect-error ts-error
-  const itemData = $element.data && $element.data();
+  const itemData = $element?.data();
   // @ts-expect-error ts-error
-  const dxComponents = itemData && itemData.dxComponents;
-  const widgetName = dxComponents && dxComponents[0];
+  const dxComponents = itemData?.dxComponents;
+  const widgetName = dxComponents?.[0];
 
   return (widgetName && itemData[widgetName]) as Widget;
 };
@@ -47,7 +47,7 @@ export function toggleItemFocusableElementTabIndex(
       let $focusTarget = itemInstance._focusTarget?.();
 
       if (widget === 'dxDropDownButton') {
-        $focusTarget = $focusTarget && $focusTarget.find(`.${BUTTON_GROUP_CLASS}`);
+        $focusTarget = $focusTarget?.find(`.${BUTTON_GROUP_CLASS}`);
       } else {
         $focusTarget = $focusTarget ?? $(itemInstance.element());
       }
diff --git a/packages/devextreme/js/ui/toolbar/ui.toolbar.base.js b/packages/devextreme/js/ui/toolbar/ui.toolbar.base.js
@@ -1,3 +1,3 @@
-import ToolbarBase from '../../__internal/ui/toolbar/m_toolbar.base';
+import ToolbarBase from '../../__internal/ui/toolbar/toolbar.base';
 
 export default ToolbarBase;
diff --git a/packages/devextreme/js/ui/toolbar/ui.toolbar.js b/packages/devextreme/js/ui/toolbar/ui.toolbar.js
@@ -1,3 +1,3 @@
-import Toolbar from '../../__internal/ui/toolbar/m_toolbar';
+import Toolbar from '../../__internal/ui/toolbar/toolbar';
 
 export default Toolbar;
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js
@@ -47,7 +47,7 @@ import {
     renderLabel,
 } from '__internal/ui/form/components/m_label';
 
-import { TOOLBAR_CLASS } from '__internal/ui/toolbar/m_constants';
+import { TOOLBAR_CLASS } from '__internal/ui/toolbar/constants';
 
 import 'ui/html_editor';
 import '../../helpers/ignoreQuillTimers.js';
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js
@@ -4,8 +4,8 @@ import ArrayStore from 'common/data/array_store';
 import fx from 'common/core/animation/fx';
 import Button from 'ui/button';
 import Popup from 'ui/popup';
-import DropDownMenu from '__internal/ui/toolbar/internal/m_toolbar.menu';
-import ToolbarMenuList from '__internal/ui/toolbar/internal/m_toolbar.menu.list';
+import DropDownMenu from '__internal/ui/toolbar/internal/toolbar.menu';
+import ToolbarMenuList from '__internal/ui/toolbar/internal/toolbar.menu.list';
 import executeAsyncMock from '../../helpers/executeAsyncMock.js';
 import pointerMock from '../../helpers/pointerMock.js';
 import keyboardMock from '../../helpers/keyboardMock.js';
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.multiline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.multiline.tests.js
@@ -5,8 +5,8 @@ import 'ui/select_box';
 import { extend } from 'core/utils/extend';
 import { value as viewPort } from 'core/utils/view_port';
 
-import { MultiLineStrategy } from '__internal/ui/toolbar/strategy/m_toolbar.multiline';
-import { SingleLineStrategy } from '__internal/ui/toolbar/strategy/m_toolbar.singleline';
+import { MultiLineStrategy } from '__internal/ui/toolbar/strategy/toolbar.multiline';
+import { SingleLineStrategy } from '__internal/ui/toolbar/strategy/toolbar.singleline';
 
 import 'generic_light.css!';
 
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 
-import ToolbarBase from '__internal/ui/toolbar/m_toolbar.base';
+import ToolbarBase from '__internal/ui/toolbar/toolbar.base';
 
 import fx from 'common/core/animation/fx';
 import resizeCallbacks from 'core/utils/resize_callbacks';
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
@@ -30,7 +30,7 @@ import DropDownEditor from 'ui/drop_down_editor/ui.drop_down_editor';
 import DropDownBox from 'ui/drop_down_box';
 import DropDownButton from 'ui/drop_down_button';
 import DropDownList from 'ui/drop_down_editor/ui.drop_down_list';
-import DropDownMenu from '__internal/ui/toolbar/internal/m_toolbar.menu';
+import DropDownMenu from '__internal/ui/toolbar/internal/toolbar.menu';
 import TextEditor from 'ui/text_box/ui.text_editor';
 import Gallery from 'ui/gallery';
 import Informer from 'ui/informer';

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ export default class ToolbarMenuList extends ListBase {`
`116`	`116`	`return cssClasses;`
`117`	`117`	`}`
`118`	`118`
`119`		`- // eslint-disable-next-line class-methods-use-this`
`120`	`119`	`_getActionableComponents(): ActionableComponents[] {`
`121`	`120`	`return ['dxButton', 'dxButtonGroup'];`
`122`	`121`	`}`
`@@ -129,7 +128,6 @@ export default class ToolbarMenuList extends ListBase {`
`129`	`128`	`return menuTemplate ?? template;`
`130`	`129`	`}`
`131`	`130`
`132`		`- // eslint-disable-next-line class-methods-use-this`
`133`	`131`	`_dataSourceOptions(): DataSourceOptions {`
`134`	`132`	`return {`
`135`	`133`	`paginate: false,`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import type { OptionChanged } from '@ts/core/widget/types';`
`20`	`20`	`import CollectionWidgetAsync from '@ts/ui/collection/collection_widget.async';`
`21`	`21`	`import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/collection_widget.base';`
`22`	`22`
`23`		`-import { TOOLBAR_CLASS } from './m_constants';`
	`23`	`+import { TOOLBAR_CLASS } from './constants';`
`24`	`24`
`25`	`25`	`const TOOLBAR_BEFORE_CLASS = 'dx-toolbar-before';`
`26`	`26`	`const TOOLBAR_CENTER_CLASS = 'dx-toolbar-center';`
`@@ -161,12 +161,10 @@ class ToolbarBase<`
`161`	`161`	`].join(','));`
`162`	`162`	`}`
`163`	`163`
`164`		`- // eslint-disable-next-line class-methods-use-this`
`165`	`164`	`_itemClass(): string {`
`166`	`165`	`return TOOLBAR_ITEM_CLASS;`
`167`	`166`	`}`
`168`	`167`
`169`		`- // eslint-disable-next-line class-methods-use-this`
`170`	`168`	`_itemDataKey(): string {`
`171`	`169`	`return TOOLBAR_ITEM_DATA_KEY;`
`172`	`170`	`}`
`@@ -310,7 +308,6 @@ class ToolbarBase<`
`310`	`308`	`}`
`311`	`309`	`}`
`312`	`310`
`313`		`- // eslint-disable-next-line class-methods-use-this`
`314`	`311`	`_alignSectionLabels(`
`315`	`312`	`labels: Element[],`
`316`	`313`	`difference: number,`
`@@ -355,7 +352,6 @@ class ToolbarBase<`
`355`	`352`	`}`
`356`	`353`	`}`
`357`	`354`
`358`		`- // eslint-disable-next-line class-methods-use-this`
`359`	`355`	`_getCurrentLabelsWidth(labels: Element[]): number {`
`360`	`356`	`let width = 0;`
`361`	`357`
`@@ -366,7 +362,6 @@ class ToolbarBase<`
`366`	`362`	`return width;`
`367`	`363`	`}`
`368`	`364`
`369`		`- // eslint-disable-next-line class-methods-use-this`
`370`	`365`	`_getCurrentLabelsPaddings(labels: Element[]): number {`
`371`	`366`	`let padding = 0;`
`372`	`367`
`@@ -444,7 +439,6 @@ class ToolbarBase<`
`444`	`439`	`this._applyCompactMode();`
`445`	`440`	`}`
`446`	`441`
`447`		`- // eslint-disable-next-line class-methods-use-this`
`448`	`442`	`_renderEmptyMessage(): void {}`
`449`	`443`
`450`	`444`	`_clean(): void {`