Collapse - do not prevent event for input and textarea

2 files changed, 19 insertions, 1 deletions

diff --git a/js/src/collapse.js b/js/src/collapse.js
index 13c44502c..6f09fcadd 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -363,7 +363,9 @@ const Collapse = (($) => {
    */
 
   $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
-    event.preventDefault()
+    if (/input|textarea/i.test(event.target.tagName)) {
+      event.preventDefault()
+    }
 
     const target = Collapse._getTargetFromElement(this)
     const data   = $(target).data(DATA_KEY)
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index a7bcaad9c..01bc5adb9 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -513,4 +513,20 @@ $(function () {
     })
     $target.trigger($.Event('click'))
   })
+
+  QUnit.test('should not prevent event for input', function (assert) {
+    assert.expect(2)
+    var done = assert.async()
+    var $target = $('<input type="checkbox" data-toggle="collapse" data-target="#collapsediv1" />').appendTo('#qunit-fixture')
+
+    $('<div id="collapsediv1"/>')
+      .appendTo('#qunit-fixture')
+      .on('shown.bs.collapse', function () {
+        assert.ok($target.attr('aria-expanded') === 'true')
+        assert.ok($target.prop('checked'))
+        done()
+      })
+
+    $target.trigger($.Event('click'))
+  })
 })