Merge 27b966b into 423a5e4

dowjones · Dec 19, 2019 · 5ac7a1b · 5ac7a1b
2 parents 423a5e4 + 27b966b
commit 5ac7a1b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/tree-node/index.js b/src/tree-node/index.js
@@ -73,6 +73,7 @@ class TreeNode extends PureComponent {
     showPartiallySelected: PropTypes.bool,
     readOnly: PropTypes.bool,
     clientId: PropTypes.string,
+    selectable: PropTypes.bool,
   }
 
   getAriaAttributes = () => {
@@ -113,6 +114,7 @@ class TreeNode extends PureComponent {
       showPartiallySelected,
       readOnly,
       clientId,
+      selectable,
     } = this.props
     const liCx = getNodeCx(this.props)
     const style = keepTreeOnSearch || !searchModeOn ? { paddingLeft: `${(_depth || 0) * 20}px` } : {}
@@ -135,6 +137,7 @@ class TreeNode extends PureComponent {
           showPartiallySelected={showPartiallySelected}
           readOnly={readOnly}
           clientId={clientId}
+          selectable={selectable}
         />
         <Actions actions={actions} onAction={onAction} id={_id} readOnly={readOnly} />
       </li>

diff --git a/src/tree-node/node-label.js b/src/tree-node/node-label.js
@@ -24,6 +24,7 @@ class NodeLabel extends PureComponent {
     onCheckboxChange: PropTypes.func,
     readOnly: PropTypes.bool,
     clientId: PropTypes.string,
+    selectable: PropTypes.bool,
   }
 
   handleCheckboxChange = e => {
@@ -42,7 +43,7 @@ class NodeLabel extends PureComponent {
   }
 
   render() {
-    const { mode, title, label, id, partial, checked } = this.props
+    const { mode, title, label, id, partial, checked, selectable = true } = this.props
     const { value, disabled, showPartiallySelected, readOnly, clientId } = this.props
     const nodeLabelProps = { className: 'node-label' }
 
@@ -61,13 +62,15 @@ class NodeLabel extends PureComponent {
         {mode === 'radioSelect' ? (
           <RadioButton name={clientId} className="radio-item" onChange={this.handleCheckboxChange} {...sharedProps} />
         ) : (
-          <Checkbox
-            name={id}
-            className={cx('checkbox-item', { 'simple-select': mode === 'simpleSelect' })}
-            indeterminate={showPartiallySelected && partial}
-            onChange={this.handleCheckboxChange}
-            {...sharedProps}
-          />
+          selectable && (
+            <Checkbox
+              name={id}
+              className={cx('checkbox-item', { 'simple-select': mode === 'simpleSelect' })}
+              indeterminate={showPartiallySelected && partial}
+              onChange={this.handleCheckboxChange}
+              {...sharedProps}
+            />
+          )
         )}
         <span {...nodeLabelProps}>{label}</span>
       </label>