Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix toBeVisible ignoring Details element #184

Merged
merged 12 commits into from Jan 22, 2020
15 changes: 14 additions & 1 deletion src/__tests__/to-be-visible.js
@@ -1,7 +1,7 @@
import {render} from './helpers/test-utils'

test('.toBeVisible', () => {
const {container} = render(`
const {container, queryByTestId} = render(`
<div>
<header>
<h1 style="display: none">Main title</h1>
Expand All @@ -14,6 +14,14 @@ test('.toBeVisible', () => {
<section style="display: block; visibility: hidden">
<p>Hello <strong>World</strong></p>
</section>
<details data-testid="hidden-details">
<summary>Title of hidden</summary>
<div>Hidden details</div>
</details>
<details open data-testid="visible-details">
<summary>Title of visible</summary>
<div>Visible details</div>
</details>
</div>
`)

Expand All @@ -32,4 +40,9 @@ test('.toBeVisible', () => {
expect(() =>
expect(container.querySelector('p')).toBeVisible(),
).toThrowError()

expect(queryByTestId('visible-details').querySelector('div')).toBeVisible()
// expect(queryByTestId('visible-details').querySelector('summary')).toBeVisible()
// expect(queryByTestId('hidden-details').querySelector('summary')).toBeVisible()
lourenci marked this conversation as resolved.
Show resolved Hide resolved
expect(queryByTestId('hidden-details').querySelector('div')).not.toBeVisible()
})
8 changes: 7 additions & 1 deletion src/to-be-visible.js
Expand Up @@ -14,10 +14,16 @@ function isStyleVisible(element) {
)
}

function hasElementAVisibleAttribute(element) {
gnapse marked this conversation as resolved.
Show resolved Hide resolved
return element.nodeName === 'DETAILS'
? element.hasAttribute('open')
gnapse marked this conversation as resolved.
Show resolved Hide resolved
: !element.hasAttribute('hidden')
}

function isElementVisible(element) {
return (
isStyleVisible(element) &&
!element.hasAttribute('hidden') &&
hasElementAVisibleAttribute(element) &&
(!element.parentElement || isElementVisible(element.parentElement))
)
}
Expand Down