Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/bundle.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ class DropdownTreeSelect extends Component {
onBlur: PropTypes.func,
simpleSelect: PropTypes.bool,
noMatchesText: PropTypes.string,
showPartiallySelected: PropTypes.bool
showPartiallySelected: PropTypes.bool,
nodeRenderer: PropTypes.func,
iconRenderer: PropTypes.func
}

static defaultProps = {
Expand Down Expand Up @@ -211,6 +213,8 @@ class DropdownTreeSelect extends Component {
onNodeToggle={this.onNodeToggle}
simpleSelect={this.props.simpleSelect}
showPartiallySelected={this.props.showPartiallySelected}
nodeRenderer={this.props.nodeRenderer}
iconRenderer={this.props.iconRenderer}
/>
)}
</div>
Expand Down
11 changes: 8 additions & 3 deletions src/tree-node/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ class TreeNode extends PureComponent {
onAction: PropTypes.func,
onCheckboxChange: PropTypes.func,
simpleSelect: PropTypes.bool,
showPartiallySelected: PropTypes.bool
showPartiallySelected: PropTypes.bool,
nodeRenderer: PropTypes.func,
iconRenderer: PropTypes.func
}

render() {
Expand All @@ -74,14 +76,16 @@ class TreeNode extends PureComponent {
searchModeOn,
onNodeToggle,
onCheckboxChange,
showPartiallySelected
showPartiallySelected,
nodeRenderer,
iconRenderer
} = this.props
const liCx = getNodeCx(this.props)
const style = keepTreeOnSearch || !searchModeOn ? { paddingLeft: `${(_depth || 0) * 20}px` } : {}

return (
<li className={liCx} style={style} {...getDataset(dataset)}>
<Toggle isLeaf={isLeaf(_children)} expanded={expanded} id={_id} onNodeToggle={onNodeToggle} />
<Toggle isLeaf={isLeaf(_children)} expanded={expanded} id={_id} onNodeToggle={onNodeToggle} iconRenderer={iconRenderer} />
<NodeLabel
title={title}
label={label}
Expand All @@ -93,6 +97,7 @@ class TreeNode extends PureComponent {
simpleSelect={simpleSelect}
onCheckboxChange={onCheckboxChange}
showPartiallySelected={showPartiallySelected}
nodeRenderer={nodeRenderer}
/>
<Actions actions={actions} onAction={onAction} id={_id} />
</li>
Expand Down
19 changes: 14 additions & 5 deletions src/tree-node/node-label.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class NodeLabel extends PureComponent {
dataset: PropTypes.object,
simpleSelect: PropTypes.bool,
showPartiallySelected: PropTypes.bool,
onCheckboxChange: PropTypes.func
onCheckboxChange: PropTypes.func,
nodeRenderer: PropTypes.func
}

handleCheckboxChange = e => {
Expand All @@ -36,15 +37,24 @@ class NodeLabel extends PureComponent {
}

render() {
const { simpleSelect, title, label, id, partial, checked, value, disabled, showPartiallySelected } = this.props
const { simpleSelect, title, label, id, partial, checked, value, disabled, showPartiallySelected, nodeRenderer } = this.props
const nodeLabelProps = { className: 'node-label' }

if (simpleSelect) {
nodeLabelProps.onClick = this.handleCheckboxChange
}

return (
<label title={title || label} htmlFor={id}>
return nodeRenderer
? nodeRenderer({
id,
value,
disabled,
checked,
title: title || label,
onChange: this.handleCheckboxChange,
indeterminate: showPartiallySelected && partial
})
: <label title={title || label} htmlFor={id}>
<Checkbox
name={id}
id={id}
Expand All @@ -57,7 +67,6 @@ class NodeLabel extends PureComponent {
/>
<span {...nodeLabelProps}>{label}</span>
</label>
)
}
}

Expand Down
9 changes: 6 additions & 3 deletions src/tree-node/toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ class Toggle extends PureComponent {
expanded: PropTypes.bool,
isLeaf: PropTypes.bool,
onNodeToggle: PropTypes.func,
id: PropTypes.string
id: PropTypes.string,
iconRenderer: PropTypes.func
}

onToggle = () => {
this.props.onNodeToggle(this.props.id)
}

render() {
const { expanded, isLeaf } = this.props
const { expanded, isLeaf, iconRenderer } = this.props
const toggleCx = cx('toggle', { expanded: !isLeaf && expanded, collapsed: !isLeaf && !expanded })
return <i className={toggleCx} onClick={this.onToggle} />
return iconRenderer
? iconRenderer(toggleCx, this.onToggle)
: <i className={toggleCx} onClick={this.onToggle} />
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/tree/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ class Tree extends Component {
onCheckboxChange: PropTypes.func,
simpleSelect: PropTypes.bool,
showPartiallySelected: PropTypes.bool,
pageSize: PropTypes.number
pageSize: PropTypes.number,
nodeRenderer: PropTypes.func,
iconRenderer: PropTypes.func
}

static defaultProps = {
Expand Down Expand Up @@ -58,7 +60,7 @@ class Tree extends Component {
}

getNodes = props => {
const { data, keepTreeOnSearch, searchModeOn, simpleSelect, showPartiallySelected } = props
const { data, keepTreeOnSearch, searchModeOn, simpleSelect, showPartiallySelected, nodeRenderer, iconRenderer } = props
const { onAction, onChange, onCheckboxChange, onNodeToggle } = props
const items = []
data.forEach(node => {
Expand All @@ -74,6 +76,8 @@ class Tree extends Component {
onAction={onAction}
simpleSelect={simpleSelect}
showPartiallySelected={showPartiallySelected}
nodeRenderer={nodeRenderer}
iconRenderer={iconRenderer}
/>)
}
})
Expand Down