Skip to content

Commit c348f55

Browse files
Merge branch '26_1' into 26_1_WIP_check_ng22
2 parents 322bc8f + 6930000 commit c348f55

22 files changed

Lines changed: 25 additions & 43 deletions

File tree

packages/devextreme/js/__internal/scheduler/appointment_popup/form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type { Properties as SwitchProperties } from '@js/ui/switch';
2424
import type { Properties as TextAreaProperties } from '@js/ui/text_area';
2525
import { current, isFluent } from '@js/ui/themes';
2626
import { dateSerialization } from '@ts/core/utils/m_date_serialization';
27-
import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
27+
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
2828
import type Popup from '@ts/ui/popup/m_popup';
2929

3030
import timeZoneUtils from '../m_utils_time_zone';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
55
import type { Properties } from '@js/ui/color_box';
66
import type { OptionChanged } from '@ts/core/widget/types';
77
import Color from '@ts/m_color';
8-
import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
8+
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
99
import type { ValueChangedEvent } from '@ts/ui/editor/editor';
1010

1111
import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_box/date_box.base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type {
2121
} from '@js/ui/date_box';
2222
import type { ToolbarItem } from '@js/ui/popup';
2323
import type { OptionChanged } from '@ts/core/widget/types';
24-
import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
24+
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
2525
import type { ValueChangedEvent } from '@ts/ui/editor/editor';
2626

2727
import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { DxEvent } from '@js/events';
1111
import type { Format } from '@js/localization';
1212
import type { ItemClickEvent } from '@js/ui/list';
1313
import { getGlobalFormatByDataType } from '@ts/core/m_global_format_config';
14-
import { getSizeValue } from '@ts/ui/drop_down_editor/m_utils';
14+
import { getSizeValue } from '@ts/ui/drop_down_editor/utils';
1515
import List from '@ts/ui/list/list.edit.search';
1616

1717
import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { each } from '@js/core/utils/iterator';
1717
import type { Properties } from '@js/ui/date_range_box';
1818
import Editor from '@js/ui/editor/editor';
1919
import { current, isFluent, isMaterial } from '@js/ui/themes';
20-
import DropDownButton from '@ts/ui/drop_down_editor/m_drop_down_button';
20+
import DropDownButton from '@ts/ui/drop_down_editor/drop_down_button';
2121
import ClearButton from '@ts/ui/text_box/text_editor.clear';
2222
import TextEditorButtonCollection from '@ts/ui/text_box/texteditor_button_collection/index';
2323

packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import Button from '@js/ui/button';
99

1010
import type TextEditorBase from '../text_box/text_editor.base';
1111
import TextEditorButton from '../text_box/texteditor_button_collection/button';
12-
import type DropDownEditor from './m_drop_down_editor';
13-
import type { DropDownEditorProperties } from './m_drop_down_editor';
12+
import type DropDownEditor from './drop_down_editor';
13+
import type { DropDownEditorProperties } from './drop_down_editor';
1414

1515
const DROP_DOWN_EDITOR_BUTTON_CLASS = 'dx-dropdowneditor-button';
1616
const DROP_DOWN_EDITOR_BUTTON_VISIBLE = 'dx-dropdowneditor-button-visible';
@@ -125,7 +125,6 @@ export default class DropDownButton extends TextEditorButton {
125125
}
126126

127127
// TODO: get rid of it
128-
// eslint-disable-next-line class-methods-use-this
129128
_legacyRender(
130129
$editor?: dxElementWrapper,
131130
$element?: dxElementWrapper,

packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import TextBox from '@ts/ui/text_box/text_box';
4141

4242
import type Popover from '../popover/m_popover';
4343
import type { TextEditorButtonInfo } from '../text_box/texteditor_button_collection/index';
44-
import DropDownButton from './m_drop_down_button';
45-
import { getElementWidth } from './m_utils';
44+
import DropDownButton from './drop_down_button';
45+
import { getElementWidth } from './utils';
4646

4747
export const DROP_DOWN_EDITOR_CLASS = 'dx-dropdowneditor';
4848
const DROP_DOWN_EDITOR_INPUT_WRAPPER = 'dx-dropdowneditor-input-wrapper';
@@ -261,12 +261,10 @@ class DropDownEditor<
261261
};
262262
}
263263

264-
// eslint-disable-next-line class-methods-use-this
265264
_useTemplates(): boolean {
266265
return true;
267266
}
268267

269-
// eslint-disable-next-line class-methods-use-this
270268
_getDefaultPopupPosition(isRtlEnabled?: boolean): PositionConfig {
271269
const position = getDefaultAlignment(isRtlEnabled);
272270

@@ -377,17 +375,14 @@ class DropDownEditor<
377375
.eq(0);
378376
}
379377

380-
// eslint-disable-next-line class-methods-use-this
381378
_getAriaHasPopup(): string {
382379
return 'true';
383380
}
384381

385-
// eslint-disable-next-line class-methods-use-this
386382
_getAriaAutocomplete(): string {
387383
return 'none';
388384
}
389385

390-
// eslint-disable-next-line class-methods-use-this
391386
_getAriaRole(): string {
392387
return 'combobox';
393388
}
@@ -818,7 +813,6 @@ class DropDownEditor<
818813
this.setAria('label', OVERLAY_CONTENT_LABEL, $overlayContent);
819814
}
820815

821-
// eslint-disable-next-line class-methods-use-this
822816
_renderPopupContent(): void {}
823817

824818
_renderPopup(): void {
@@ -882,7 +876,6 @@ class DropDownEditor<
882876
this.setAria('id', this._popupContentId, $popupContent);
883877
}
884878

885-
// eslint-disable-next-line class-methods-use-this
886879
_contentReadyHandler(): void {}
887880

888881
_popupConfig(): PopupProperties {
@@ -925,7 +918,6 @@ class DropDownEditor<
925918
return config;
926919
}
927920

928-
// eslint-disable-next-line class-methods-use-this
929921
_popupInitializedHandler(): void {}
930922

931923
_getPopupInitializedHandler(): (e: PopupInitializedEvent) => void {
@@ -983,7 +975,6 @@ class DropDownEditor<
983975
}
984976
}
985977

986-
// eslint-disable-next-line class-methods-use-this
987978
_popupShowingHandler(): void {}
988979

989980
_popupHidingHandler(): void {
@@ -1171,7 +1162,6 @@ class DropDownEditor<
11711162
return super._getSubmitElement();
11721163
}
11731164

1174-
// eslint-disable-next-line class-methods-use-this
11751165
_shouldLogFieldTemplateDeprecationWarning(): boolean {
11761166
return false;
11771167
}

packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_list.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import errors from '@js/ui/widget/ui.errors';
3131
import type { OptionChanged } from '@ts/core/widget/types';
3232
import { getDataSourceOptions } from '@ts/data/data_converter/grouped';
3333
import type DataController from '@ts/ui/collection/m_data_controller';
34-
import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
34+
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
3535
import type { ListBaseProperties } from '@ts/ui/list/list.base';
3636
import List from '@ts/ui/list/list.edit.search';
3737

@@ -252,7 +252,6 @@ class DropDownList<
252252
}
253253
}
254254

255-
// eslint-disable-next-line class-methods-use-this
256255
_fitIntoRange(value: number, start: number, end: number): number {
257256
if (value > end) {
258257
return start;
@@ -312,7 +311,6 @@ class DropDownList<
312311
}
313312
}
314313

315-
// eslint-disable-next-line class-methods-use-this
316314
_popupWrapperClass(): string {
317315
return DROPDOWNLIST_POPUP_WRAPPER_CLASS;
318316
}
@@ -576,7 +574,6 @@ class DropDownList<
576574
this.setAria('owns', this._popup && this._popupContentId);
577575
}
578576

579-
// eslint-disable-next-line class-methods-use-this
580577
_getAriaHasPopup(): string {
581578
return 'listbox';
582579
}
@@ -593,7 +590,6 @@ class DropDownList<
593590
return Boolean(dataSource) !== this._needPassDataSourceToList();
594591
}
595592

596-
// eslint-disable-next-line class-methods-use-this
597593
_isDesktopDevice(): boolean {
598594
return devices.real().deviceType === 'desktop';
599595
}
@@ -646,7 +642,6 @@ class DropDownList<
646642
return options;
647643
}
648644

649-
// eslint-disable-next-line class-methods-use-this
650645
_canListHaveFocus(): boolean {
651646
return false;
652647
}
@@ -655,7 +650,6 @@ class DropDownList<
655650
return this._needPassDataSourceToList() ? this._dataSource : null;
656651
}
657652

658-
// eslint-disable-next-line class-methods-use-this
659653
_dataSourceOptions(): Partial<DataSourceOptions<Item>> {
660654
return {
661655
paginate: false,
@@ -675,7 +669,6 @@ class DropDownList<
675669
return dataSource;
676670
}
677671

678-
// eslint-disable-next-line class-methods-use-this
679672
_dataSourceFromUrlLoadMode(): string {
680673
return 'raw';
681674
}
@@ -712,7 +705,7 @@ class DropDownList<
712705
this._itemClickAction(e);
713706
}
714707

715-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
708+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
716709
_listItemClickHandler(e?: ItemClickEvent<Item>): void { }
717710

718711
_setListDataSource(): void {

packages/devextreme/js/__internal/ui/drop_down_editor/m_utils.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/utils.ts

File renamed without changes.

packages/devextreme/js/__internal/ui/form/form.layout_manager.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type {
1515
import type {
1616
FormItemComponent, FormLabelMode, LabelLocation, SimpleItem,
1717
} from '@js/ui/form';
18-
import type { DropDownEditorProperties } from '@ts/ui/drop_down_editor/m_drop_down_editor';
18+
import type { DropDownEditorProperties } from '@ts/ui/drop_down_editor/drop_down_editor';
1919
import type { EditorProperties } from '@ts/ui/editor/editor';
2020
import type Editor from '@ts/ui/editor/editor';
2121
import type { LabelOptions } from '@ts/ui/form/components/label';

0 commit comments

Comments
 (0)