[refactor] Utils: simplify renderedDive

enzymejs · Dec 13, 2018 · eb745b7 · eb745b7
1 parent 7a08723
commit eb745b7
Showing 1 changed file with 9 additions and 31 deletions.
diff --git a/packages/enzyme/src/Utils.js b/packages/enzyme/src/Utils.js
@@ -357,38 +357,16 @@ export function isEmptyValue(renderedValue) {
 }
 
 export function renderedDive(nodes) {
-  let isEmptyRender = true;
-
-  function dive(renderedNodes) {
-    const isList = Array.isArray(renderedNodes) && renderedNodes.length > 0;
-    if (isList) {
-      renderedNodes.some((n) => {
-        if (n) {
-          if (has(n, 'rendered')) {
-            dive(n.rendered);
-          } else if (!isEmptyValue(n.rendered)) {
-            isEmptyRender = false;
-          }
-        } else if (!isEmptyValue(n)) {
-          isEmptyRender = false;
-        }
+  if (isEmptyValue(nodes)) {
+    return true;
+  }
 
-        return !isEmptyRender;
-      });
-    } else if (!isEmptyValue(renderedNodes)) {
-      if (has(renderedNodes, 'rendered')) {
-        dive(renderedNodes.rendered);
-      } else if (has(renderedNodes, 'rendered') && !isEmptyValue(renderedNodes.rendered)) {
-        isEmptyRender = false;
-      } else if (!has(renderedNodes, 'rendered') && !isEmptyValue(renderedNodes)) {
-        isEmptyRender = false;
-      } else {
-        dive(renderedNodes.rendered);
-      }
+  return [].concat(nodes).every((n) => {
+    if (n) {
+      const { rendered } = n;
+      return isEmptyValue(rendered) || renderedDive(rendered);
     }
 
-    return isEmptyRender;
-  }
-
-  return dive(nodes);
+    return isEmptyValue(n);
+  });
 }