Standardize empty children to null

Author: jakezatecky

src/js/Tree.js

@@ -54,16 +54,18 @@ class Tree extends React.Component {
 			formatted.checked = checked.indexOf(node.value) > -1;
 			formatted.expanded = expanded.indexOf(node.value) > -1;
 
-			if (this.hasChildren(node)) {
+			if (Array.isArray(node.children) && node.children.length > 0) {
 				formatted.children = this.getFormattedNodes(formatted.children);
+			} else {
+				formatted.children = null;
 			}
 
 			return formatted;
 		});
 	}
 
 	getCheckState(node) {
-		if (this.hasChildren(node) === false) {
+		if (node.children === null) {
 			return node.checked ? 1 : 0;
 		}
 
@@ -79,7 +81,7 @@ class Tree extends React.Component {
 	}
 
 	setCheckState(checked, node, isChecked) {
-		if (this.hasChildren(node)) {
+		if (node.children !== null) {
 			// Percolate check status down to all children
 			node.children.forEach((child) => {
 				this.setCheckState(checked, child, isChecked);
@@ -100,7 +102,7 @@ class Tree extends React.Component {
 
 	isEveryChildChecked(node) {
 		return node.children.every((child) => {
-			if (this.hasChildren(child)) {
+			if (child.children !== null) {
 				return this.isEveryChildChecked(child);
 			}
 
@@ -110,22 +112,14 @@ class Tree extends React.Component {
 
 	isSomeChildChecked(node) {
 		return node.children.some((child) => {
-			if (this.hasChildren(child)) {
+			if (child.children !== null) {
 				return this.isSomeChildChecked(child);
 			}
 
 			return child.checked;
 		});
 	}
 
-	hasChildren(node) {
-		if (node.children === undefined) {
-			return false;
-		}
-
-		return node.children.length > 0;
-	}
-
 	renderTreeNodes(nodes) {
 		const treeNodes = nodes.map((node, index) => {
 			const checked = this.getCheckState(node);
@@ -155,7 +149,7 @@ class Tree extends React.Component {
 	}
 
 	renderChildNodes(node) {
-		if (this.hasChildren(node) && node.expanded) {
+		if (node.children !== null && node.expanded) {
 			return this.renderTreeNodes(node.children);
 		}
 

src/js/TreeNode.js

@@ -42,7 +42,7 @@ class TreeNode extends React.Component {
 	}
 
 	renderCollapseIcon() {
-		if (this.props.rawChildren === undefined) {
+		if (this.props.rawChildren === null) {
 			return <i className="fa" />;
 		}
 
@@ -66,7 +66,7 @@ class TreeNode extends React.Component {
 	}
 
 	renderNodeIcon() {
-		if (this.props.rawChildren !== undefined) {
+		if (this.props.rawChildren !== null) {
 			if (!this.props.expanded) {
 				return <i className="fa fa-folder-o" />;
 			}