Skip to content

Commit dd07c1f

Browse files
GeoSotXhmikosR
authored andcommitted
Dropdown: clearMenus is always an event callback
1 parent f71640f commit dd07c1f

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

js/src/dropdown.js

+16-18
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class Dropdown extends BaseComponent {
351351
}
352352

353353
static clearMenus(event) {
354-
if (event && (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY))) {
354+
if (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY)) {
355355
return
356356
}
357357

@@ -371,25 +371,23 @@ class Dropdown extends BaseComponent {
371371
relatedTarget: context._element
372372
}
373373

374-
if (event) {
375-
const composedPath = event.composedPath()
376-
const isMenuTarget = composedPath.includes(context._menu)
377-
if (
378-
composedPath.includes(context._element) ||
379-
(context._config.autoClose === 'inside' && !isMenuTarget) ||
380-
(context._config.autoClose === 'outside' && isMenuTarget)
381-
) {
382-
continue
383-
}
374+
const composedPath = event.composedPath()
375+
const isMenuTarget = composedPath.includes(context._menu)
376+
if (
377+
composedPath.includes(context._element) ||
378+
(context._config.autoClose === 'inside' && !isMenuTarget) ||
379+
(context._config.autoClose === 'outside' && isMenuTarget)
380+
) {
381+
continue
382+
}
384383

385-
// Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu
386-
if (context._menu.contains(event.target) && ((event.type === 'keyup' && event.key === TAB_KEY) || /input|select|option|textarea|form/i.test(event.target.tagName))) {
387-
continue
388-
}
384+
// Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu
385+
if (context._menu.contains(event.target) && ((event.type === 'keyup' && event.key === TAB_KEY) || /input|select|option|textarea|form/i.test(event.target.tagName))) {
386+
continue
387+
}
389388

390-
if (event.type === 'click') {
391-
relatedTarget.clickEvent = event
392-
}
389+
if (event.type === 'click') {
390+
relatedTarget.clickEvent = event
393391
}
394392

395393
context._completeHide(relatedTarget)

0 commit comments

Comments
 (0)