mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 05:37:39 +02:00
Code Issues Releases Wiki Activity

Dropdown: Merge display='static' & isNavbar functionality activating static popper with no styles attached

Browse Source
This commit is contained in:
GeoSot
2021-10-10 15:09:57 +03:00
committed by XhmikosR
parent 137b324930
commit fb5921dec4
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/dropdown.js
View File

@@ -133,12 +133,8 @@ class Dropdown extends BaseComponent {
}
const parent = getElementFromSelector(this._element) || this._element.parentNode
// Totally disable Popper for Dropdowns in Navbar
if (this._inNavbar) {
Manipulator.setDataAttribute(this._menu, 'popper', 'none')
} else {
this._createPopper(parent)
}
this._createPopper(parent)
// If this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
@@ -246,13 +242,7 @@ class Dropdown extends BaseComponent {
}
const popperConfig = this._getPopperConfig()
const isDisplayStatic = popperConfig.modifiers.find(modifier => modifier.name === 'applyStyles' && modifier.enabled === false)
this._popper = Popper.createPopper(referenceElement, this._menu, popperConfig)
if (isDisplayStatic) {
Manipulator.setDataAttribute(this._menu, 'popper', 'static')
}
}
_isShown(element = this._element) {
@@ -319,8 +309,9 @@ class Dropdown extends BaseComponent {
}]
}
// Disable Popper if we have a static display
if (this._config.display === 'static') {
// Disable Popper if we have a static display or Dropdown is in Navbar
if (this._inNavbar || this._config.display === 'static') {
Manipulator.setDataAttribute(this._menu, 'popper', 'static') // todo:v6 remove
defaultBsPopperConfig.modifiers = [{
name: 'applyStyles',
enabled: false