Tabs, Tabpanel: remove 'm_' prefix (DevExpress#29644)

EugeniyKiyashko · web-flow · commit 9265d7b8227d · 2025-04-18T14:26:25.000+04:00
diff --git a/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts
@@ -39,8 +39,8 @@ import { getPublicElement } from '@ts/core/m_element';
 import type { ActionConfig } from '@ts/core/widget/component';
 import type { OptionChanged } from '@ts/core/widget/types';
 import Widget from '@ts/core/widget/widget';
-import type CollectionItem from '@ts/ui/collection/m_item';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import type CollectionItem from '@ts/ui/collection/item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 const COLLECTION_CLASS = 'dx-collection';
 const ITEM_CLASS = 'dx-item';
diff --git a/packages/devextreme/js/__internal/ui/collection/item.ts b/packages/devextreme/js/__internal/ui/collection/item.ts
diff --git a/packages/devextreme/js/__internal/ui/context_menu/m_menu_base.ts b/packages/devextreme/js/__internal/ui/context_menu/m_menu_base.ts
@@ -10,7 +10,7 @@ import type { DxEvent } from '@js/events';
 import type { dxMenuBaseOptions } from '@js/ui/context_menu/ui.menu_base';
 import type { Item, SubmenuShowMode } from '@js/ui/menu';
 import { render } from '@js/ui/widget/utils.ink_ripple';
-import MenuItem from '@ts/ui/collection/m_item';
+import MenuItem from '@ts/ui/collection/item';
 import MenuBaseEditStrategy from '@ts/ui/context_menu/m_menu_base.edit.strategy';
 import HierarchicalCollectionWidget from '@ts/ui/hierarchical_collection/m_hierarchical_collection_widget';
 
diff --git a/packages/devextreme/js/__internal/ui/list/m_item.ts b/packages/devextreme/js/__internal/ui/list/m_item.ts
@@ -1,6 +1,6 @@
 import $ from '@js/core/renderer';
 import type { Item } from '@js/ui/list';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 const LIST_ITEM_BADGE_CONTAINER_CLASS = 'dx-list-item-badge-container';
 const LIST_ITEM_BADGE_CLASS = 'dx-list-item-badge';
diff --git a/packages/devextreme/js/__internal/ui/m_box.ts b/packages/devextreme/js/__internal/ui/m_box.ts
@@ -12,8 +12,8 @@ import { isDefined } from '@js/core/utils/type';
 import { hasWindow } from '@js/core/utils/window';
 import CollectionWidget from '@js/ui//collection/ui.collection_widget.edit';
 import type { Item, Properties } from '@js/ui/box';
-import type { ItemExtraOption } from '@ts/ui/collection/m_item';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import type { ItemExtraOption } from '@ts/ui/collection/item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 // STYLE box
 
diff --git a/packages/devextreme/js/__internal/ui/splitter/splitter_item.ts b/packages/devextreme/js/__internal/ui/splitter/splitter_item.ts
@@ -2,7 +2,7 @@ import Guid from '@js/core/guid';
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
 import type { Item } from '@js/ui/splitter';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 import ResizeHandle from './resize_handle';
 import type Splitter from './splitter';
diff --git a/packages/devextreme/js/__internal/ui/stepper/stepper_item.ts b/packages/devextreme/js/__internal/ui/stepper/stepper_item.ts
@@ -1,5 +1,5 @@
 import type { Item } from '@js/ui/stepper';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 export const STEP_COMPLETED_CLASS = 'dx-step-completed';
 export const STEP_INVALID_CLASS = 'dx-step-invalid';
diff --git a/packages/devextreme/js/__internal/ui/tab_panel/item.ts b/packages/devextreme/js/__internal/ui/tab_panel/item.ts
@@ -1,6 +1,6 @@
 import { noop } from '@js/core/utils/common';
 import type { Item } from '@js/ui/tab_panel';
-import CollectionWidgetItem from '@ts/ui/collection/m_item';
+import CollectionWidgetItem from '@ts/ui/collection/item';
 
 export default class TabPanelItem extends CollectionWidgetItem<Item> {
   _renderWatchers(): void {
diff --git a/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts b/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts
@@ -17,11 +17,11 @@ import { current as currentTheme, isFluent, isMaterialBased } from '@js/ui/theme
 import supportUtils from '@ts/core/utils/m_support';
 import type { OptionChanged } from '@ts/core/widget/types';
 import MultiView from '@ts/ui/m_multi_view';
-import type { TabsProperties } from '@ts/ui/tabs/m_tabs';
-import Tabs from '@ts/ui/tabs/m_tabs';
+import type { TabsProperties } from '@ts/ui/tabs/tabs';
+import Tabs from '@ts/ui/tabs/tabs';
 
 // eslint-disable-next-line import/no-named-default
-import { default as TabPanelItem } from './m_item';
+import { default as TabPanelItem } from './item';
 
 export const TABPANEL_CLASS = 'dx-tabpanel';
 const TABPANEL_TABS_CLASS = 'dx-tabpanel-tabs';
@@ -172,12 +172,10 @@ class TabPanel extends MultiView<TabPanelProperties> {
     this._toggleTabPanelTabsPositionClass();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getElementAria(): Record<string, string> {
     return { role: 'tabpanel' };
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getItemAria(): Record<string, string> {
     return { role: 'tabpanel' };
   }
@@ -189,7 +187,6 @@ class TabPanel extends MultiView<TabPanelProperties> {
     this._renderLayout();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _prepareTabsItemTemplate(data: Item, $container: dxElementWrapper): void {
     const $iconElement = getImageContainer(data?.icon);
 
diff --git a/packages/devextreme/js/__internal/ui/tabs/item.ts b/packages/devextreme/js/__internal/ui/tabs/item.ts
@@ -1,6 +1,6 @@
 import $ from '@js/core/renderer';
 import type { Item } from '@js/ui/tabs';
-import CollectionItem from '@ts/ui/collection/m_item';
+import CollectionItem from '@ts/ui/collection/item';
 
 const TABS_ITEM_BADGE_CLASS = 'dx-tabs-item-badge';
 const BADGE_CLASS = 'dx-badge';
@@ -9,10 +9,10 @@ class TabsItem extends CollectionItem<Item> {
   _renderWatchers(): void {
     super._renderWatchers();
 
-    this._startWatcher('badge', this._renderBadge.bind(this));
+    this._startWatcher<string>('badge', this._renderBadge.bind(this));
   }
 
-  _renderBadge(badge): void {
+  _renderBadge(badge: string | undefined): void {
     this._$element.children(`.${BADGE_CLASS}`).remove();
 
     if (!badge) {
diff --git a/packages/devextreme/js/__internal/ui/tabs/tabs.ts b/packages/devextreme/js/__internal/ui/tabs/tabs.ts
@@ -31,7 +31,7 @@ import {
 import { getScrollLeftMax } from '@ts/ui/scroll_view/utils/get_scroll_left_max';
 
 import { TABS_EXPANDED_CLASS } from './constants';
-import TabsItem from './m_item';
+import TabsItem from './item';
 
 // STYLE tabs
 
@@ -246,7 +246,6 @@ class Tabs extends CollectionWidget<TabsProperties> {
     this._feedbackHideTimeout = FEEDBACK_HIDE_TIMEOUT;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _prepareDefaultItemTemplate(data: Item, $container: dxElementWrapper): void {
     const text = isPlainObject(data) ? data?.text : data;
 
@@ -287,17 +286,14 @@ class Tabs extends CollectionWidget<TabsProperties> {
     });
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _itemClass(): string {
     return TABS_ITEM_CLASS;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _selectedItemClass(): string {
     return TABS_ITEM_SELECTED_CLASS;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _itemDataKey(): string {
     return TABS_ITEM_DATA_KEY;
   }
@@ -432,7 +428,6 @@ class Tabs extends CollectionWidget<TabsProperties> {
     this._inkRipple = render();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getPointerEvent(): string {
     return pointerEvents.up;
   }
@@ -680,7 +675,6 @@ class Tabs extends CollectionWidget<TabsProperties> {
     this.$element().toggleClass(TABS_ORIENTATION_CLASS.horizontal, value);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getIndicatorPositionClass(indicatorPosition: Position): string {
     return INDICATOR_POSITION_CLASS[indicatorPosition];
   }
diff --git a/packages/devextreme/js/ui/tab_panel.js b/packages/devextreme/js/ui/tab_panel.js
@@ -1,4 +1,4 @@
-import TabPanel from '../__internal/ui/tab_panel/m_tab_panel';
+import TabPanel from '../__internal/ui/tab_panel/tab_panel';
 
 export default TabPanel;
 
diff --git a/packages/devextreme/js/ui/tabs.js b/packages/devextreme/js/ui/tabs.js
@@ -1,4 +1,4 @@
-import Tabs from '../__internal/ui/tabs/m_tabs';
+import Tabs from '../__internal/ui/tabs/tabs';
 
 export default Tabs;
 
diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/collectionWidgetItem.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/collectionWidgetItem.tests.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import ko from 'knockout';
 import registerComponent from 'core/component_registrator';
 import CollectionWidget from 'ui/collection/ui.collection_widget.edit';
-import CollectionWidgetItem from '__internal/ui/collection/m_item';
+import CollectionWidgetItem from '__internal/ui/collection/item';
 
 import 'integration/knockout';
 
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
@@ -63,7 +63,7 @@ import themes from 'ui/themes';
 import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js';
 import responsiveBoxScreenMock from '../../helpers/responsiveBoxScreenMock.js';
 import { isDefined } from 'core/utils/type.js';
-import { TABPANEL_CLASS } from '__internal/ui/tab_panel/m_tab_panel';
+import { TABPANEL_CLASS } from '__internal/ui/tab_panel/tab_panel';
 
 const INVALID_CLASS = 'dx-invalid';
 const FORM_GROUP_CONTENT_CLASS = 'dx-form-group-content';
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetItem.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetItem.tests.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import CollectionWidget from 'ui/collection/ui.collection_widget.edit';
-import CollectionWidgetItem from '__internal/ui/collection/m_item';
+import CollectionWidgetItem from '__internal/ui/collection/item';
 
 
 QUnit.module('changing item field', {
