Skip to content

Commit 1caa3e0

Browse files
vorobeyAndrei Vorobev
andauthored
Autocomplete, DropdownButton, DropdownBox: remove m prefix (#33923) (#33925)
Co-authored-by: Andrei Vorobev <andrei.vorobev@devexpress.com>
1 parent e6bc625 commit 1caa3e0

7 files changed

Lines changed: 21 additions & 14 deletions

File tree

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@
645645
/packages/devextreme/js/ui/autocomplete.d.ts @DevExpress/devextreme-editors
646646
/packages/devextreme/js/ui/autocomplete_types.d.ts @DevExpress/devextreme-editors
647647

648-
/packages/devextreme/js/__internal/ui/m_autocomplete.ts @DevExpress/devextreme-editors
648+
/packages/devextreme/js/__internal/ui/autocomplete.ts @DevExpress/devextreme-editors
649649

650650
/e2e/testcafe-devextreme/tests/accessibility/autocomplete/** @DevExpress/devextreme-editors
651651

@@ -736,7 +736,7 @@
736736
/packages/devextreme/js/ui/drop_down_box.d.ts @DevExpress/devextreme-editors
737737
/packages/devextreme/js/ui/drop_down_box_types.d.ts @DevExpress/devextreme-editors
738738

739-
/packages/devextreme/js/__internal/ui/m_drop_down_box.ts @DevExpress/devextreme-editors
739+
/packages/devextreme/js/__internal/ui/drop_down_box.ts @DevExpress/devextreme-editors
740740

741741
/e2e/testcafe-devextreme/tests/accessibility/dropDownBox/** @DevExpress/devextreme-editors
742742

@@ -746,7 +746,7 @@
746746
/packages/devextreme/js/ui/drop_down_button.d.ts @DevExpress/devextreme-editors
747747
/packages/devextreme/js/ui/drop_down_button_types.d.ts @DevExpress/devextreme-editors
748748

749-
/packages/devextreme/js/__internal/ui/m_drop_down_button.ts @DevExpress/devextreme-editors
749+
/packages/devextreme/js/__internal/ui/drop_down_button.ts @DevExpress/devextreme-editors
750750

751751
/packages/devextreme-scss/scss/widgets/**/dropDownButton/** @DevExpress/devextreme-editors
752752

File renamed without changes.

packages/devextreme/js/__internal/ui/m_drop_down_box.ts renamed to packages/devextreme/js/__internal/ui/drop_down_box.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class DropDownBox<
181181
const selectedItem = grep(
182182
this.option('items') || [],
183183
// @ts-expect-error DataExpressionMixin must be typed
184-
(item) => this._isValueEquals(this._valueGetter(item), value),
184+
(item) => this._isValueEquals(this._valueGetter(item), value) as boolean,
185185
false,
186186
)[0];
187187

@@ -310,7 +310,7 @@ class DropDownBox<
310310
}),
311311
_ignoreFunctionValueDeprecation: true,
312312
// @ts-expect-error ts-error
313-
maxHeight: function () {
313+
maxHeight: function (): number | undefined {
314314
const popupLocation = this._popupPosition?.v.location;
315315

316316
return getElementMaxHeightByWindow(this.$element(), popupLocation);

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,30 +519,33 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
519519
};
520520
}
521521

522-
_upDownKeyHandler() {
522+
_upDownKeyHandler(): boolean {
523523
if (this._popup?.option('visible') && this._list) {
524524
this._list.focus();
525525
} else {
526+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
526527
this.open();
527528
}
528529

529530
return true;
530531
}
531532

532-
_escHandler() {
533+
_escHandler(): boolean {
534+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
533535
this.close();
534536
this._buttonGroup.focus();
535537

536538
return true;
537539
}
538540

539-
_tabHandler() {
541+
_tabHandler(): boolean {
542+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
540543
this.close();
541544

542545
return true;
543546
}
544547

545-
_renderPopup() {
548+
_renderPopup(): void {
546549
const $popup = $('<div>');
547550
this.$element().append($popup);
548551
this._popup = this._createComponent($popup, Popup, this._popupOptions());
@@ -633,7 +636,11 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
633636
this.$element().append($buttonGroup);
634637
}
635638

636-
this._buttonGroup = this._createComponent($buttonGroup, ButtonGroup, this._getButtonGroupOptions());
639+
this._buttonGroup = this._createComponent(
640+
$buttonGroup,
641+
ButtonGroup,
642+
this._getButtonGroupOptions(),
643+
);
637644

638645
this._buttonGroup.registerKeyHandler('downArrow', this._upDownKeyHandler.bind(this));
639646
this._buttonGroup.registerKeyHandler('tab', this._tabHandler.bind(this));
@@ -840,7 +847,7 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
840847
case 'showArrowIcon':
841848
this._updateArrowClass();
842849
this._renderButtonGroup();
843-
this._popup && this._popup.repaint();
850+
this._popup?.repaint();
844851
break;
845852
case 'width':
846853
case 'height':

packages/devextreme/js/ui/autocomplete.js

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

33
export default Autocomplete;
44

packages/devextreme/js/ui/drop_down_box.js

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

33
export default DropDownBox;
44

packages/devextreme/js/ui/drop_down_button.js

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

33
export default DropDownButton;
44

0 commit comments

Comments
 (0)