Merge branch 'v0.6.3-dev' into v1.1.0-dev

Conflicts:
	src/js/CheckboxTree.js
	src/js/TreeNode.js
	src/js/nodeShape.js

Author: lucas-issa

README.md

@@ -110,8 +110,9 @@ Individual nodes within the `nodes` property can have the following structure:
 
 | Property    | Type   | Description                     |
 | ----------- | ------ | ------------------------------- |
-| `label`     | string | **Required**. The node's label. |
+| `label`     | mixed  | **Required**. The node's label. |
 | `value`     | mixed  | **Required**. The node's value. |
 | `children`  | array  | An array of child nodes.        |
 | `className` | string | A className to add to the node. |
 | `icon`      | mixed  | A custom icon for the node.     |
+| `disabled`  | bool   | Disable node.                   |

src/js/CheckboxTree.js

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 import PropTypes from 'prop-types';
 import React from 'react';
 import shortid from 'shortid';
@@ -190,13 +190,14 @@ class CheckboxTree extends React.Component {
             const key = `${node.value}`;
             const checked = this.getCheckState(node, noCascade);
             const children = this.renderChildNodes(node);
+            const nodeDisabled = !!(disabled || node.disabled);
 
             return (
                 <TreeNode
                     key={key}
                     checked={checked}
                     className={node.className}
-                    disabled={disabled}
+                    disabled={nodeDisabled}
                     expandDisabled={expandDisabled}
                     expanded={node.expanded}
                     icon={node.icon}

src/js/TreeNode.js

@@ -10,7 +10,7 @@ class TreeNode extends React.Component {
         disabled: PropTypes.bool.isRequired,
         expandDisabled: PropTypes.bool.isRequired,
         expanded: PropTypes.bool.isRequired,
-        label: PropTypes.string.isRequired,
+        label: PropTypes.node.isRequired,
         optimisticToggle: PropTypes.bool.isRequired,
         showNodeIcon: PropTypes.bool.isRequired,
         treeId: PropTypes.string.isRequired,
@@ -145,6 +145,7 @@ class TreeNode extends React.Component {
             'rct-node': true,
             'rct-node-parent': this.hasChildren(),
             'rct-node-leaf': !this.hasChildren(),
+            'rct-disabled': disabled,
         }, className);
 
         return (

src/js/nodeShape.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 
 const nodeShape = {
-    label: PropTypes.string.isRequired,
+    label: PropTypes.node.isRequired,
     value: PropTypes.oneOfType([
         PropTypes.string,
         PropTypes.number,