Guard against null children

yocontra · Mar 6, 2018 · 3b40652 · 3b40652
1 parent 77d37de
commit 3b40652
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -109,7 +109,7 @@ class MediaQuery extends React.Component {
     const props = omit(this.props, excludedPropKeys)
     const hasMergeProps = Object.keys(props).length > 0
     const childrenCount = React.Children.count(this.props.children)
-    const wrapChildren = this.props.component || this.props.children === undefined
+    const wrapChildren = this.props.component || this.props.children == null
     if (wrapChildren) {
       return React.createElement(
         this.props.component || 'div',

diff --git a/test/index_test.js b/test/index_test.js
@@ -163,6 +163,14 @@ describe('MediaQuery', function () {
     const e = TestUtils.renderIntoDocument(mq)
     assert.isNotFalse(TestUtils.findRenderedDOMComponentWithClass(e, 'parentBox'))
   })
+  it('doesnt throw error when component with null children', function () {
+    const mq = (
+      <MediaQuery all className="parentBox">{null}</MediaQuery>
+    )
+    const e = TestUtils.renderIntoDocument(mq)
+    assert.isNotFalse(TestUtils.findRenderedDOMComponentWithClass(e, 'parentBox'))
+  })
+
   it('renders with output of callback', function () {
     const mq = (
       <MediaQuery maxWidth={300}>