Skip to content

Commit 73d5cb9

Browse files
Accordion & MultiView: remove m_ prefix from file names (DevExpress#30591)
1 parent 99fad02 commit 73d5cb9

File tree

8 files changed

+8
-16
lines changed

8 files changed

+8
-16
lines changed

packages/devextreme/js/__internal/ui/m_accordion.ts renamed to packages/devextreme/js/__internal/ui/accordion.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,10 @@ class Accordion extends CollectionWidget<AccordionProperties> {
159159
this._updateItemHeights(true);
160160
}
161161

162-
// eslint-disable-next-line class-methods-use-this
163162
_itemDataKey(): string {
164163
return ACCORDION_ITEM_DATA_KEY;
165164
}
166165

167-
// eslint-disable-next-line class-methods-use-this
168166
_itemClass(): string {
169167
return ACCORDION_ITEM_CLASS;
170168
}
@@ -435,7 +433,6 @@ class Accordion extends CollectionWidget<AccordionProperties> {
435433
super._clean();
436434
}
437435

438-
// eslint-disable-next-line class-methods-use-this
439436
_tryParseItemPropertyName(fullName: string): string | null {
440437
// eslint-disable-next-line @typescript-eslint/prefer-regexp-exec
441438
const matches = fullName.match(/.*\.(.*)/);

packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts renamed to packages/devextreme/js/__internal/ui/multi_view/multi_view.animation.ts

File renamed without changes.

packages/devextreme/js/__internal/ui/multi_view/m_multi_view.ts renamed to packages/devextreme/js/__internal/ui/multi_view/multi_view.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import type { OptionChanged } from '@ts/core/widget/types';
2222
import type { SwipeEndEvent, SwipeStartEvent, SwipeUpdateEvent } from '@ts/events/m_swipe';
2323
import type { DataChange, ItemRenderInfo } from '@ts/ui/collection/collection_widget.base';
2424

25-
import { _translator, animation } from './m_multi_view.animation';
25+
import { _translator, animation } from './multi_view.animation';
2626

2727
// STYLE multiView
2828

@@ -109,12 +109,10 @@ class MultiView<
109109
]);
110110
}
111111

112-
// eslint-disable-next-line class-methods-use-this
113112
_itemClass(): string {
114113
return MULTIVIEW_ITEM_CLASS;
115114
}
116115

117-
// eslint-disable-next-line class-methods-use-this
118116
_itemDataKey(): string {
119117
return MULTIVIEW_ITEM_DATA_KEY;
120118
}
@@ -156,7 +154,7 @@ class MultiView<
156154
let normalizedIndex = index;
157155

158156
if (this._isAllItemsHidden()) {
159-
return;
157+
return undefined;
160158
}
161159

162160
if (index < 0) {
@@ -308,7 +306,6 @@ class MultiView<
308306
});
309307
}
310308

311-
// eslint-disable-next-line class-methods-use-this
312309
_getElementAria(): Record<string, string> {
313310
return {
314311
role: 'group',
@@ -336,7 +333,6 @@ class MultiView<
336333
});
337334
}
338335

339-
// eslint-disable-next-line class-methods-use-this
340336
_getItemAria(args: {
341337
itemIndex: number;
342338
itemsCount: number;
@@ -423,7 +419,6 @@ class MultiView<
423419
this._updateItemsVisibility(selectedIndex);
424420
}
425421

426-
// eslint-disable-next-line class-methods-use-this
427422
_setAriaSelectionAttribute(): void {}
428423

429424
_updateSelection(addedSelection: number[], removedSelection: number[]): void {
@@ -584,7 +579,7 @@ class MultiView<
584579
return index;
585580
}
586581

587-
// eslint-disable-next-line @typescript-eslint/no-unused-vars,class-methods-use-this
582+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
588583
_postprocessSwipe(args: { swipedTabsIndex: number }): void {}
589584

590585
_swipeEndHandler(e: SwipeEndEvent['event']): void {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type { Item, Properties } from '@js/ui/tab_panel';
1616
import { current as currentTheme, isFluent, isMaterialBased } from '@js/ui/themes';
1717
import supportUtils from '@ts/core/utils/m_support';
1818
import type { OptionChanged } from '@ts/core/widget/types';
19-
import MultiView from '@ts/ui/multi_view/m_multi_view';
19+
import MultiView from '@ts/ui/multi_view/multi_view';
2020
import type { TabsProperties } from '@ts/ui/tabs/tabs';
2121
import Tabs, {
2222
TABS_ITEM_TEXT_CLASS,

packages/devextreme/js/ui/accordion.js

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

33
export default Accordion;
44

packages/devextreme/js/ui/multi_view.js

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

33
export default MultiView;
44

packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import $ from 'jquery';
22
import fx from 'common/core/animation/fx';
3-
import { animation, _translator } from '__internal/ui/multi_view/m_multi_view.animation';
3+
import { animation, _translator } from '__internal/ui/multi_view/multi_view.animation';
44
import 'ui/multi_view';
55

66
import 'generic_light.css!';

packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Swipeable from 'common/core/events/gesture/swipeable';
88
import { triggerShownEvent } from 'common/core/events/visibility_change';
99
import $ from 'jquery';
1010
import 'ui/multi_view';
11-
import { animation } from '__internal/ui/multi_view/m_multi_view.animation';
11+
import { animation } from '__internal/ui/multi_view/multi_view.animation';
1212
import keyboardMock from '../../helpers/keyboardMock.js';
1313
import pointerMock from '../../helpers/pointerMock.js';
1414

0 commit comments

Comments
 (0)