Skip to content

Commit

Permalink
avoid preventing input event onclick (#30992)
Browse files Browse the repository at this point in the history
* instead of stopping event if onclick is triggered on input, call toggle method only if its not on checkbox inside a label

* add unit test

* add a dedicated test to ensure click event is forward to label

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
  • Loading branch information
Lausselloic and XhmikosR committed Jun 10, 2020
1 parent ba6d5e8 commit e9f039d
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 3 deletions.
5 changes: 2 additions & 3 deletions js/src/button.js
Expand Up @@ -153,10 +153,9 @@ $(document)
return
}

if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {
event.preventDefault() // work around event sent to label and input
if (initialButton.tagName !== 'LABEL' || inputBtn && inputBtn.type !== 'checkbox') {
Button._jQueryInterface.call($(button), 'toggle')
}
Button._jQueryInterface.call($(button), 'toggle')
}
})
.on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {
Expand Down
40 changes: 40 additions & 0 deletions js/tests/unit/button.js
Expand Up @@ -222,6 +222,46 @@ $(function () {
assert.ok(!$btn2.find('input')[0].checked, 'btn2 is not checked')
})

QUnit.test('should fire click event on input', function (assert) {
assert.expect(1)
var done = assert.async()
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
'<label class="btn btn-primary active">' +
'<input type="checkbox" id="option1"> Option 1' +
'</label>' +
'</div>'
var $group = $(groupHTML).appendTo('#qunit-fixture')

var $btn = $group.children().eq(0)
$group.find('input').on('click', function (e) {
e.preventDefault()
assert.ok(true, 'click event fired')
done()
})

$btn[0].click()
})

QUnit.test('should fire click event on label', function (assert) {
assert.expect(1)
var done = assert.async()
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
'<label class="btn btn-primary active">' +
'<input type="checkbox" id="option1"> Option 1' +
'</label>' +
'</div>'
var $group = $(groupHTML).appendTo('#qunit-fixture')

var $btn = $group.children().eq(0)
$group.find('label').on('click', function (e) {
e.preventDefault()
assert.ok(true, 'click event fired')
done()
})

$btn[0].click()
})

QUnit.test('should not add aria-pressed on labels for radio/checkbox inputs in a data-toggle="buttons" group', function (assert) {
assert.expect(2)
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
Expand Down

0 comments on commit e9f039d

Please sign in to comment.