Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions js/src/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const CLASS_NAME_HORIZONTAL = 'collapse-horizontal'
const WIDTH = 'width'
const HEIGHT = 'height'

const SELECTOR_ACTIVES = '.collapse.show, .collapse.collapsing'
const SELECTOR_ACTIVES = '.collapse.show, .collapsing'
const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="collapse"]'

const Default = {
Expand All @@ -61,6 +61,7 @@ class Collapse extends BaseComponent {
super(element, config)

this._isTransitioning = false
this._isShowing = false
this._triggerArray = []

const toggleList = SelectorEngine.find(SELECTOR_DATA_TOGGLE)
Expand Down Expand Up @@ -117,12 +118,15 @@ class Collapse extends BaseComponent {

// find active children
if (this._config.parent) {
const currentTriggers = new Set(this._triggerArray)

activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES)
.filter(element => element !== this._element)
.map(element => Collapse.getOrCreateInstance(element, { toggle: false }))
.filter(instance => !instance._triggerArray.some(trigger => currentTriggers.has(trigger)))
}

if (activeChildren.length && activeChildren[0]._isTransitioning) {
if (activeChildren.some(instance => instance._isShowing)) {
return
}

Expand All @@ -144,9 +148,11 @@ class Collapse extends BaseComponent {

this._addAriaAndCollapsedClass(this._triggerArray, true)
this._isTransitioning = true
this._isShowing = true

const complete = () => {
this._isTransitioning = false
this._isShowing = false

this._element.classList.remove(CLASS_NAME_COLLAPSING)
this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
Expand Down
33 changes: 33 additions & 0 deletions js/tests/unit/collapse.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,39 @@ describe('Collapse', () => {
})
})

it('should not open multiple accordion panels when rapidly clicking different triggers', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
'<div id="accordion">',
' <a id="linkTriggerOne" data-bs-toggle="collapse" data-bs-target="#collapseOne" href="#" aria-expanded="false"></a>',
' <a id="linkTriggerTwo" data-bs-toggle="collapse" data-bs-target="#collapseTwo" href="#" aria-expanded="false"></a>',
' <a id="linkTriggerThree" data-bs-toggle="collapse" data-bs-target="#collapseThree" href="#" aria-expanded="false"></a>',
' <div id="collapseOne" class="collapse" data-bs-parent="#accordion"></div>',
' <div id="collapseTwo" class="collapse" data-bs-parent="#accordion"></div>',
' <div id="collapseThree" class="collapse" data-bs-parent="#accordion"></div>',
'</div>'
].join('')

const triggerOne = fixtureEl.querySelector('#linkTriggerOne')
const triggerTwo = fixtureEl.querySelector('#linkTriggerTwo')
const triggerThree = fixtureEl.querySelector('#linkTriggerThree')
const collapseOne = fixtureEl.querySelector('#collapseOne')
const collapseTwo = fixtureEl.querySelector('#collapseTwo')
const collapseThree = fixtureEl.querySelector('#collapseThree')

collapseOne.addEventListener('shown.bs.collapse', () => {
expect(collapseOne).toHaveClass('show')
expect(collapseTwo).not.toHaveClass('show')
expect(collapseThree).not.toHaveClass('show')
resolve()
})

triggerOne.click()
triggerTwo.click()
triggerThree.click()
})
})

it('should collapse accordion children but not nested accordion children', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
Expand Down