Skip to content

Commit 8f77e14

Browse files
EugeniyKiyashkoEugeniyKiyashko
authored
Collection: remove 'm_' prefix from names (DevExpress#30281)
1 parent 0c2e4ee commit 8f77e14

28 files changed

+52
-73
lines changed

packages/devextreme/js/__internal/ui/m_box.ts renamed to packages/devextreme/js/__internal/ui/box.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { hasWindow } from '@js/core/utils/window';
1313
import type { Item, Properties } from '@js/ui/box';
1414
import type { OptionChanged } from '@ts/core/widget/types';
1515
import type { ItemRenderInfo, PostprocessRenderItemInfo } from '@ts/ui/collection/collection_widget.base';
16+
import CollectionWidget from '@ts/ui/collection/collection_widget.edit';
1617
import type { ItemExtraOption } from '@ts/ui/collection/item';
1718
import CollectionWidgetItem from '@ts/ui/collection/item';
18-
import CollectionWidget from '@ts/ui/collection/m_collection_widget.edit';
1919

2020
// STYLE box
2121

@@ -171,7 +171,7 @@ class LayoutStrategy {
171171
const flexPropPrefix = stylePropPrefix('flexDirection');
172172
const direction = this._option('direction') ?? 'row';
173173

174-
each($items, function renderEachItem() {
174+
each($items, function renderEachItem(this: Element): void {
175175
const $item = $(this);
176176
const item = $item.data(BOX_ITEM_DATA_KEY) as unknown as BoxItemData;
177177

@@ -329,7 +329,7 @@ class Box extends CollectionWidget<BoxProperties> {
329329
_renderItemContent(
330330
args: ItemRenderInfo<BoxItemData>,
331331
): dxElementWrapper | DeferredObj<dxElementWrapper> {
332-
const $itemNode = args.itemData && args.itemData.node;
332+
const $itemNode = args.itemData?.node;
333333
if ($itemNode) {
334334
return this._renderItemContentByNode(args, $itemNode);
335335
}

packages/devextreme/js/__internal/ui/collection/m_collection_widget.async.ts renamed to packages/devextreme/js/__internal/ui/collection/collection_widget.async.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import type { DeferredObj } from '@js/core/utils/deferred';
44
import { Deferred, when } from '@js/core/utils/deferred';
55
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
66
import type { ItemRenderInfo } from '@ts/ui/collection/collection_widget.base';
7-
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/m_collection_widget.edit';
8-
import CollectionWidgetEdit from '@ts/ui/collection/m_collection_widget.edit';
7+
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/collection_widget.edit';
8+
import CollectionWidgetEdit from '@ts/ui/collection/collection_widget.edit';
99

1010
class CollectionWidgetAsync<
1111
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -56,7 +56,6 @@ class CollectionWidgetAsync<
5656
};
5757
}
5858

59-
// eslint-disable-next-line class-methods-use-this
6059
_postProcessRenderItems(): void {}
6160

6261
_planPostRenderActions(...args: unknown[]): Promise<unknown> {

packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.strategy.plain.ts renamed to packages/devextreme/js/__internal/ui/collection/collection_widget.edit.strategy.plain.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { dxElementWrapper } from '@js/core/renderer';
22
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
3-
import type { CollectionItemIndex } from '@ts/ui/collection/m_collection_widget.edit.strategy';
4-
import EditStrategy from '@ts/ui/collection/m_collection_widget.edit.strategy';
3+
import type { CollectionItemIndex } from '@ts/ui/collection/collection_widget.edit.strategy';
4+
import EditStrategy from '@ts/ui/collection/collection_widget.edit.strategy';
55

66
class PlainEditStrategy<
77
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -61,7 +61,6 @@ class PlainEditStrategy<
6161
return -1;
6262
}
6363

64-
// eslint-disable-next-line class-methods-use-this
6564
getItemsByKeys(keys: TKey[], items?: TItem[]): TItem[] {
6665
return (items ?? keys).slice() as TItem[];
6766
}
@@ -77,7 +76,6 @@ class PlainEditStrategy<
7776
items.splice(destinationIndex, 0, movedItemData);
7877
}
7978

80-
// eslint-disable-next-line class-methods-use-this
8179
_isItemIndex(index: number | Element | TItem): boolean {
8280
return (typeof index === 'number') && Math.round(index) === index;
8381
}
@@ -86,14 +84,12 @@ class PlainEditStrategy<
8684
return this._collectionWidget._itemElements().index(itemElement);
8785
}
8886

89-
// eslint-disable-next-line class-methods-use-this
9087
_normalizeItemIndex(
9188
index: CollectionItemIndex,
9289
): number {
9390
return index as number;
9491
}
9592

96-
// eslint-disable-next-line class-methods-use-this
9793
_denormalizeItemIndex(
9894
index: number,
9995
): CollectionItemIndex {
@@ -105,7 +101,6 @@ class PlainEditStrategy<
105101
return index > -1 ? this._collectionWidget._itemElements().eq(index) : null;
106102
}
107103

108-
// eslint-disable-next-line class-methods-use-this
109104
_itemsFromSameParent(
110105
// eslint-disable-next-line @typescript-eslint/no-unused-vars
111106
_firstIndex: number,

packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.strategy.ts renamed to packages/devextreme/js/__internal/ui/collection/collection_widget.edit.strategy.ts

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import $ from '@js/core/renderer';
55
import { equalByValue } from '@js/core/utils/common';
66
import { isRenderer } from '@js/core/utils/type';
77
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
8-
import type CollectionWidget from '@ts/ui/collection/m_collection_widget.edit';
9-
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/m_collection_widget.edit';
8+
import type CollectionWidget from '@ts/ui/collection/collection_widget.edit';
9+
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/collection_widget.edit';
1010

1111
export type CollectionItemIndex = number | { group: number; item: number };
1212

@@ -48,27 +48,26 @@ class EditStrategy<
4848
return items;
4949
}
5050

51-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
51+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
5252
getIndexByItemData(value: TItem): number {
5353
return Class.abstract();
5454
}
5555

56-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
56+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
5757
getItemDataByIndex(index: number): TItem {
5858
return Class.abstract();
5959
}
6060

61-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
61+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6262
getKeysByItems(items: TItem[]): TKey[] {
6363
return Class.abstract();
6464
}
6565

66-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
66+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6767
getItemsByKeys(keys: TKey[], items?: TItem[]): TItem[] {
6868
return Class.abstract();
6969
}
7070

71-
// eslint-disable-next-line class-methods-use-this
7271
itemsGetter(): TItem[] {
7372
return Class.abstract();
7473
}
@@ -94,7 +93,7 @@ class EditStrategy<
9493
this._cache = null;
9594
}
9695

97-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
96+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
9897
getIndexByKey(key: TKey): number {
9998
return Class.abstract();
10099
}
@@ -150,12 +149,11 @@ class EditStrategy<
150149
return this._getItemByNormalizedIndex(normalizedItemIndex);
151150
}
152151

153-
// eslint-disable-next-line class-methods-use-this
154152
_isNode(el: unknown): el is Element {
155153
return domAdapter.isNode(el && isRenderer(el) ? (el as dxElementWrapper).get(0) : el);
156154
}
157155

158-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
156+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
159157
deleteItemAtIndex(index: number): void {
160158
return Class.abstract();
161159
}
@@ -164,45 +162,43 @@ class EditStrategy<
164162
return this._itemsFromSameParent(movingIndex, destinationIndex) && movingIndex < destinationIndex ? 'after' : 'before';
165163
}
166164

167-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
165+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
168166
moveItemAtIndexToIndex(movingIndex: number, destinationIndex: number): void {
169167
return Class.abstract();
170168
}
171169

172-
// eslint-disable-next-line class-methods-use-this
173170
_isNormalizedItemIndex(index: number | Element | TItem): boolean {
174171
return (typeof index === 'number') && Math.round(index) === index;
175172
}
176173

177-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
174+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
178175
_isItemIndex(index: number | Element | TItem): boolean {
179176
return Class.abstract();
180177
}
181178

182-
// eslint-disable-next-line class-methods-use-this
183179
_getNormalizedItemIndex(
184180
// eslint-disable-next-line @typescript-eslint/no-unused-vars
185181
value: Element,
186182
): number {
187183
return Class.abstract();
188184
}
189185

190-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
186+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
191187
_normalizeItemIndex(index: number): number {
192188
return Class.abstract();
193189
}
194190

195-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
191+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
196192
_denormalizeItemIndex(index: number): CollectionItemIndex {
197193
return Class.abstract();
198194
}
199195

200-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
196+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
201197
_getItemByNormalizedIndex(index: number): dxElementWrapper {
202198
return Class.abstract();
203199
}
204200

205-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
201+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
206202
_itemsFromSameParent(movingIndex: number, destinationIndex: number): boolean {
207203
return Class.abstract();
208204
}

packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts renamed to packages/devextreme/js/__internal/ui/collection/collection_widget.edit.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type { ActionConfig } from '@ts/core/widget/component';
2424
import type { OptionChanged } from '@ts/core/widget/types';
2525
import type { CollectionWidgetBaseProperties, PostprocessRenderItemInfo } from '@ts/ui/collection/collection_widget.base';
2626
import BaseCollectionWidget from '@ts/ui/collection/collection_widget.base';
27-
import PlainEditStrategy from '@ts/ui/collection/m_collection_widget.edit.strategy.plain';
27+
import PlainEditStrategy from '@ts/ui/collection/collection_widget.edit.strategy.plain';
2828
import type DataController from '@ts/ui/collection/m_data_controller';
2929
import Selection from '@ts/ui/selection/m_selection';
3030

@@ -133,12 +133,10 @@ class CollectionWidget<
133133
this._keyGetter = compileGetter(keyExpr);
134134
}
135135

136-
// eslint-disable-next-line class-methods-use-this
137136
_selectedItemClass(): string {
138137
return SELECTED_ITEM_CLASS;
139138
}
140139

141-
// eslint-disable-next-line class-methods-use-this
142140
_getActionsList(): ('onSelectionChanging' | 'onSelectionChanged')[] {
143141
return ['onSelectionChanging', 'onSelectionChanged'];
144142
}
@@ -205,7 +203,6 @@ class CollectionWidget<
205203
return item as unknown as TKey;
206204
}
207205

208-
// eslint-disable-next-line class-methods-use-this
209206
_nullValueSelectionSupported(): boolean {
210207
return false;
211208
}
@@ -433,7 +430,6 @@ class CollectionWidget<
433430
return optionName;
434431
}
435432

436-
// eslint-disable-next-line class-methods-use-this
437433
_compareKeys(
438434
oldKeys: TKey[],
439435
newKeys: TKey[],
@@ -593,7 +589,7 @@ class CollectionWidget<
593589
}
594590
}
595591

596-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
592+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
597593
_updateSelection(addedSelection?: unknown[], removedSelection?: unknown[]): void {}
598594

599595
_setAriaSelectionAttribute(

packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts renamed to packages/devextreme/js/__internal/ui/collection/collection_widget.live_update.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { extend } from '@js/core/utils/extend';
99
import { each } from '@js/core/utils/iterator';
1010
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
1111
import type { OptionChanged } from '@ts/core/widget/types';
12-
import CollectionWidgetAsync from '@ts/ui/collection/m_collection_widget.async';
13-
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/m_collection_widget.edit';
12+
import CollectionWidgetAsync from '@ts/ui/collection/collection_widget.async';
13+
import type { CollectionWidgetEditProperties } from '@ts/ui/collection/collection_widget.edit';
1414

1515
import type { DataChange } from './collection_widget.base';
1616

@@ -60,7 +60,6 @@ class CollectionWidgetLiveUpdate<
6060
};
6161
}
6262

63-
// eslint-disable-next-line class-methods-use-this
6463
reload(): void {}
6564

6665
_init(): void {
@@ -97,7 +96,6 @@ class CollectionWidgetLiveUpdate<
9796
}
9897
}
9998

100-
// eslint-disable-next-line class-methods-use-this
10199
_isItemEquals(item1: unknown, item2: unknown): boolean {
102100
let itemToCompare = item1;
103101
if (item1 && typeof item1 === 'object' && item1[PRIVATE_KEY_FIELD]) {

‎packages/devextreme/js/__internal/ui/context_menu/m_menu_base.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { dxMenuBaseOptions } from '@js/ui/context_menu/ui.menu_base';
1111
import type { Item, SubmenuShowMode } from '@js/ui/menu';
1212
import { render } from '@js/ui/widget/utils.ink_ripple';
1313
import MenuItem from '@ts/ui/collection/item';
14-
import MenuBaseEditStrategy from '@ts/ui/context_menu/m_menu_base.edit.strategy';
14+
import MenuBaseEditStrategy from '@ts/ui/context_menu/menu_base.edit.strategy';
1515
import HierarchicalCollectionWidget from '@ts/ui/hierarchical_collection/m_hierarchical_collection_widget';
1616

1717
const DX_MENU_CLASS = 'dx-menu';

packages/devextreme/js/__internal/ui/context_menu/m_menu_base.edit.strategy.ts renamed to packages/devextreme/js/__internal/ui/context_menu/menu_base.edit.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import $ from '@js/core/renderer';
22
import { map } from '@js/core/utils/iterator';
33
import type { Item } from '@js/ui/menu';
4-
import PlainEditStrategy from '@ts/ui/collection/m_collection_widget.edit.strategy.plain';
4+
import PlainEditStrategy from '@ts/ui/collection/collection_widget.edit.strategy.plain';
55

66
class MenuBaseEditStrategy extends PlainEditStrategy<Item> {
77
_getPlainItems(): Item[] {

‎packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import dateUtils from '@js/core/utils/date';
44
import { extend } from '@js/core/utils/extend';
55
import { getWidth } from '@js/core/utils/size';
66
import { getWindow } from '@js/core/utils/window';
7+
import Box from '@ts/ui/box';
78
import TimeView from '@ts/ui/date_box/m_time_view';
8-
import Box from '@ts/ui/m_box';
99

1010
import CalendarStrategy from './m_date_box.strategy.calendar';
1111
import uiDateUtils from './m_date_utils';

‎packages/devextreme/js/__internal/ui/date_box/m_time_view.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import registerComponent from '@js/core/component_registrator';
33
import type { dxElementWrapper } from '@js/core/renderer';
44
import $ from '@js/core/renderer';
55
import type { OptionChanged } from '@ts/core/widget/types';
6+
import Box from '@ts/ui/box';
67
import type { EditorProperties } from '@ts/ui/editor/editor';
78
import Editor from '@ts/ui/editor/editor';
8-
import Box from '@ts/ui/m_box';
99
import SelectBox from '@ts/ui/m_select_box';
1010
import NumberBox from '@ts/ui/number_box/m_number_box';
1111

0 commit comments

Comments
 (0)