Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix event propagation from inactive and disabled dropdowns (#30510) #30511

Merged
merged 1 commit into from Apr 7, 2020
Merged

Fix event propagation from inactive and disabled dropdowns (#30510) #30511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/src/dropdown.js
View file
Open in desktop
Expand Up @@ -452,9 +452,6 @@ class Dropdown {
return
}

event.preventDefault()
event.stopPropagation()

if (this.disabled || $(this).hasClass(CLASS_NAME_DISABLED)) {
return
}
Expand All @@ -466,6 +463,9 @@ class Dropdown {
return
}

event.preventDefault()
event.stopPropagation()

if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
if (event.which === ESCAPE_KEYCODE) {
const toggle = parent.querySelector(SELECTOR_DATA_TOGGLE)
Expand Down
64 changes: 64 additions & 0 deletions js/tests/unit/dropdown.js
View file
Open in desktop
Expand Up @@ -1020,6 +1020,70 @@ $(function () {
$textarea.trigger('click')
})

QUnit.test('should not stop key event propagation when dropdown is disabled', function (assert) {
assert.expect(1)
var done = assert.async()

var dropdownHTML = '<div class="tabs">' +
'<div class="dropdown">' +
'<a href="#" class="dropdown-toggle" id="toggle" data-toggle="dropdown" disabled>Dropdown</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" id="item" href="#">Menu item</a>' +
'</div>' +
'</div>'

var $dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()

var $body = $('body')

$(document).on('keydown', function () {
$body.addClass('event-handled')
})

// Key escape
$dropdown.trigger('focus').trigger($.Event('keydown', {
which: 27
}))

assert.ok($body.hasClass('event-handled'), 'ESC key event was propagated')
done()
})

QUnit.test('should not stop ESC key event propagation when dropdown is not active', function (assert) {
assert.expect(1)
var done = assert.async()

var dropdownHTML = '<div class="tabs">' +
'<div class="dropdown">' +
'<a href="#" class="dropdown-toggle" id="toggle" data-toggle="dropdown">Dropdown</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" id="item" href="#">Menu item</a>' +
'</div>' +
'</div>'

var $dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()

var $body = $('body')

$(document).on('keydown', function () {
$body.addClass('event-handled')
})

// Key escape
$dropdown.trigger('focus').trigger($.Event('keydown', {
which: 27
}))

assert.ok($body.hasClass('event-handled'), 'ESC key event was propagated')
done()
})

QUnit.test('should not use Popper.js if display set to static', function (assert) {
assert.expect(1)
var dropdownHTML =
Expand Down