Move visibility checks in to visible()

muan · muan · commit 85b802c34acf · 2019-11-06T11:27:11.000-05:00
diff --git a/index.js b/index.js
@@ -32,11 +32,11 @@ function keydown(event: KeyboardEvent): void {
 }
 
 function focusable(el: Focusable): boolean {
-  return el.tabIndex >= 0 && !el.disabled && !el.hidden && (!el.type || el.type !== 'hidden') && visible(el)
+  return el.tabIndex >= 0 && !el.disabled && visible(el)
 }
 
 function visible(el): boolean {
-  return el.offsetWidth > 0 || el.offsetHeight > 0
+  return !el.hidden && (!el.type || el.type !== 'hidden') && (el.offsetWidth > 0 || el.offsetHeight > 0)
 }
 
 function restrictTabBehavior(event: KeyboardEvent): void {

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ function keydown(event: KeyboardEvent): void {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function focusable(el: Focusable): boolean {`
`35`		`- return el.tabIndex >= 0 && !el.disabled && !el.hidden && (!el.type \|\| el.type !== 'hidden') && visible(el)`
	`35`	`+ return el.tabIndex >= 0 && !el.disabled && visible(el)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function visible(el): boolean {`
`39`		`- return el.offsetWidth > 0 \|\| el.offsetHeight > 0`
	`39`	`+ return !el.hidden && (!el.type \|\| el.type !== 'hidden') && (el.offsetWidth > 0 \|\| el.offsetHeight > 0)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`function restrictTabBehavior(event: KeyboardEvent): void {`