From b3a9875af61a558f5ee566feb491511b254ad020 Mon Sep 17 00:00:00 2001 From: Paul Capron Date: Tue, 31 Oct 2017 18:47:57 +0100 Subject: [PATCH] Focusable: Fix handling of `visibility: collapse` "collapse" is similar to "hidden", with a slight difference in the case of tr/tbody/td/colgroup elements. See https://www.w3.org/TR/CSS22/visufx.html#visibility See https://www.w3.org/TR/CSS22/tables.html#dynamic-effects See https://developer.mozilla.org/en-US/docs/Web/CSS/visibility#Table_example "visibility: collapse" elements are always not focusable, though. Commit d3025968f34 introduced a regression by testing with `!== "hidden"` instead of `=== "visible"`. --- tests/unit/core/core.html | 8 ++++++++ tests/unit/core/selector.js | 6 +++++- ui/focusable.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html index 31a5bb579d5..7434a1e1fd4 100644 --- a/tests/unit/core/core.html +++ b/tests/unit/core/core.html @@ -108,9 +108,17 @@ + . + + + + + + +
.
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js index 29b8b129680..d596e742929 100644 --- a/tests/unit/core/selector.js +++ b/tests/unit/core/selector.js @@ -132,7 +132,7 @@ QUnit.test( "focusable - disabled elements", function( assert ) { } ); QUnit.test( "focusable - hidden styles", function( assert ) { - assert.expect( 12 ); + assert.expect( 15 ); assert.isNotFocusable( "#displayNoneAncestor-input", "input, display: none parent" ); assert.isNotFocusable( "#displayNoneAncestor-span", "span with tabindex, display: none parent" ); @@ -148,9 +148,13 @@ QUnit.test( "focusable - hidden styles", function( assert ) { assert.isNotFocusable( "#displayNone-input", "input, display: none" ); assert.isNotFocusable( "#visibilityHidden-input", "input, visibility: hidden" ); + assert.isNotFocusable( "#visibilityCollapse-input", "input, visibility: collapse" ); assert.isNotFocusable( "#displayNone-span", "span with tabindex, display: none" ); assert.isNotFocusable( "#visibilityHidden-span", "span with tabindex, visibility: hidden" ); + assert.isNotFocusable( "#visibilityCollapse-span", "span with tabindex, visibility: collapse" ); + + assert.isNotFocusable( "#visibilityCollapse-td", "td with tabindex, visibility: collapse" ); } ); QUnit.test( "focusable - natively focusable with various tabindex", function( assert ) { diff --git a/ui/focusable.js b/ui/focusable.js index b1a7b61e244..433474fcd7b 100644 --- a/ui/focusable.js +++ b/ui/focusable.js @@ -70,7 +70,7 @@ function visible( element ) { element = element.parent(); visibility = element.css( "visibility" ); } - return visibility !== "hidden"; + return visibility === "visible"; } $.extend( $.expr.pseudos, {