From f7798d73961041809a4d0046478fa12fc13ef6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laussel=20LO=C3=AFc?= <loic.laussel@orange.com>
Date: Tue, 9 Jun 2020 16:16:40 +0200
Subject: [PATCH 1/3] instead of stopping event if onclick is triggered on
 input, call toggle method only if its not on checkbox inside a label

---
 js/src/button.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/button.js b/js/src/button.js
index 0da25451190d..08654d558e46 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -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) => {

From 1dde13206b2341cd80edef6dd7ec68f367ad1d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laussel=20LO=C3=AFc?= <loic.laussel@orange.com>
Date: Tue, 9 Jun 2020 17:28:34 +0200
Subject: [PATCH 2/3] add unit test

---
 js/tests/unit/button.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index e92d229e6d0c..358c2fc68ce4 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -222,6 +222,26 @@ $(function () {
     assert.ok(!$btn2.find('input')[0].checked, 'btn2 is not checked')
   })
 
+  QUnit.test('should fire click event on input and 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('input').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">' +

From 5f2c29cd8b58d7a504258661e2202f683e710d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laussel=20LO=C3=AFc?= <loic.laussel@orange.com>
Date: Tue, 9 Jun 2020 17:50:25 +0200
Subject: [PATCH 3/3] add a dedicated test to ensure click event is forward to
 label

---
 js/tests/unit/button.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 358c2fc68ce4..2adffedd9fe6 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -222,7 +222,7 @@ $(function () {
     assert.ok(!$btn2.find('input')[0].checked, 'btn2 is not checked')
   })
 
-  QUnit.test('should fire click event on input and label', function (assert) {
+  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">' +
@@ -242,6 +242,26 @@ $(function () {
     $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">' +