Skip to content

Commit 9d1e1fe

Browse files
EugeniyKiyashkoEugeniyKiyashko
authored
TreeView: remove m_ prefix from file names (DevExpress#30631)
1 parent c835a2a commit 9d1e1fe

File tree

5 files changed

+16
-32
lines changed

5 files changed

+16
-32
lines changed

‎packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Popup from '@js/ui/popup/ui.popup';
1515
import Modules from '@ts/grids/grid_core/m_modules';
1616
import type { ModuleType } from '@ts/grids/grid_core/m_types';
1717
import List from '@ts/ui/list/m_list.edit.search';
18-
import TreeView from '@ts/ui/tree_view/m_tree_view.search';
18+
import TreeView from '@ts/ui/tree_view/tree_view.search';
1919

2020
import gridCoreUtils from '../m_utils';
2121

‎packages/devextreme/js/__internal/ui/menu/menu.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import type {
4747
import MenuBase from '@ts/ui/context_menu/menu_base';
4848
import type { InternalNode } from '@ts/ui/hierarchical_collection/data_converter';
4949
import { getElementMaxHeightByWindow } from '@ts/ui/overlay/m_utils';
50-
import type { TreeViewBaseProperties } from '@ts/ui/tree_view/m_tree_view.base';
50+
import type { TreeViewBaseProperties } from '@ts/ui/tree_view/tree_view.base';
5151

5252
import type { SubmenuProperties } from './submenu';
5353
import Submenu from './submenu';

packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts renamed to packages/devextreme/js/__internal/ui/tree_view/tree_view.base.ts

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
243243
return $(element);
244244
}
245245

246-
// eslint-disable-next-line class-methods-use-this
247246
_widgetClass(): string {
248247
return WIDGET_CLASS;
249248
}
@@ -299,11 +298,10 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
299298
]);
300299
}
301300

302-
// eslint-disable-next-line class-methods-use-this
303301
_initSelectedItems(): void {}
304302

305303
// @ts-expect-error ts-error
306-
// eslint-disable-next-line class-methods-use-this
304+
307305
_syncSelectionOptions(): Promise<unknown> {
308306
return Deferred().resolve().promise();
309307
}
@@ -443,7 +441,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
443441
if (this._useCustomChildrenLoader()) {
444442
// @ts-expect-error ts-error
445443
this._loadChildrenByCustomLoader(null).done((newItems: TreeViewNode[]) => {
446-
if (newItems && newItems.length) {
444+
if (newItems?.length) {
447445
this.option('items', newItems);
448446
}
449447
});
@@ -494,7 +492,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
494492
}
495493

496494
_combineFilter(): unknown[] | undefined {
497-
if (!this._filter.custom || !this._filter.custom.length) {
495+
if (!this._filter.custom?.length) {
498496
return this._filter.internal;
499497
}
500498

@@ -713,7 +711,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
713711
_setAriaRole(): void {
714712
const { items } = this.option();
715713

716-
if (items && items.length) {
714+
if (items?.length) {
717715
this.setAria({ role: 'tree' });
718716
}
719717
}
@@ -725,7 +723,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
725723

726724
const { items } = this.option();
727725

728-
if (!items || !items.length) {
726+
if (!items?.length) {
729727
return;
730728
}
731729

@@ -828,7 +826,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
828826
return $node;
829827
}
830828

831-
// eslint-disable-next-line class-methods-use-this
832829
_getLevel($nodeContainer: dxElementWrapper): number {
833830
const parent = $nodeContainer.parent();
834831

@@ -907,7 +904,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
907904
return $node;
908905
}
909906

910-
// eslint-disable-next-line class-methods-use-this
911907
_setAriaSelectionAttribute(): void {}
912908

913909
_renderChildren($node: dxElementWrapper, node: TreeViewNode): void {
@@ -973,7 +969,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
973969
return deferred.promise();
974970
}
975971

976-
// eslint-disable-next-line class-methods-use-this
977972
_getItemExtraPropNames(): string[] {
978973
return ['url', 'linkAttr'];
979974
}
@@ -1046,7 +1041,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
10461041
});
10471042
}
10481043

1049-
// eslint-disable-next-line class-methods-use-this
10501044
_addLeafClass($node: dxElementWrapper): void {
10511045
$node.addClass(IS_LEAF);
10521046
}
@@ -1079,7 +1073,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
10791073
eventsEngine.off(itemsContainer, `.${EXPAND_EVENT_NAMESPACE}`, this._itemSelector());
10801074
}
10811075

1082-
// eslint-disable-next-line class-methods-use-this
10831076
_getEventNameByOption(name: TreeViewExpandEvent | undefined): string {
10841077
const event = name === 'click' ? clickEventName : dblclickEvent;
10851078
return addNamespace(event, EXPAND_EVENT_NAMESPACE);
@@ -1163,13 +1156,11 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
11631156
return this._updateExpandedItemsUI(node, newState, e);
11641157
}
11651158

1166-
// eslint-disable-next-line class-methods-use-this
11671159
_nodeHasRenderedChildren($node: dxElementWrapper): number {
11681160
const $nodeContainer = $node.children(`.${NODE_CONTAINER_CLASS}`);
11691161
return $nodeContainer.not(':empty').length;
11701162
}
11711163

1172-
// eslint-disable-next-line class-methods-use-this
11731164
_getItem($node: dxElementWrapper): dxElementWrapper {
11741165
return $node.children(`.${ITEM_CLASS}`).eq(0);
11751166
}
@@ -1261,7 +1252,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
12611252
});
12621253
}
12631254

1264-
// eslint-disable-next-line class-methods-use-this
12651255
_toggleCustomExpanderIcons(
12661256
$expandIcon: dxElementWrapper,
12671257
$collapseIcon: dxElementWrapper,
@@ -1338,7 +1328,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
13381328

13391329
this._renderSublevel($node, actualNodeData, this._dataAdapter.getNodesByItems(items));
13401330

1341-
if (!items || !items.length) {
1331+
if (!items?.length) {
13421332
completionCallback.resolve();
13431333
return;
13441334
}
@@ -1491,7 +1481,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
14911481
_renderContent(): void {
14921482
const { items } = this.option();
14931483

1494-
if (items && items.length) {
1484+
if (items?.length) {
14951485
this._contentAlreadyRendered = true;
14961486
}
14971487

@@ -1555,7 +1545,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
15551545
});
15561546
}
15571547

1558-
// eslint-disable-next-line class-methods-use-this
15591548
_toggleSelectedClass($node: dxElementWrapper, value: boolean | undefined): void {
15601549
$node.toggleClass(SELECTED_ITEM_CLASS, !!value);
15611550
}
@@ -1793,12 +1782,10 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
17931782
this._itemDXEventHandler(e, eventName, { node: this._dataAdapter.getPublicNode(node) });
17941783
}
17951784

1796-
// eslint-disable-next-line class-methods-use-this
17971785
_itemClass(): string {
17981786
return ITEM_CLASS;
17991787
}
18001788

1801-
// eslint-disable-next-line class-methods-use-this
18021789
_itemDataKey(): string {
18031790
return ITEM_DATA_KEY;
18041791
}
@@ -1978,7 +1965,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
19781965
this.option('focusedElement', getPublicElement(itemElement));
19791966
}
19801967

1981-
// eslint-disable-next-line class-methods-use-this
19821968
_findNonDisabledNodes($nodes: dxElementWrapper): dxElementWrapper {
19831969
return $nodes.not(`:has(>.${ITEM_CLASS}.${DISABLED_STATE_CLASS})`);
19841970
}
@@ -2002,7 +1988,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
20021988

20031989
const $items = this._nodeElements();
20041990

2005-
if (!$items || !$items.length) {
1991+
if (!$items?.length) {
20061992
return;
20071993
}
20081994

@@ -2063,7 +2049,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
20632049
}
20642050
}
20652051

2066-
// eslint-disable-next-line class-methods-use-this
20672052
_getNodeItemElement($node: dxElementWrapper): Element {
20682053
return $node.find(`.${ITEM_CLASS}`).get(0);
20692054
}
@@ -2095,7 +2080,6 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
20952080
this._toggleExpandedState(node, true);
20962081
}
20972082

2098-
// eslint-disable-next-line class-methods-use-this
20992083
_getClosestNonDisabledNode($node: dxElementWrapper): dxElementWrapper {
21002084
const isNodeDisabled = ($el: dxElementWrapper): boolean => $el.children(`.${ITEM_CLASS}.${DISABLED_STATE_CLASS}`).length > 0;
21012085

@@ -2136,7 +2120,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
21362120
_encodeString(value: string): string;
21372121
_encodeString(value: number): number;
21382122
_encodeString(value: ItemKey): ItemKey;
2139-
// eslint-disable-next-line class-methods-use-this
2123+
21402124
_encodeString(value: ItemKey): ItemKey {
21412125
return isString(value)
21422126
? encodeURI(value)
@@ -2146,7 +2130,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
21462130
_decodeString(value: string): string;
21472131
_decodeString(value: number): number;
21482132
_decodeString(value: ItemKey): ItemKey;
2149-
// eslint-disable-next-line class-methods-use-this
2133+
21502134
_decodeString(value: ItemKey): ItemKey {
21512135
return isString(value)
21522136
? decodeURI(value)
@@ -2274,7 +2258,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
22742258
this._expandNodes(nodeKeysToExpand.reverse()).always(() => {
22752259
const $element = this._getNodeElement(node);
22762260

2277-
if ($element && $element.length) {
2261+
if ($element?.length) {
22782262
this.scrollToElementTopLeft($element[0]);
22792263
scrollCallback.resolve();
22802264
} else {

packages/devextreme/js/__internal/ui/tree_view/m_tree_view.search.ts renamed to packages/devextreme/js/__internal/ui/tree_view/tree_view.search.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import SearchBoxController from '@ts/ui/collection/m_search_box_mixin';
88
import type { DataAdapterOptions } from '@ts/ui/hierarchical_collection/data_adapter';
99
import type { InternalNode } from '@ts/ui/hierarchical_collection/data_converter';
1010
import TextBox from '@ts/ui/text_box/m_text_box';
11-
import type { TreeViewBaseProperties } from '@ts/ui/tree_view/m_tree_view.base';
12-
import TreeViewBase from '@ts/ui/tree_view/m_tree_view.base';
11+
import type { TreeViewBaseProperties } from '@ts/ui/tree_view/tree_view.base';
12+
import TreeViewBase from '@ts/ui/tree_view/tree_view.base';
1313

1414
const TREEVIEW_CLASS_PREFIX = 'dx-treeview';
1515
const TREEVIEW_NODE_CONTAINER_CLASS = 'dx-treeview-node-container';

‎packages/devextreme/js/ui/tree_view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import TreeView from '../__internal/ui/tree_view/m_tree_view.search';
1+
import TreeView from '../__internal/ui/tree_view/tree_view.search';
22
export default TreeView;
33

44
// STYLE treeView

0 commit comments

Comments
 (0)