Skip to content

Commit 24438a7

Browse files
committed
Check computed visibility in addition to :visible
Correct assertions according to fixed condition
1 parent 1f49e53 commit 24438a7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tests/unit/core/selector.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ test( "focusable - hidden styles", function() {
130130
isNotFocusable( "#displayNoneAncestor-input", "input, display: none parent" );
131131
isNotFocusable( "#displayNoneAncestor-span", "span with tabindex, display: none parent" );
132132

133-
isFocusable( "#visibilityHiddenAncestor-input", "input, visibility: hidden parent" );
134-
isFocusable( "#visibilityHiddenAncestor-span", "span with tabindex, visibility: hidden parent" );
133+
isNotFocusable( "#visibilityHiddenAncestor-input", "input, visibility: hidden parent" );
134+
isNotFocusable( "#visibilityHiddenAncestor-span", "span with tabindex, visibility: hidden parent" );
135135

136136
isNotFocusable( "#displayNone-input", "input, display: none" );
137-
isFocusable( "#visibilityHidden-input", "input, visibility: hidden" );
137+
isNotFocusable( "#visibilityHidden-input", "input, visibility: hidden" );
138138

139139
isNotFocusable( "#displayNone-span", "span with tabindex, display: none" );
140-
isFocusable( "#visibilityHidden-span", "span with tabindex, visibility: hidden" );
140+
isNotFocusable( "#visibilityHidden-span", "span with tabindex, visibility: hidden" );
141141
});
142142

143143
test( "focusable - natively focusable with various tabindex", function() {
@@ -215,14 +215,14 @@ test( "tabbable - hidden styles", function() {
215215
isNotTabbable( "#displayNoneAncestor-input", "input, display: none parent" );
216216
isNotTabbable( "#displayNoneAncestor-span", "span with tabindex, display: none parent" );
217217

218-
isTabbable( "#visibilityHiddenAncestor-input", "input, visibility: hidden parent" );
219-
isTabbable( "#visibilityHiddenAncestor-span", "span with tabindex, visibility: hidden parent" );
218+
isNotTabbable( "#visibilityHiddenAncestor-input", "input, visibility: hidden parent" );
219+
isNotTabbable( "#visibilityHiddenAncestor-span", "span with tabindex, visibility: hidden parent" );
220220

221221
isNotTabbable( "#displayNone-input", "input, display: none" );
222-
isTabbable( "#visibilityHidden-input", "input, visibility: hidden" );
222+
isNotTabbable( "#visibilityHidden-input", "input, visibility: hidden" );
223223

224224
isNotTabbable( "#displayNone-span", "span with tabindex, display: none" );
225-
isTabbable( "#visibilityHidden-span", "span with tabindex, visibility: hidden" );
225+
isNotTabbable( "#visibilityHidden-span", "span with tabindex, visibility: hidden" );
226226
});
227227

228228
test( "tabbable - natively tabbable with various tabindex", function() {

ui/focusable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $.ui.focusable = function( element, hasTabindex ) {
4242
"a" === nodeName ?
4343
element.href || hasTabindex :
4444
hasTabindex ) &&
45-
$( element ).is( ":visible" );
45+
$( element ).is( ":visible" ) && $( element ).css( "visibility" ) === "visible";
4646
};
4747

4848
$.extend( $.expr[ ":" ], {

0 commit comments

Comments
 (0)