mirror of https://github.com/twbs/bootstrap.git
Merge 1f0891ad05
into 4c98145482
This commit is contained in:
commit
c6c31aadd4
|
@ -401,12 +401,13 @@ class Dropdown extends BaseComponent {
|
||||||
const isInput = /input|textarea/i.test(event.target.tagName)
|
const isInput = /input|textarea/i.test(event.target.tagName)
|
||||||
const isEscapeEvent = event.key === ESCAPE_KEY
|
const isEscapeEvent = event.key === ESCAPE_KEY
|
||||||
const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key)
|
const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key)
|
||||||
|
const isContentEditable = event.target.closest('[contenteditable]') !== null
|
||||||
|
|
||||||
if (!isUpOrDownEvent && !isEscapeEvent) {
|
if (!isUpOrDownEvent && !isEscapeEvent) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isInput && !isEscapeEvent) {
|
if ((isInput || isContentEditable) && !isEscapeEvent) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue