Merge pull request #7 from limscoder/master

Fixed errors when there are undefined or null children.

Author: ryanflorence

lib/__tests__/index-test.js

@@ -59,6 +59,19 @@ describe('props', () => {
         });
       });
 
+      it('does not error if there are undefined children', () => {
+        var undefChild;
+        doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
+          <div onClick={k}>{ undefChild } bar</div>;
+        });
+      });
+
+      it('does not error if there are null children', () => {
+        doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
+          <div onClick={k}>bar { null }</div>;
+        });
+      });
+
       it('does not warn if there is an image with an alt attribute', () => {
         doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
           <div onClick={k}><img src="#" alt="Foo"/></div>;
@@ -169,4 +182,3 @@ describe('tags', () => {
     });
   });
 });
-

lib/assertions.js

@@ -23,6 +23,10 @@ var hasChildTextNode = (props, children) => {
   React.Children.forEach(children, (child) => {
     if (hasText)
       return;
+    else if (child === null)
+      return;
+    else if (typeof child === 'undefined')
+      return;
     else if (typeof child === 'string')
       hasText = true;
     else if (child.type === 'img' && child.props.alt)
@@ -108,4 +112,3 @@ exports.tags = {
     }
   }
 };
-