Merge pull request glittershark#336 from apprennet/fix-null-columns

checking if !th in thead.jsx
cklab · Nov 19, 2016 · 4cb57c1 · 4cb57c1
2 parents ede45ad + 4fdfeec
commit 4cb57c1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/build/reactable.js b/build/reactable.js
@@ -758,6 +758,7 @@ window.ReactDOM["default"] = window.ReactDOM;
                 var columns = [];
                 _react['default'].Children.forEach(component.props.children, function (th) {
                     var column = {};
+                    if (!th) return;
                     if (typeof th.props !== 'undefined') {
                         column.props = (0, _libFilter_props_from.filterPropsFrom)(th.props);
 

diff --git a/lib/reactable/thead.js b/lib/reactable/thead.js
@@ -120,6 +120,7 @@ var Thead = (function (_React$Component) {
             var columns = [];
             _react2['default'].Children.forEach(component.props.children, function (th) {
                 var column = {};
+                if (!th) return;
                 if (typeof th.props !== 'undefined') {
                     column.props = (0, _libFilter_props_from.filterPropsFrom)(th.props);
 

diff --git a/src/reactable/thead.jsx b/src/reactable/thead.jsx
@@ -9,6 +9,7 @@ export class Thead extends React.Component {
         let columns = [];
         React.Children.forEach(component.props.children, th => {
             var column = {};
+            if (!th) return;
             if (typeof th.props !== 'undefined') {
                 column.props = filterPropsFrom(th.props);
 

diff --git a/tests/reactable_test.jsx b/tests/reactable_test.jsx
@@ -375,6 +375,26 @@ describe('Reactable', function() {
                 ReactableTestUtils.expectRowText(1, ['', '28', 'Developer']);
             });
         });
+
+        context("when one of the <Th>s is null", function(){
+            before(function () {
+                ReactDOM.render(
+                    <Reactable.Table className="table" id="table">
+                      <Reactable.Thead>
+                        <Reactable.Th>Test</Reactable.Th>
+                        {null}
+                      </Reactable.Thead>
+                    </Reactable.Table>,
+                    ReactableTestUtils.testNode()
+                );
+            });
+
+          after(ReactableTestUtils.resetTestEnvironment);
+
+          it('renders the table', function() {
+              expect($('table#table.table')).to.exist;
+          });
+        });
     });
 
     describe('Adding a <Tfoot>', function() {