add check for empty/newlines

vkbansal · Jan 5, 2016 · f301ad4 · f301ad4
1 parent f7817a7
commit f301ad4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/lib/rules/jsx-if-single-child.js b/lib/rules/jsx-if-single-child.js
@@ -20,11 +20,19 @@ module.exports = function(context) {
         return n.name && n.name.type === "JSXIdentifier" && n.name.name === "Else" && n.selfClosing;
     }
 
-    function hasSingleChild(node) {
-        var children = node.parent.children;
+    function filterChildren(children) {
+        return children.filter(function(c) {
+            if (c.type === "JSXElement") return true;
 
-        return children.length && children.length === 1
-            && ["JSXElement", "Literal"].indexOf(children[0].type) > -1;
+            if (c.type === "Literal") return c.value.trim() !== "";
+
+            return false;
+        });
+    }
+
+    function hasSingleChild(node) {
+        var children = filterChildren(node.parent.children);
+        return children.length && children.length === 1;
     }
 
     function hasElseCondition(node) {
@@ -36,7 +44,7 @@ module.exports = function(context) {
     }
 
     function hasSingleChildrenBetween(node) {
-        var children = node.parent.children;
+        var children = filterChildren(node.parent.children);
 
         return children.length
             && children.length === 3

diff --git a/tests/lib/rules/jsx-if-single-child.js b/tests/lib/rules/jsx-if-single-child.js
@@ -26,7 +26,7 @@ ruleTester.run("jsx-if-single-child", rule, {
                 jsx: true
             }
         }, {
-            code: "<If><div/><Else/><div/></If>",
+            code: "\n<If>\n\t<div/>\n<Else/>\n\t<div/>\n</If>",
             ecmaFeatures: {
                 jsx: true
             }
@@ -40,12 +40,22 @@ ruleTester.run("jsx-if-single-child", rule, {
             ecmaFeatures: {
                 jsx: true
             }
+        }, {
+            code: "\n<If>\n\t<foobar/>\n</If>",
+            ecmaFeatures: {
+                jsx: true
+            }
+        }, {
+            code: "\n<If>\n\t<div>\n\t\t<foo/>\n\t</div>\n<Else/>\n\t<div>\n\t\t<bar/>\n\t</div>\n</If>",
+            ecmaFeatures: {
+                jsx: true
+            }
         }
     ],
 
     invalid: [
         {
-            code: "<If><div/><div/></If>",
+            code: "\n<If>\n\t<div/>\n\t<div/>\n</If>",
             ecmaFeatures: {
                 jsx: true
             },
@@ -54,7 +64,7 @@ ruleTester.run("jsx-if-single-child", rule, {
                 type: "JSXOpeningElement"
             }]
         }, {
-            code: "<If><div/><div/><Else/><div/><div/></If>",
+            code: "\n<If>\n\t<div/>\n\t<div/>\n<Else/>\n\t<div/>\n\t<div/>\n</If>",
             ecmaFeatures: {
                 jsx: true
             },
@@ -63,7 +73,7 @@ ruleTester.run("jsx-if-single-child", rule, {
                 type: "JSXOpeningElement"
             }]
         }, {
-            code: "<If><div/><div/><Else/><div/></If>",
+            code: "\n<If>\n\t<div/>\n\t<div/>\n<Else/>\n\t<div/>\n</If>",
             ecmaFeatures: {
                 jsx: true
             },
@@ -72,7 +82,7 @@ ruleTester.run("jsx-if-single-child", rule, {
                 type: "JSXOpeningElement"
             }]
         }, {
-            code: "<If><div/><Else/><div/><div/></If>",
+            code: "\n<If>\n\t<div/>\n<Else/>\n\t<div/>\n\t<div/>\n</If>",
             ecmaFeatures: {
                 jsx: true
             },