From c1ee395f80c05de8317588b07f34a65c5b95c42c Mon Sep 17 00:00:00 2001
From: Jeremy Jackson <git@jeremyvii.com>
Date: Thu, 17 Oct 2019 15:01:44 +0000
Subject: Skip hidden dropdowns while focusing (#29523)

---
 js/tests/unit/dropdown.spec.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'js/tests')

diff --git a/js/tests/unit/dropdown.spec.js b/js/tests/unit/dropdown.spec.js
index 0046cf680..7491e38c0 100644
--- a/js/tests/unit/dropdown.spec.js
+++ b/js/tests/unit/dropdown.spec.js
@@ -1292,6 +1292,43 @@ describe('Dropdown', () => {
       triggerDropdown.click()
     })
 
+    it('should skip hidden element when using keyboard navigation', done => {
+      fixtureEl.innerHTML = [
+        '<style>',
+        '  .d-none {',
+        '    display: none;',
+        '  }',
+        '</style>',
+        '<div class="dropdown">',
+        '  <button href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>',
+        '  <div class="dropdown-menu">',
+        '    <button class="dropdown-item d-none" type="button">Hidden button by class</button>',
+        '    <a class="dropdown-item" href="#sub1" style="display: none">Hidden link</a>',
+        '    <a class="dropdown-item" href="#sub1" style="visibility: hidden">Hidden link</a>',
+        '    <a id="item1" class="dropdown-item" href="#">Another link</a>',
+        '  </div>',
+        '</div>'
+      ].join('')
+
+      const triggerDropdown = fixtureEl.querySelector('[data-toggle="dropdown"]')
+      const dropdown = fixtureEl.querySelector('.dropdown')
+
+      dropdown.addEventListener('shown.bs.dropdown', () => {
+        const keyDown = createEvent('keydown')
+        keyDown.which = 40
+
+        triggerDropdown.dispatchEvent(keyDown)
+
+        expect(document.activeElement.classList.contains('d-none')).toEqual(false, '.d-none not focused')
+        expect(document.activeElement.style.display === 'none').toEqual(false, '"display: none" not focused')
+        expect(document.activeElement.style.visibility === 'hidden').toEqual(false, '"visibility: hidden" not focused')
+
+        done()
+      })
+
+      triggerDropdown.click()
+    })
+
     it('should focus next/previous element when using keyboard navigation', done => {
       fixtureEl.innerHTML = [
         '<div class="dropdown">',
-- 
cgit v1.2.3