Skip to content

Commit 8f72f85

Browse files
authored
Overlay: Remove m_ prefix
1 parent 62eba3b commit 8f72f85

File tree

11 files changed

+13
-19
lines changed

11 files changed

+13
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import type { OptionChanged } from '@ts/core/widget/types';
5050
import type { ClickEvent, HoverEvent, MenuBaseProperties } from '@ts/ui/context_menu/menu_base';
5151
import MenuBase from '@ts/ui/context_menu/menu_base';
5252
import type { InternalNode } from '@ts/ui/hierarchical_collection/data_converter';
53-
import Overlay from '@ts/ui/overlay/m_overlay';
53+
import Overlay from '@ts/ui/overlay/overlay';
5454
import Scrollable from '@ts/ui/scroll_view/scrollable';
5555

5656
const DX_MENU_CLASS = 'dx-menu';

packages/devextreme/js/__internal/ui/drawer/drawer.rendering.strategy.overlap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { camelize } from '@js/core/utils/inflector';
88
import { getWidth } from '@js/core/utils/size';
99
import type { PanelLocation } from '@js/ui/drawer';
1010
import type Drawer from '@ts/ui/drawer/drawer';
11-
import Overlay from '@ts/ui/overlay/m_overlay';
11+
import Overlay from '@ts/ui/overlay/overlay';
1212

1313
import { animation } from './drawer.animation';
1414
import DrawerStrategy from './drawer.rendering.strategy';

packages/devextreme/js/__internal/ui/drawer/drawer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { animation } from '@ts/ui/drawer/drawer.animation';
2020
import OverlapStrategy from '@ts/ui/drawer/drawer.rendering.strategy.overlap';
2121
import PushStrategy from '@ts/ui/drawer/drawer.rendering.strategy.push';
2222
import ShrinkStrategy from '@ts/ui/drawer/drawer.rendering.strategy.shrink';
23-
import type Overlay from '@ts/ui/overlay/m_overlay';
23+
import type Overlay from '@ts/ui/overlay/overlay';
2424

2525
const DRAWER_CLASS = 'dx-drawer';
2626
const DRAWER_WRAPPER_CLASS = 'dx-drawer-wrapper';

packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import messageLocalization from '@js/common/core/localization/message';
22
import type { dxElementWrapper } from '@js/core/renderer';
33
import $ from '@js/core/renderer';
44
import { getOuterHeight, getOuterWidth } from '@js/core/utils/size';
5-
import Overlay from '@ts/ui/overlay/m_overlay';
5+
import Overlay from '@ts/ui/overlay/overlay';
66

77
import { ListBase } from './m_list.base';
88
import EditDecorator from './m_list.edit.decorator';

packages/devextreme/js/__internal/ui/m_load_panel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import LoadIndicator from '@js/ui/load_indicator';
99
import type { Properties } from '@js/ui/load_panel';
1010
import { isFluent, isMaterial } from '@js/ui/themes';
1111
import type { OptionChanged } from '@ts/core/widget/types';
12-
import Overlay from '@ts/ui/overlay/m_overlay';
12+
import Overlay from '@ts/ui/overlay/overlay';
1313

1414
// STYLE loadPanel
1515

packages/devextreme/js/__internal/ui/m_validation_message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getOuterWidth } from '@js/core/utils/size';
66
import { encodeHtml } from '@js/core/utils/string';
77
import type { Properties } from '@js/ui/validation_message';
88
import type { OptionChanged } from '@ts/core/widget/types';
9-
import Overlay from '@ts/ui/overlay/m_overlay';
9+
import Overlay from '@ts/ui/overlay/overlay';
1010

1111
const INVALID_MESSAGE = 'dx-invalid-message';
1212
const INVALID_MESSAGE_AUTO = 'dx-invalid-message-auto';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import ContextMenu from '@ts/ui/context_menu/context_menu';
1818
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';
21-
import type { OverlayProperties, PositioningEvent as OverlayPositioningEvent } from '@ts/ui/overlay/m_overlay';
22-
import type Overlay from '@ts/ui/overlay/m_overlay';
21+
import type { OverlayProperties, PositioningEvent as OverlayPositioningEvent } from '@ts/ui/overlay/overlay';
22+
import type Overlay from '@ts/ui/overlay/overlay';
2323

2424
const DX_CONTEXT_MENU_CONTENT_DELIMITER_CLASS = 'dx-context-menu-content-delimiter';
2525
const DX_SUBMENU_CLASS = 'dx-submenu';

packages/devextreme/js/__internal/ui/overlay/m_overlay.ts renamed to packages/devextreme/js/__internal/ui/overlay/overlay.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ class Overlay<
376376
}
377377
}
378378

379-
// eslint-disable-next-line class-methods-use-this
380379
_getActionsList(): string[] {
381380
return [
382381
'onShowing',
@@ -462,7 +461,6 @@ class Overlay<
462461
this.hide();
463462
}
464463

465-
// eslint-disable-next-line class-methods-use-this
466464
_getAnonymousTemplateName(): string {
467465
return ANONYMOUS_TEMPLATE_NAME;
468466
}
@@ -482,7 +480,6 @@ class Overlay<
482480
const tabbableElements = overlayStack[i]._findTabbableBounds();
483481

484482
if (tabbableElements.$first || tabbableElements.$last) {
485-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
486483
// @ts-ignore expected: types Overlay<OverlayProperties> and this have no overlap
487484
return overlayStack[i] === this;
488485
}
@@ -491,12 +488,10 @@ class Overlay<
491488
return false;
492489
}
493490

494-
// eslint-disable-next-line class-methods-use-this
495491
_overlayStack(): Overlay[] {
496492
return OVERLAY_STACK;
497493
}
498494

499-
// eslint-disable-next-line class-methods-use-this
500495
_zIndexInitValue(): number {
501496
return Overlay.baseZIndex();
502497
}
@@ -554,7 +549,7 @@ class Overlay<
554549
return this._getOptionValue('animation', this) ?? {};
555550
}
556551

557-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
552+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
558553
_toggleBodyScroll(enabled?: boolean): void {}
559554

560555
_animateShowing(): void {
@@ -600,7 +595,6 @@ class Overlay<
600595
);
601596
}
602597

603-
// eslint-disable-next-line class-methods-use-this
604598
_processShowingHidingCancel(
605599
cancelArg: boolean | Promise<boolean>,
606600
applyFunction: () => void,

packages/devextreme/js/__internal/ui/popup/m_popup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ import type { Properties as ToolbarProperties } from '@js/ui/toolbar';
4242
import type Toolbar from '@js/ui/toolbar';
4343
import windowUtils from '@ts/core/utils/m_window';
4444
import type { OptionChanged } from '@ts/core/widget/types';
45-
import type { GeometryOptions, OverlayActions } from '@ts/ui/overlay/m_overlay';
46-
import Overlay from '@ts/ui/overlay/m_overlay';
4745
import * as zIndexPool from '@ts/ui/overlay/m_z_index';
46+
import type { GeometryOptions, OverlayActions } from '@ts/ui/overlay/overlay';
47+
import Overlay from '@ts/ui/overlay/overlay';
4848
import { TOOLBAR_CLASS } from '@ts/ui/toolbar/constants';
4949
import type { ToolbarBaseProperties } from '@ts/ui/toolbar/toolbar.base';
5050

packages/devextreme/js/ui/overlay/ui.overlay.js

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

33
export default Overlay;
44

0 commit comments

Comments
 (0)