Skip to content

0.2.2 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2020
Merged

0.2.2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6b2fb
add onClick
artdong Apr 1, 2020
99378aa
update version
artdong Apr 1, 2020
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-org-tree",
"version": "0.2.1",
"version": "0.2.2",
"description": "a simple organization tree component based on react",
"main": "dist/bundle.js",
"files": [
Expand Down
9 changes: 7 additions & 2 deletions src/org_tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ export const renderBtn = (data, prop ) => {

return React.createElement('span', {
className: cls.join(' '),
onClick: (e) => typeof onExpand === 'function' && onExpand(e, data)
onClick: (e) => {
e.stopPropagation();
typeof onExpand === 'function' && onExpand(e, data);
}
});
};

Expand All @@ -52,6 +55,7 @@ export const renderLabel = (data, prop) => {
const node = prop.node;
const label = data[node.label];
const renderContent = prop.renderContent;
const onClick = prop.onClick;

const childNodes = [];
if (typeof renderContent === 'function') {
Expand All @@ -78,9 +82,10 @@ export const renderLabel = (data, prop) => {

return React.createElement('div', {
className: 'org-tree-node-label',
onClick: (e) => typeof onClick === 'function' && onClick(e, data)
}, [React.createElement('div', {
className: cls.join(' '),
style: { width: labelWidth },
style: { width: labelWidth }
}, childNodes)]);
};

Expand Down
6 changes: 4 additions & 2 deletions src/org_tree.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class OrgTree extends Component {
}

render() {
const { horizontal, node, data } = this.props;
const { horizontal, node, data, onClick } = this.props;
return <div className="org-tree-container">
<div className={classnames('org-tree', {
'horizontal': horizontal
Expand All @@ -72,6 +72,7 @@ class OrgTree extends Component {
data={data}
node={node}
onExpand={(e, nodeData)=> this.handleExpand(e, nodeData)}
onClick={(e, nodeData)=> onClick && onClick(e, nodeData)}
{...this.props}
/>
</div>
Expand All @@ -87,7 +88,8 @@ OrgTree.propTypes = {
expandAll: PropTypes.bool,
renderContent: PropTypes.func,
labelWidth: PropTypes.number,
labelClassName: PropTypes.string
labelClassName: PropTypes.string,
onClick: PropTypes.func
}

OrgTree.defaultProps = {
Expand Down