Fix issue where property validation was not occurring on node items

Resolves #23.

Author: jakezatecky

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## Bug Fixes
 
 * [#22]: Remove expand-like behavior on nodes without children
+* [#23]: Fix issue where property validation was not occurring on node items
 
 ## [v0.4.1](https://github.com/jakezatecky/react-checkbox-tree/compare/v0.4.0...v0.4.1) (2017-02-15)
 

src/js/Tree.js

@@ -6,15 +6,7 @@ import nodeShape from './nodeShape';
 
 class Tree extends React.Component {
 	static propTypes = {
-		nodes: React.PropTypes.arrayOf(
-			React.PropTypes.oneOfType([
-				React.PropTypes.shape(nodeShape),
-				React.PropTypes.shape({
-					...nodeShape,
-					children: React.PropTypes.arrayOf(nodeShape),
-				}),
-			]),
-		).isRequired,
+		nodes: React.PropTypes.arrayOf(nodeShape).isRequired,
 
 		checked: React.PropTypes.arrayOf(React.PropTypes.string),
 		expanded: React.PropTypes.arrayOf(React.PropTypes.string),

src/js/TreeNode.js

@@ -14,7 +14,7 @@ class TreeNode extends React.Component {
 		onExpand: React.PropTypes.func.isRequired,
 
 		children: React.PropTypes.node,
-		rawChildren: React.PropTypes.arrayOf(React.PropTypes.shape(nodeShape)),
+		rawChildren: React.PropTypes.arrayOf(nodeShape),
 	};
 
 	static defaultProps = {

src/js/nodeShape.js

@@ -1,9 +1,32 @@
 import React from 'react';
 
-export default {
+const nodeShape = {
 	value: React.PropTypes.oneOfType([
 		React.PropTypes.string,
 		React.PropTypes.number,
-	]),
-	title: React.PropTypes.string,
+	]).isRequired,
+	label: React.PropTypes.string.isRequired,
 };
+
+const legacyShape = {
+	value: React.PropTypes.oneOfType([
+		React.PropTypes.string,
+		React.PropTypes.number,
+	]).isRequired,
+	title: React.PropTypes.string.isRequired,
+};
+
+const nodeShapeWithChildren = React.PropTypes.oneOfType([
+	React.PropTypes.shape(nodeShape),
+	React.PropTypes.shape(legacyShape),
+	React.PropTypes.shape({
+		...nodeShape,
+		children: React.PropTypes.arrayOf(nodeShape).isRequired,
+	}),
+	React.PropTypes.shape({
+		...legacyShape,
+		children: React.PropTypes.arrayOf(nodeShape).isRequired,
+	}),
+]);
+
+export default nodeShapeWithChildren;