Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@
/packages/devextreme/js/ui/autocomplete.d.ts @DevExpress/devextreme-editors
/packages/devextreme/js/ui/autocomplete_types.d.ts @DevExpress/devextreme-editors

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

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

Expand Down Expand Up @@ -736,7 +736,7 @@
/packages/devextreme/js/ui/drop_down_box.d.ts @DevExpress/devextreme-editors
/packages/devextreme/js/ui/drop_down_box_types.d.ts @DevExpress/devextreme-editors

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

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

Expand All @@ -746,7 +746,7 @@
/packages/devextreme/js/ui/drop_down_button.d.ts @DevExpress/devextreme-editors
/packages/devextreme/js/ui/drop_down_button_types.d.ts @DevExpress/devextreme-editors

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class DropDownBox<
const selectedItem = grep(
this.option('items') || [],
// @ts-expect-error DataExpressionMixin must be typed
(item) => this._isValueEquals(this._valueGetter(item), value),
(item) => this._isValueEquals(this._valueGetter(item), value) as boolean,
false,
)[0];

Expand Down Expand Up @@ -310,7 +310,7 @@ class DropDownBox<
}),
_ignoreFunctionValueDeprecation: true,
// @ts-expect-error ts-error
maxHeight: function () {
maxHeight: function (): number | undefined {
const popupLocation = this._popupPosition?.v.location;

return getElementMaxHeightByWindow(this.$element(), popupLocation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -519,30 +519,33 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
};
}

_upDownKeyHandler() {
_upDownKeyHandler(): boolean {
if (this._popup?.option('visible') && this._list) {
this._list.focus();
} else {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.open();
}

return true;
}

_escHandler() {
_escHandler(): boolean {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.close();
this._buttonGroup.focus();

return true;
}

_tabHandler() {
_tabHandler(): boolean {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.close();

return true;
}

_renderPopup() {
_renderPopup(): void {
const $popup = $('<div>');
this.$element().append($popup);
this._popup = this._createComponent($popup, Popup, this._popupOptions());
Expand Down Expand Up @@ -633,7 +636,11 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
this.$element().append($buttonGroup);
}

this._buttonGroup = this._createComponent($buttonGroup, ButtonGroup, this._getButtonGroupOptions());
this._buttonGroup = this._createComponent(
$buttonGroup,
ButtonGroup,
this._getButtonGroupOptions(),
);

this._buttonGroup.registerKeyHandler('downArrow', this._upDownKeyHandler.bind(this));
this._buttonGroup.registerKeyHandler('tab', this._tabHandler.bind(this));
Expand Down Expand Up @@ -840,7 +847,7 @@ class DropDownButton extends Widget<DropDownButtonProperties> {
case 'showArrowIcon':
this._updateArrowClass();
this._renderButtonGroup();
this._popup && this._popup.repaint();
this._popup?.repaint();
break;
case 'width':
case 'height':
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/ui/autocomplete.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Autocomplete from '../__internal/ui/m_autocomplete';
import Autocomplete from '../__internal/ui/autocomplete';

export default Autocomplete;

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/ui/drop_down_box.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DropDownBox from '../__internal/ui/m_drop_down_box';
import DropDownBox from '../__internal/ui/drop_down_box';

export default DropDownBox;

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/ui/drop_down_button.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DropDownButton from '../__internal/ui/m_drop_down_button';
import DropDownButton from '../__internal/ui/drop_down_button';

export default DropDownButton;

Expand Down
Loading