Merge pull request #272 from homuler/feature/null-check-fix

AllenFang · AllenFang · commit 38a8bd9231f4 · 2016-02-15T20:20:17.000+08:00
Fix null check bug
diff --git a/src/TableColumn.js b/src/TableColumn.js
@@ -20,7 +20,7 @@ class TableColumn extends React.Component{
       return shouldUpdated;
     }
 
-    if(typeof children === 'object') {
+    if(typeof children === 'object' && children !== null) {
       if(children.props.type === 'checkbox' || children.props.type === 'radio') {
         shouldUpdated = shouldUpdated ||
           children.props.type !== nextProps.children.props.type ||

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TableColumn extends React.Component{`
`20`	`20`	`return shouldUpdated;`
`21`	`21`	`}`
`22`	`22`
`23`		`- if(typeof children === 'object') {`
	`23`	`+ if(typeof children === 'object' && children !== null) {`
`24`	`24`	`if(children.props.type === 'checkbox' \|\| children.props.type === 'radio') {`
`25`	`25`	`shouldUpdated = shouldUpdated \|\|`
`26`	`26`	`children.props.type !== nextProps.children.props.type \|\|`