mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-28 22:39:11 +02:00
Code Issues Releases Wiki Activity

Skip hidden dropdowns while focusing (#29523)

Browse Source
This commit is contained in:
Jeremy Jackson
2019-10-17 15:01:44 +00:00
committed by XhmikosR
parent 104385c508
commit c1ee395f80
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/dropdown.js
View File

@@ -9,6 +9,7 @@ import {
getjQuery,
getElementFromSelector,
isElement,
isVisible,
makeArray,
noop,
typeCheckConfig
@@ -478,6 +479,7 @@ class Dropdown {
}
const items = makeArray(SelectorEngine.find(Selector.VISIBLE_ITEMS, parent))
.filter(isVisible)
if (!items.length) {
return

9
js/src/util/index.js
View File

@@ -138,9 +138,12 @@ const isVisible = element => {
}
if (element.style && element.parentNode && element.parentNode.style) {
return element.style.display !== 'none' &&
element.parentNode.style.display !== 'none' &&
element.style.visibility !== 'hidden'
const elementStyle = getComputedStyle(element)
const parentNodeStyle = getComputedStyle(element.parentNode)
return elementStyle.display !== 'none' &&
parentNodeStyle.display !== 'none' &&
elementStyle.visibility !== 'hidden'
}
return false