2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

fix tests & re-set position

This commit is contained in:
GeoSot
2022-03-03 00:55:27 +02:00
parent f61fab755f
commit 187242150a
2 changed files with 14 additions and 38 deletions
+3 -2
View File
@@ -300,14 +300,15 @@ class Dropdown extends BaseComponent {
name: 'applyCustomStyles',
enabled: true,
phase: 'afterWrite',
fn: () => {
fn: ({ state }) => {
this._menu.style.removeProperty('position')
const initialPosition = getComputedStyle(this._menu).position
if (this._config.display === 'static' || initialPosition === 'static') {
// this._menu.style.position = 'static'
this._menu.style.removeProperty('margin')
this._menu.style.removeProperty('transform')
Manipulator.setDataAttribute(this._menu, 'popper', 'static') // todo:v6 remove?
} else {
this._menu.style.position = state.styles.popper.position
}
}
}]
+11 -36
View File
@@ -1071,7 +1071,7 @@ describe('Dropdown', () => {
})
describe('update', () => {
it('should call Popper and detect navbar on update', () => {
it('should call Popper on update', () => {
fixtureEl.innerHTML = [
'<div class="dropdown">',
' <button class="btn dropdown-toggle" data-bs-toggle="dropdown">Dropdown</button>',
@@ -1089,12 +1089,10 @@ describe('Dropdown', () => {
expect(dropdown._popper).not.toBeNull()
const spyUpdate = spyOn(dropdown._popper, 'update')
const spyDetect = spyOn(dropdown, '_detectNavbar')
dropdown.update()
expect(spyUpdate).toHaveBeenCalled()
expect(spyDetect).toHaveBeenCalled()
})
it('should just detect navbar on update', () => {
@@ -1163,33 +1161,6 @@ describe('Dropdown', () => {
})
})
it('should not use "static" Popper in navbar', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
'<nav class="navbar navbar-expand-md bg-light">',
' <div class="dropdown">',
' <button class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">Dropdown</button>',
' <div class="dropdown-menu">',
' <a class="dropdown-item" href="#">Secondary link</a>',
' </div>',
' </div>',
'</nav>'
].join('')
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdownMenu = fixtureEl.querySelector('.dropdown-menu')
const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('shown.bs.dropdown', () => {
expect(dropdown._popper).not.toBeNull()
expect(dropdownMenu.getAttribute('data-bs-popper')).toEqual('static')
resolve()
})
dropdown.show()
})
})
it('should not collapse the dropdown when clicking a select option nested in the dropdown', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
@@ -1233,13 +1204,13 @@ describe('Dropdown', () => {
})
})
it('should manage bs attribute `data-bs-popper`="static" when dropdown is in navbar', () => {
it('should manage bs attribute `data-bs-popper`="static" when dropdown has position=static', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
'<nav class="navbar navbar-expand-md bg-light">',
' <div class="dropdown">',
' <button class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">Dropdown</button>',
' <div class="dropdown-menu">',
' <div class="dropdown-menu" style="position:static;">',
' <a class="dropdown-item" href="#">Secondary link</a>',
' </div>',
' </div>',
@@ -1251,8 +1222,10 @@ describe('Dropdown', () => {
const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('shown.bs.dropdown', () => {
expect(dropdownMenu.getAttribute('data-bs-popper')).toEqual('static')
dropdown.hide()
setTimeout(() => {
expect(dropdownMenu.getAttribute('data-bs-popper')).toEqual('static')
dropdown.hide()
})
})
btnDropdown.addEventListener('hidden.bs.dropdown', () => {
@@ -1304,8 +1277,10 @@ describe('Dropdown', () => {
const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('shown.bs.dropdown', () => {
expect(dropdownMenu.getAttribute('data-bs-popper')).toEqual('static')
dropdown.hide()
setTimeout(() => {
expect(dropdownMenu.getAttribute('data-bs-popper')).toEqual('static')
dropdown.hide()
})
})
btnDropdown.addEventListener('hidden.bs.dropdown', () => {