From 4ac711b5b4c0f733870cd8dd1f18b73f964275fc Mon Sep 17 00:00:00 2001
From: Ryan Berliner <22206986+RyanBerliner@users.noreply.github.com>
Date: Thu, 20 May 2021 09:50:53 -0400
Subject: Refactor `isVisible` helper, fixing false positives from deep nesting
 or alternate means (#33960)

---
 js/src/util/index.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'js/src/util')

diff --git a/js/src/util/index.js b/js/src/util/index.js
index 6b38a05e94..77bdc072fc 100644
--- a/js/src/util/index.js
+++ b/js/src/util/index.js
@@ -159,20 +159,11 @@ const typeCheckConfig = (componentName, config, configTypes) => {
 }
 
 const isVisible = element => {
-  if (!element) {
+  if (!isElement(element) || element.getClientRects().length === 0) {
     return false
   }
 
-  if (element.style && element.parentNode && element.parentNode.style) {
-    const elementStyle = getComputedStyle(element)
-    const parentNodeStyle = getComputedStyle(element.parentNode)
-
-    return elementStyle.display !== 'none' &&
-      parentNodeStyle.display !== 'none' &&
-      elementStyle.visibility !== 'hidden'
-  }
-
-  return false
+  return getComputedStyle(element).getPropertyValue('visibility') === 'visible'
 }
 
 const isDisabled = element => {
-- 
cgit v1.2.3