Merge pull request #34 from aknuds1/flatten-children

Don't add null or nested children to elements
mikenikles · Sep 23, 2016 · a74e7b2 · a74e7b2
2 parents 5f2ed66 + 3a37f2b
commit a74e7b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/process-node-definitions.js b/lib/process-node-definitions.js
@@ -61,13 +61,15 @@ var ProcessNodeDefinitions = function(React) {
         if (includes(voidElementTags, node.name)) {
             return React.createElement(node.name, elementProps)
         } else {
-        return React.createElement(node.name, elementProps, node.data, children);
-    }
-
+            var allChildren = node.data != null ? [node.data,].concat(children) : children;
+            return React.createElement.apply(
+                this, [node.name, elementProps,].concat(allChildren)
+            );
+        }
     }
 
     return {
-        processDefaultNode: processDefaultNode
+        processDefaultNode: processDefaultNode,
     };
 };
 

diff --git a/test/html-to-react-tests.js b/test/html-to-react-tests.js
@@ -142,6 +142,14 @@ describe('Html2React', function() {
             assert.equal(reactHtml, htmlInput);
         });
 
+        it('should not generate children for childless elements', function () {
+            var htmlInput = '<div></div>';
+
+            var reactComponent = parser.parse(htmlInput);
+
+            assert.strictEqual((reactComponent.props.children || []).length, 0);
+        });
+
         it('should fill in the key name with boolean attribute', function() {
             var htmlInput = '<input type="checkbox" disabled required/>';
             var htmlExpected = '<input type="checkbox" disabled="" required=""/>'