root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Dropdown: Remove redundant `Space` check

This commit is contained in:
GeoSot 2021-10-10 16:31:39 +03:00 committed by XhmikosR
parent a14a552d83
commit 0686fa00f0
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/dropdown.js
View File

@ -33,7 +33,6 @@ const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api' const DATA_API_KEY = '.data-api'
const ESCAPE_KEY = 'Escape' const ESCAPE_KEY = 'Escape'
const SPACE_KEY = 'Space'
const TAB_KEY = 'Tab' const TAB_KEY = 'Tab'
const ARROW_UP_KEY = 'ArrowUp' const ARROW_UP_KEY = 'ArrowUp'
const ARROW_DOWN_KEY = 'ArrowDown' const ARROW_DOWN_KEY = 'ArrowDown'
@ -399,11 +398,10 @@ class Dropdown extends BaseComponent {
static dataApiKeydownHandler(event) { static dataApiKeydownHandler(event) {
// If not input/textarea: // If not input/textarea:
// - And not a key in REGEXP_KEYDOWN => not a dropdown command // - And not a key in UP | DOWN | ESCAPE => not a dropdown command
// If input/textarea: // If input/textarea:
// - If space key => not a dropdown command // - If key is other than ESCAPE
// - If key is other than escape // - If key is not UP or DOWN => not a dropdown command
// - If key is not up or down => not a dropdown command
// - If trigger inside the menu => not a dropdown command // - If trigger inside the menu => not a dropdown command
const isInput = /input|textarea/i.test(event.target.tagName) const isInput = /input|textarea/i.test(event.target.tagName)
@ -413,10 +411,7 @@ class Dropdown extends BaseComponent {
} }
if (isInput) { if (isInput) {
if (eventKey === SPACE_KEY) { // eslint-disable-next-line unicorn/no-lonely-if
return
}
if (eventKey !== ESCAPE_KEY && (![ARROW_UP_KEY, ARROW_DOWN_KEY].includes(eventKey) || event.target.closest(SELECTOR_MENU))) { if (eventKey !== ESCAPE_KEY && (![ARROW_UP_KEY, ARROW_DOWN_KEY].includes(eventKey) || event.target.closest(SELECTOR_MENU))) {
return return
} }
@ -446,11 +441,6 @@ class Dropdown extends BaseComponent {
if (event.key === ARROW_UP_KEY || event.key === ARROW_DOWN_KEY) { if (event.key === ARROW_UP_KEY || event.key === ARROW_DOWN_KEY) {
instance.show() instance.show()
instance._selectMenuItem(event) instance._selectMenuItem(event)
return
}
if (!isActive || event.key === SPACE_KEY) {
Dropdown.clearMenus()
} }
} }
} }