aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2021-02-05 14:57:43 -0800
committerXhmikosR <[email protected]>2021-02-09 14:34:27 +0200
commit8f1c8825457399ecdda8d60190bce82d15f97c5d (patch)
tree50e245b1ce4018bf03e237d61be3a6b53bda6895 /js/src
parenta2b56de7077e34f2fa329f2b21db3e8df5368abb (diff)
downloadbootstrap-8f1c8825457399ecdda8d60190bce82d15f97c5d.tar.xz
bootstrap-8f1c8825457399ecdda8d60190bce82d15f97c5d.zip
Remove .dropdown-menu[style] reset and adjust .dropdown-menu-* modifiers
- Removes the &[style] selector that was used for resetting Popper styles - Separate Popper-based alignment from static alignment with `data-bs-popover` attribute that separates the --bs-position and custom right/left properties Co-Authored-By: Rohit Sharma <[email protected]>
Diffstat (limited to 'js/src')
-rw-r--r--js/src/dropdown.js15
1 files changed, 13 insertions, 2 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index a35f55479..378668a6d 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -156,7 +156,9 @@ class Dropdown extends BaseComponent {
}
// Totally disable Popper for Dropdowns in Navbar
- if (!this._inNavbar) {
+ if (this._inNavbar) {
+ Manipulator.setDataAttribute(this._menu, 'popper', 'none')
+ } else {
if (typeof Popper === 'undefined') {
throw new TypeError('Bootstrap\'s dropdowns require Popper (https://popper.js.org)')
}
@@ -176,7 +178,14 @@ class Dropdown extends BaseComponent {
referenceElement = this._config.reference
}
- this._popper = Popper.createPopper(referenceElement, this._menu, this._getPopperConfig())
+ const popperConfig = this._getPopperConfig()
+ const isDisplayStatic = popperConfig.modifiers.find(modifier => modifier.name === 'applyStyles' && modifier.enabled === false)
+
+ if (isDisplayStatic) {
+ Manipulator.setDataAttribute(this._menu, 'popper', 'static')
+ }
+
+ this._popper = Popper.createPopper(referenceElement, this._menu, popperConfig)
}
// If this is a touch-enabled device we add extra
@@ -218,6 +227,7 @@ class Dropdown extends BaseComponent {
this._menu.classList.toggle(CLASS_NAME_SHOW)
this._element.classList.toggle(CLASS_NAME_SHOW)
+ Manipulator.removeDataAttribute(this._menu, 'popper')
EventHandler.trigger(this._element, EVENT_HIDDEN, relatedTarget)
}
@@ -421,6 +431,7 @@ class Dropdown extends BaseComponent {
dropdownMenu.classList.remove(CLASS_NAME_SHOW)
toggles[i].classList.remove(CLASS_NAME_SHOW)
+ Manipulator.removeDataAttribute(dropdownMenu, 'popper')
EventHandler.trigger(toggles[i], EVENT_HIDDEN, relatedTarget)
}
}