Skip to content

Commit 9661fd2

Browse files
anna-shakhovaanna-shakhova
authored
Menu & ContextMenu: remove m_ prefix from file names (DevExpress#30517)
1 parent 724f615 commit 9661fd2

File tree

14 files changed

+30
-60
lines changed

14 files changed

+30
-60
lines changed

‎packages/devextreme/js/__internal/ui/chat/messagelist.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import type dxContextMenu from '@js/ui/context_menu';
1919
import type { WidgetOptions } from '@js/ui/widget/ui.widget';
2020
import type { OptionChanged } from '@ts/core/widget/types';
2121
import Widget from '@ts/core/widget/widget';
22-
import ContextMenu from '@ts/ui/context_menu/m_context_menu';
22+
import ContextMenu from '@ts/ui/context_menu/context_menu';
2323
import type {
2424
ScrollView as ScrollViewType,
2525
} from '@ts/ui/scroll_view/scroll_view';

packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts renamed to packages/devextreme/js/__internal/ui/context_menu/context_menu.ts

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ import type { Properties as OverlayProperties } from '@js/ui/overlay';
4747
import { current as currentTheme, isGeneric } from '@js/ui/themes';
4848
import type { ActionArguments } from '@ts/core/m_action';
4949
import type { OptionChanged } from '@ts/core/widget/types';
50-
import type { ClickEvent, HoverEvent, MenuBaseProperties } from '@ts/ui/context_menu/m_menu_base';
51-
import MenuBase from '@ts/ui/context_menu/m_menu_base';
50+
import type { ClickEvent, HoverEvent, MenuBaseProperties } from '@ts/ui/context_menu/menu_base';
51+
import MenuBase from '@ts/ui/context_menu/menu_base';
5252
import type { InternalNode } from '@ts/ui/hierarchical_collection/data_converter';
5353
import Overlay from '@ts/ui/overlay/m_overlay';
5454
import Scrollable from '@ts/ui/scroll_view/scrollable';
@@ -160,7 +160,6 @@ class ContextMenu<
160160
// @ts-expect-error ts-error
161161
_actions!: ContextMenuActions;
162162

163-
// eslint-disable-next-line class-methods-use-this
164163
getShowEvent(showEventOption: ContextMenuProperties['showEvent']): string | null {
165164
if (isObject(showEventOption)) {
166165
if (showEventOption.name === null) {
@@ -173,7 +172,6 @@ class ContextMenu<
173172
return showEventOption ?? null;
174173
}
175174

176-
// eslint-disable-next-line class-methods-use-this
177175
getShowDelay(showEventOption: TProperties['showEvent']): number {
178176
return isObject(showEventOption) ? showEventOption.delay ?? 0 : 0;
179177
}
@@ -233,7 +231,6 @@ class ContextMenu<
233231
});
234232
}
235233

236-
// eslint-disable-next-line class-methods-use-this
237234
_focusInHandler(): void {}
238235

239236
_itemContainer(): dxElementWrapper {
@@ -271,7 +268,7 @@ class ContextMenu<
271268
}
272269

273270
// eslint-disable-next-line @typescript-eslint/no-unused-vars
274-
_getActiveItem(last?: boolean): dxElementWrapper {
271+
_getActiveItem(_last?: boolean): dxElementWrapper {
275272
const $availableItems = this._getAvailableItems();
276273

277274
const $focusedItem = $availableItems.filter(`.${DX_STATE_FOCUSED_CLASS}`);
@@ -347,7 +344,6 @@ class ContextMenu<
347344
}
348345
}
349346

350-
// eslint-disable-next-line class-methods-use-this
351347
_scrollToElement($element: dxElementWrapper): void {
352348
const $scrollableElement = $element.closest(`.${SCROLLABLE_CLASS}`);
353349
const scrollableInstance: Scrollable = Scrollable.getInstance($scrollableElement.get(0));
@@ -447,7 +443,6 @@ class ContextMenu<
447443
this._addWidgetClass();
448444
}
449445

450-
// eslint-disable-next-line class-methods-use-this
451446
_isTargetOutOfComponent(relatedTarget: Element): boolean {
452447
const isInsideContextMenu = $(relatedTarget).closest(`.${DX_CONTEXT_MENU_CLASS}`).length !== 0;
453448

@@ -516,7 +511,6 @@ class ContextMenu<
516511
e.stopPropagation();
517512
}
518513

519-
// eslint-disable-next-line class-methods-use-this
520514
_addPlatformDependentClass($element: dxElementWrapper): void {
521515
if (devices.current().phone) {
522516
$element.addClass(DX_MENU_PHONE_CLASS);
@@ -597,7 +591,6 @@ class ContextMenu<
597591
e.stopPropagation();
598592
}
599593

600-
// eslint-disable-next-line class-methods-use-this
601594
_renderDimensions(): void {}
602595

603596
_renderContainer($wrapper: dxElementWrapper, submenuContainer?: Element): dxElementWrapper {
@@ -746,7 +739,6 @@ class ContextMenu<
746739
return true;
747740
}
748741

749-
// eslint-disable-next-line class-methods-use-this
750742
_getActiveItemsContainer(target: Element): dxElementWrapper {
751743
return $(target).closest(`.${DX_MENU_ITEMS_CONTAINER_CLASS}`);
752744
}
@@ -755,12 +747,10 @@ class ContextMenu<
755747
return this._overlay?.$content().find(`.${DX_MENU_ITEMS_CONTAINER_CLASS}`) ?? $();
756748
}
757749

758-
// eslint-disable-next-line class-methods-use-this
759750
_searchActiveItem(target: Element): dxElementWrapper {
760751
return $(target).closest(`.${DX_MENU_ITEM_CLASS}`).eq(0);
761752
}
762753

763-
// eslint-disable-next-line class-methods-use-this
764754
_isIncludeOverlay($activeOverlay: dxElementWrapper, $allOverlays: dxElementWrapper): boolean {
765755
let isSame = false;
766756

@@ -813,8 +803,8 @@ class ContextMenu<
813803
$submenu.css('height', isNestedSubmenu ? menuHeight : '100%');
814804
}
815805

816-
// eslint-disable-next-line @typescript-eslint/no-unused-vars,class-methods-use-this
817-
_getMaxUsableSpace(offsetTop: number, windowHeight: number, anchorHeight: number): number {
806+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
807+
_getMaxUsableSpace(_offsetTop: number, windowHeight: number, _anchorHeight: number): number {
818808
return windowHeight;
819809
}
820810

@@ -853,7 +843,6 @@ class ContextMenu<
853843
});
854844
}
855845

856-
// eslint-disable-next-line class-methods-use-this
857846
_getSubmenuBorderWidth(): number {
858847
return isGeneric(currentTheme()) ? BORDER_WIDTH : 0;
859848
}
@@ -904,7 +893,6 @@ class ContextMenu<
904893
}
905894
}
906895

907-
// eslint-disable-next-line class-methods-use-this
908896
_isSubmenuVisible($submenu: dxElementWrapper): boolean {
909897
// @ts-expect-error ts-error
910898
return $submenu.css('visibility') === 'visible';
@@ -942,7 +930,6 @@ class ContextMenu<
942930
}
943931
}
944932

945-
// eslint-disable-next-line class-methods-use-this
946933
_animate(container: Element, options: AnimationConfig): void {
947934
// eslint-disable-next-line @typescript-eslint/no-floating-promises
948935
fx.animate(container, options);
@@ -1075,7 +1062,6 @@ class ContextMenu<
10751062
this.option('focusedElement', null);
10761063
}
10771064

1078-
// eslint-disable-next-line class-methods-use-this
10791065
_stopAnimate($container: dxElementWrapper): void {
10801066
fx.stop($container.get(0), true);
10811067
}
@@ -1140,7 +1126,6 @@ class ContextMenu<
11401126
return showing ? this._show() : this._hide();
11411127
}
11421128

1143-
// eslint-disable-next-line class-methods-use-this
11441129
_toggleVisibility(): void {}
11451130

11461131
_show(event?: DxEvent): Promise<unknown> {

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,30 +112,25 @@ class MenuBase<
112112
};
113113
}
114114

115-
// eslint-disable-next-line class-methods-use-this
116115
_itemDataKey(): string {
117116
return DX_MENU_ITEM_DATA_KEY;
118117
}
119118

120-
// eslint-disable-next-line class-methods-use-this
121119
_itemClass(): string {
122120
return ITEM_CLASS;
123121
}
124122

125-
// eslint-disable-next-line class-methods-use-this
126123
_setAriaSelectionAttribute(
127124
// eslint-disable-next-line @typescript-eslint/no-unused-vars
128125
$itemElement: dxElementWrapper,
129126
// eslint-disable-next-line @typescript-eslint/no-unused-vars
130127
isSelected: string,
131128
): void {}
132129

133-
// eslint-disable-next-line class-methods-use-this
134130
_selectedItemClass(): string {
135131
return DX_MENU_SELECTED_ITEM_CLASS;
136132
}
137133

138-
// eslint-disable-next-line class-methods-use-this
139134
_widgetClass(): string {
140135
return DX_MENU_BASE_CLASS;
141136
}
@@ -215,7 +210,6 @@ class MenuBase<
215210
this._addContentClasses(itemData, $container.parent());
216211
}
217212

218-
// eslint-disable-next-line class-methods-use-this
219213
_getTextContainer(itemData: Item): dxElementWrapper {
220214
const { text } = itemData;
221215
if (!text) {
@@ -226,12 +220,10 @@ class MenuBase<
226220
return $itemContainer.text(itemText);
227221
}
228222

229-
// eslint-disable-next-line class-methods-use-this
230223
_getItemExtraPropNames(): string[] {
231224
return ['url', 'linkAttr'];
232225
}
233226

234-
// eslint-disable-next-line class-methods-use-this
235227
_getPopoutContainer(itemData: Item): dxElementWrapper {
236228
const { items } = itemData;
237229

@@ -247,7 +239,6 @@ class MenuBase<
247239
return $popOutContainer;
248240
}
249241

250-
// eslint-disable-next-line class-methods-use-this
251242
_getDataAdapterOptions(): BaseDataAdapterOptions {
252243
return {
253244
rootValue: 0,
@@ -297,7 +288,6 @@ class MenuBase<
297288
}
298289
}
299290

300-
// eslint-disable-next-line class-methods-use-this
301291
_initActions(): void {}
302292

303293
_initMarkup(): void {
@@ -346,7 +336,6 @@ class MenuBase<
346336
return this._isDesktopDevice() ? showMode : defaultValue;
347337
}
348338

349-
// eslint-disable-next-line class-methods-use-this
350339
_isDesktopDevice(): boolean {
351340
return devices.real().deviceType === 'desktop';
352341
}
@@ -403,7 +392,6 @@ class MenuBase<
403392
this._addExpandedClass($itemElement);
404393
}
405394

406-
// eslint-disable-next-line class-methods-use-this
407395
_addExpandedClass(itemElement: Element | dxElementWrapper): void {
408396
$(itemElement).addClass(DX_MENU_ITEM_EXPANDED_CLASS);
409397
}
@@ -449,7 +437,6 @@ class MenuBase<
449437
clearTimeout(this._showSubmenusTimeout);
450438
}
451439

452-
// eslint-disable-next-line class-methods-use-this
453440
_hasSubmenu(node: MenuBaseNode | null): boolean {
454441
return !!node?.internalFields.childrenKeys.length;
455442
}
@@ -618,12 +605,10 @@ class MenuBase<
618605
}
619606
}
620607

621-
// eslint-disable-next-line class-methods-use-this
622608
_isItemSelectable(item: Item): boolean {
623609
return item.selectable !== false;
624610
}
625611

626-
// eslint-disable-next-line class-methods-use-this
627612
_renderSeparator($itemsContainer: dxElementWrapper): void {
628613
$('<li>')
629614
.appendTo($itemsContainer)
@@ -653,7 +638,7 @@ class MenuBase<
653638
}
654639

655640
const $itemElement = this._getItemElementByEventArgs(event);
656-
const link = $itemElement && $itemElement.find(`.${ITEM_URL_CLASS}`)[0];
641+
const link = $itemElement?.find(`.${ITEM_URL_CLASS}`)[0];
657642

658643
if (!itemData?.url || !link) {
659644
return;
@@ -720,7 +705,6 @@ class MenuBase<
720705
return this._itemContainer().is(':empty');
721706
}
722707

723-
// eslint-disable-next-line class-methods-use-this
724708
_syncSelectionOptions(): DeferredObj<unknown> {
725709
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
726710
return asyncNoop();

‎packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type { Item } from '@js/ui/toolbar';
2020
import Toolbar from '@js/ui/toolbar';
2121
import errors from '@js/ui/widget/ui.errors';
2222
import { capitalize } from '@ts/core/utils/capitalize';
23-
import { DX_MENU_ITEM_CLASS } from '@ts/ui/menu/m_menu';
23+
import { DX_MENU_ITEM_CLASS } from '@ts/ui/menu/menu';
2424
import Quill from 'devextreme-quill';
2525

2626
import type { CommandsMap } from '../utils/ai';

packages/devextreme/js/__internal/ui/menu/m_menu.ts renamed to packages/devextreme/js/__internal/ui/menu/menu.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ import type {
4242
HoverEvent,
4343
ItemClickActionArguments,
4444
MenuBaseProperties,
45-
} from '@ts/ui/context_menu/m_menu_base';
46-
import MenuBase from '@ts/ui/context_menu/m_menu_base';
45+
} from '@ts/ui/context_menu/menu_base';
46+
import MenuBase from '@ts/ui/context_menu/menu_base';
4747
import type { InternalNode } from '@ts/ui/hierarchical_collection/data_converter';
4848
import { getElementMaxHeightByWindow } from '@ts/ui/overlay/m_utils';
4949
import type { TreeViewBaseProperties } from '@ts/ui/tree_view/m_tree_view.base';
5050

51-
import type { SubmenuProperties } from './m_submenu';
52-
import Submenu from './m_submenu';
51+
import type { SubmenuProperties } from './submenu';
52+
import Submenu from './submenu';
5353

5454
const DX_MENU_CLASS = 'dx-menu';
5555
const DX_MENU_VERTICAL_CLASS = `${DX_MENU_CLASS}-vertical`;
@@ -380,7 +380,6 @@ class Menu extends MenuBase<MenuProperties> {
380380
this._initAdaptivity();
381381
}
382382

383-
// eslint-disable-next-line class-methods-use-this
384383
_isTargetOutOfComponent(relatedTarget: Element): boolean {
385384
const isInsideRootMenu = $(relatedTarget).closest(`.${DX_MENU_CLASS}`).length !== 0;
386385
const isInsideContextMenu = $(relatedTarget).closest(`.${DX_CONTEXT_MENU_CLASS}`).length !== 0;
@@ -417,6 +416,7 @@ class Menu extends MenuBase<MenuProperties> {
417416
if (isPlainObject(state)) {
418417
const { visible } = this._overlay?.option() ?? {};
419418

419+
// eslint-disable-next-line no-param-reassign
420420
state = !visible;
421421
}
422422

@@ -947,11 +947,11 @@ class Menu extends MenuBase<MenuProperties> {
947947
const hoveredElementFromSubMenu = this._visibleSubmenu.getOverlayContent()?.get(0).querySelector(':hover');
948948

949949
if (!hoveredElementFromSubMenu && !isSubmenuItemHovered && !isRootItemHovered) {
950+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
950951
this._visibleSubmenu.hide();
951952
}
952953
}
953954

954-
// eslint-disable-next-line class-methods-use-this
955955
_getSubmenuByRootElement($rootItem: dxElementWrapper): Submenu | undefined {
956956
if (!$rootItem) {
957957
return undefined;
@@ -1001,7 +1001,6 @@ class Menu extends MenuBase<MenuProperties> {
10011001
return submenuPosition;
10021002
}
10031003

1004-
// eslint-disable-next-line class-methods-use-this
10051004
_renderBorderElement($item: dxElementWrapper): void {
10061005
$('<div>')
10071006
.appendTo($item)
@@ -1097,6 +1096,7 @@ class Menu extends MenuBase<MenuProperties> {
10971096
this._clearTimeouts();
10981097
this.focus();
10991098

1099+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
11001100
submenu.show();
11011101

11021102
const { focusedElement } = submenu.option();
@@ -1110,6 +1110,7 @@ class Menu extends MenuBase<MenuProperties> {
11101110

11111111
_hideSubmenu(submenu: Submenu | null | undefined): void {
11121112
if (submenu) {
1113+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
11131114
submenu.hide();
11141115
}
11151116

@@ -1157,6 +1158,7 @@ class Menu extends MenuBase<MenuProperties> {
11571158
return submenu;
11581159
}
11591160

1161+
// eslint-disable-next-line no-param-reassign
11601162
itemData = itemData ?? this._getItemData($itemElement) as Item;
11611163

11621164
const node = this._dataAdapter.getNodeByItem(itemData);

packages/devextreme/js/__internal/ui/menu/m_submenu.ts renamed to packages/devextreme/js/__internal/ui/menu/submenu.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import {
1313
} from '@js/core/utils/size';
1414
import type { DxEvent } from '@js/events';
1515
import type { Item } from '@js/ui/menu';
16-
import type { ContextMenuProperties } from '@ts/ui/context_menu/m_context_menu';
17-
import ContextMenu from '@ts/ui/context_menu/m_context_menu';
18-
import type { HoverEvent } from '@ts/ui/context_menu/m_menu_base';
16+
import type { ContextMenuProperties } from '@ts/ui/context_menu/context_menu';
17+
import ContextMenu from '@ts/ui/context_menu/context_menu';
18+
import type { HoverEvent } from '@ts/ui/context_menu/menu_base';
1919
import type DataAdapter from '@ts/ui/hierarchical_collection/data_adapter';
2020
import type { ItemKey } from '@ts/ui/hierarchical_collection/data_converter';
2121
import type { OverlayProperties, PositioningEvent as OverlayPositioningEvent } from '@ts/ui/overlay/m_overlay';
@@ -36,7 +36,6 @@ class Submenu extends ContextMenu<SubmenuProperties> {
3636

3737
_dataAdapter!: DataAdapter;
3838

39-
// eslint-disable-next-line class-methods-use-this
4039
_getMaxUsableSpace(offsetTop: number, windowHeight: number, anchorHeight: number): number {
4140
return Math.max(offsetTop, windowHeight - offsetTop - anchorHeight);
4241
}

‎packages/devextreme/js/ui/context_menu.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ContextMenu from '../__internal/ui/context_menu/m_context_menu';
1+
import ContextMenu from '../__internal/ui/context_menu/context_menu';
22

33
export default ContextMenu;
44

0 commit comments

Comments
 (0)