Fix issue where new onClick handler inappropriately triggered out-of-label rendering of the node title

Author: jakezatecky

src/js/CheckboxTree.js

@@ -72,7 +72,7 @@ class CheckboxTree extends React.Component {
         showNodeIcon: true,
         showNodeTitle: false,
         onCheck: () => {},
-        onClick: () => {},
+        onClick: null,
         onExpand: () => {},
     };
 
@@ -113,7 +113,6 @@ class CheckboxTree extends React.Component {
         if (id !== null) {
             newState = { ...newState, id };
         }
-
         model.deserializeLists({
             checked: newProps.checked,
             expanded: newProps.expanded,
@@ -199,6 +198,7 @@ class CheckboxTree extends React.Component {
             icons,
             lang,
             noCascade,
+            onClick,
             onlyLeafCheckboxes,
             optimisticToggle,
             showNodeTitle,
@@ -247,7 +247,7 @@ class CheckboxTree extends React.Component {
                     treeId={id}
                     value={node.value}
                     onCheck={this.onCheck}
-                    onClick={this.onNodeClick}
+                    onClick={onClick && this.onNodeClick}
                     onExpand={this.onExpand}
                 >
                     {children}

src/js/TreeNode.js

@@ -176,7 +176,7 @@ class TreeNode extends React.Component {
 
     renderBareLabel(children) {
         const { onClick, title } = this.props;
-        const clickable = onClick.toString() !== TreeNode.defaultProps.onClick.toString();
+        const clickable = onClick !== null;
 
         return (
             <span className="rct-bare-label" title={title}>
@@ -204,7 +204,7 @@ class TreeNode extends React.Component {
             value,
             onClick,
         } = this.props;
-        const clickable = onClick.toString() !== TreeNode.defaultProps.onClick.toString();
+        const clickable = onClick !== null;
         const inputId = `${treeId}-${String(value).split(' ').join('_')}`;
 
         const render = [(

test/TreeNode.js

@@ -438,6 +438,30 @@ describe('<TreeNode />', () => {
     });
 
     describe('onClick', () => {
+        it('should render the label inside of the DOM label when null', () => {
+            const wrapper = shallow(
+                <TreeNode
+                    {...baseProps}
+                    value="jupiter"
+                    onClick={null}
+                />,
+            );
+
+            assert.isTrue(wrapper.find('label .rct-title').exists());
+        });
+
+        it('should render the label outside of the DOM label when NOT null', () => {
+            const wrapper = shallow(
+                <TreeNode
+                    {...baseProps}
+                    value="jupiter"
+                    onClick={() => {}}
+                />,
+            );
+
+            assert.isFalse(wrapper.find('label .rct-title').exists());
+        });
+
         it('should pass the current node\'s value', () => {
             let actual = {};