From 6fe72c6de8c9289d1bcd86e0b2cc231789d1aaf4 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Sat, 21 Jan 2017 07:17:34 +0200 Subject: [PATCH] Dropdown handle keydown on input and textarea. --- js/src/dropdown.js | 26 ++++++- js/tests/unit/dropdown.js | 146 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 165 insertions(+), 7 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index e3331ac183..85899d6fcd 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -62,6 +62,11 @@ const Dropdown = (($) => { const Selector = { DATA_TOGGLE : '[data-toggle="dropdown"]', FORM_CHILD : '.dropdown form', +<<<<<<< HEAD +======= + ROLE_MENU : '[role="menu"]', + ROLE_LISTBOX : '[role="listbox"]', +>>>>>>> Dropdown handle keydown on input and textarea MENU : '.dropdown-menu', NAVBAR_NAV : '.navbar-nav', VISIBLE_ITEMS : '.dropdown-menu .dropdown-item:not(.disabled)' @@ -357,8 +362,17 @@ const Dropdown = (($) => { } static _dataApiKeydownHandler(event) { - if (!REGEXP_KEYDOWN.test(event.which) || /button/i.test(event.target.tagName) && event.which === SPACE_KEYCODE || - /input|textarea/i.test(event.target.tagName)) { + // If not input/textarea: + // - And not a key in REGEXP_KEYDOWN => not a dropdown command + // If input/textarea: + // - If space key => not a dropdown command + // - If key is other than excape + // - If key is not up or down => not a dropdown command + // - If trigger inside the menu => not a dropdown command + if (/input|textarea/i.test(event.target.tagName) ? + event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && + (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || + $(event.target).closest(Selector.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) { return } @@ -418,6 +432,7 @@ const Dropdown = (($) => { $(document) .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler) +<<<<<<< HEAD .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler) .on(`${Event.CLICK_DATA_API} ${Event.KEYUP_DATA_API}`, Dropdown._clearMenus) .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { @@ -425,6 +440,13 @@ const Dropdown = (($) => { event.stopPropagation() Dropdown._jQueryInterface.call($(this), 'toggle') }) +======= + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler) + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler) + .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler) + .on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus) + .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle) +>>>>>>> Dropdown handle keydown on input and textarea .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => { e.stopPropagation() }) diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index 0b808cc487..d401db0b5e 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -457,8 +457,8 @@ $(function () { $dropdown.trigger('click') }) - QUnit.test('should ignore keyboard events within s and ' + + '' + + '' + + '' + var $dropdown = $(dropdownHTML) + .appendTo('#qunit-fixture') + .find('[data-toggle="dropdown"]') + .bootstrapDropdown() + + var $textarea = $('#textarea') + + $dropdown + .parent('.dropdown') + .one('shown.bs.dropdown', function () { + assert.ok(true, 'shown was fired') + + // Key space + $textarea.trigger('focus').trigger($.Event('keydown', { which: 32 })) + assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown') + assert.ok($(document.activeElement).is($textarea), 'textarea is still focused') + + // Key escape + $textarea.trigger('focus').trigger($.Event('keydown', { which: 27 })) + assert.ok(!$dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is not shown') + + $dropdown + .parent('.dropdown') + .one('shown.bs.dropdown', function () { + + // Key down + $textarea.trigger('focus').trigger($.Event('keydown', { which: 40 })) + assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused') + + $dropdown + .parent('.dropdown') + .one('shown.bs.dropdown', function () { + + // Key up + $textarea.trigger('focus').trigger($.Event('keydown', { which: 38 })) + assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused') + done() + }).bootstrapDropdown('toggle') + $textarea.trigger('click') + }) + $textarea.trigger('click') + }) + $textarea.trigger('click') + }) + QUnit.test('should skip disabled element when using keyboard navigation', function (assert) { assert.expect(2) var done = assert.async()