Skip to content

Commit b5e38cf

Browse files
committed
Merge pull request #141 from everdimension/fix-no-tabbable-focus
Fix no tabbable focus
2 parents e8749dd + c844719 commit b5e38cf

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

Diff for: lib/helpers/scopeTab.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ var findTabbable = require('../helpers/tabbable');
22

33
module.exports = function(node, event) {
44
var tabbable = findTabbable(node);
5-
if (!tabbable.length) return;
5+
if (!tabbable.length) {
6+
event.preventDefault();
7+
return;
8+
}
69
var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
710
var leavingFinalTabbable = (
811
finalTabbable === document.activeElement ||

Diff for: specs/Modal.spec.js

+13
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,19 @@ describe('Modal', function () {
102102
unmountModal();
103103
});
104104

105+
it('keeps focus inside the modal when child has no tabbable elements', function() {
106+
var tabPrevented = false;
107+
var modal = renderModal({isOpen: true}, 'hello');
108+
strictEqual(document.activeElement, modal.portal.refs.content);
109+
Simulate.keyDown(modal.portal.refs.content, {
110+
key: "Tab",
111+
keyCode: 9,
112+
which: 9,
113+
preventDefault: function() { tabPrevented = true; }
114+
});
115+
equal(tabPrevented, true);
116+
});
117+
105118
it('supports custom className', function() {
106119
var modal = renderModal({isOpen: true, className: 'myClass'});
107120
notEqual(modal.portal.refs.content.className.indexOf('myClass'), -1);

0 commit comments

Comments
 (0)