mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
collapse: prevent url change if A
nested tag is clicked (#32438)
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
This commit is contained in:
parent
2d46e47464
commit
59cd71631e
2 changed files with 24 additions and 1 deletions
|
@ -371,7 +371,7 @@ class Collapse extends BaseComponent {
|
||||||
|
|
||||||
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
|
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
|
||||||
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
|
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
|
||||||
if (event.target.tagName === 'A') {
|
if (event.target.tagName === 'A' || (event.delegateTarget && event.delegateTarget.tagName === 'A')) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -374,6 +374,29 @@ describe('Collapse', () => {
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('data-api', () => {
|
describe('data-api', () => {
|
||||||
|
it('should prevent url change if click on nested elements', done => {
|
||||||
|
fixtureEl.innerHTML = [
|
||||||
|
'<a role="button" data-bs-toggle="collapse" class="collapsed" href="#collapse">',
|
||||||
|
' <span id="nested"></span>',
|
||||||
|
'</a>',
|
||||||
|
'<div id="collapse" class="collapse"></div>'
|
||||||
|
].join('')
|
||||||
|
|
||||||
|
const triggerEl = fixtureEl.querySelector('a')
|
||||||
|
const nestedTriggerEl = fixtureEl.querySelector('#nested')
|
||||||
|
|
||||||
|
spyOn(Event.prototype, 'preventDefault').and.callThrough()
|
||||||
|
|
||||||
|
triggerEl.addEventListener('click', event => {
|
||||||
|
expect(event.target.isEqualNode(nestedTriggerEl)).toEqual(true)
|
||||||
|
expect(event.delegateTarget.isEqualNode(triggerEl)).toEqual(true)
|
||||||
|
expect(Event.prototype.preventDefault).toHaveBeenCalled()
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
|
||||||
|
nestedTriggerEl.click()
|
||||||
|
})
|
||||||
|
|
||||||
it('should show multiple collapsed elements', done => {
|
it('should show multiple collapsed elements', done => {
|
||||||
fixtureEl.innerHTML = [
|
fixtureEl.innerHTML = [
|
||||||
'<a role="button" data-bs-toggle="collapse" class="collapsed" href=".multi"></a>',
|
'<a role="button" data-bs-toggle="collapse" class="collapsed" href=".multi"></a>',
|
||||||
|
|
Loading…
Add table
Reference in a new issue