From 875f5bc7fcd56c563e9388b0c18e6d005e9f44b9 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 02:56:37 -0300
Subject: [PATCH 01/11] adding custom renderCollapse
---
example/app.js | 11 +++++++++++
lib/node.js | 7 +++++--
lib/react-ui-tree.js | 2 ++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/example/app.js b/example/app.js
index 993f833e..e7b0016e 100644
--- a/example/app.js
+++ b/example/app.js
@@ -32,6 +32,16 @@ var App = React.createClass({
});
},
+ renderCollapse(collapsed) {
+ return (
+ <span
+ className={cx('collapse', collapsed ? 'caret-right' : 'caret-down')}
+ onMouseDown={function(e) {e.stopPropagation()}}
+ onClick={this.handleCollapse}>
+ </span>
+ )
+ },
+
render() {
return (
<div className="app">
@@ -42,6 +52,7 @@ var App = React.createClass({
onChange={this.handleChange}
isNodeCollapsed={this.isNodeCollapsed}
renderNode={this.renderNode}
+ renderCollapse={this.renderCollapse}
/>
</div>
<div className="inspector">
diff --git a/lib/node.js b/lib/node.js
index 9f59be59..e01a7bc3 100644
--- a/lib/node.js
+++ b/lib/node.js
@@ -7,15 +7,17 @@ var Node = React.createClass({
renderCollapse() {
var index = this.props.index;
+ var renderCollapse = this.props.renderCollapse;
if(index.children && index.children.length) {
var collapsed = index.node.collapsed;
return (
<span
- className={cx('collapse', collapsed ? 'caret-right' : 'caret-down')}
onMouseDown={function(e) {e.stopPropagation()}}
- onClick={this.handleCollapse}>
+ onClick={this.handleCollapse}
+ >
+ {renderCollapse(collapsed)}
</span>
);
}
@@ -46,6 +48,7 @@ var Node = React.createClass({
paddingLeft={this.props.paddingLeft}
onCollapse={this.props.onCollapse}
onDragStart={this.props.onDragStart}
+ renderCollapse={this.props.renderCollapse}
/>
);
})}
diff --git a/lib/react-ui-tree.js b/lib/react-ui-tree.js
index d8527524..04682ab6 100644
--- a/lib/react-ui-tree.js
+++ b/lib/react-ui-tree.js
@@ -63,6 +63,7 @@ module.exports = React.createClass({
tree={tree}
index={draggingIndex}
paddingLeft={this.props.paddingLeft}
+ renderCollapse={this.props.renderCollapse}
/>
</div>
);
@@ -87,6 +88,7 @@ module.exports = React.createClass({
onDragStart={this.dragStart}
onCollapse={this.toggleCollapse}
dragging={dragging && dragging.id}
+ renderCollapse={this.props.renderCollapse}
/>
</div>
);
From 28e1a0a6d62589d5aec070edc51f2c9f12a6ac37 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 02:57:12 -0300
Subject: [PATCH 02/11] 2.6.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index b4b3e8f8..3913470d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.0",
+ "version": "2.6.1",
"description": "React tree component",
"main": "index.js",
"scripts": {
From 8a211c7ff5c5b720f99b0b2d5484977dfba6ccd2 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:11:22 -0300
Subject: [PATCH 03/11] updating version
---
dist/node.js | 18 ++++++++++++------
dist/react-ui-tree.js | 6 ++++--
example/app.js | 1 +
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/dist/node.js b/dist/node.js
index 8a435855..511b4d8c 100644
--- a/dist/node.js
+++ b/dist/node.js
@@ -9,16 +9,21 @@ var Node = React.createClass({
renderCollapse: function renderCollapse() {
var index = this.props.index;
+ var renderCollapse = this.props.renderCollapse;
if (index.children && index.children.length) {
var collapsed = index.node.collapsed;
- return React.createElement('span', {
- className: cx('collapse', collapsed ? 'caret-right' : 'caret-down'),
- onMouseDown: function onMouseDown(e) {
- e.stopPropagation();
+ return React.createElement(
+ 'span',
+ {
+ onMouseDown: function onMouseDown(e) {
+ e.stopPropagation();
+ },
+ onClick: this.handleCollapse
},
- onClick: this.handleCollapse });
+ renderCollapse(collapsed)
+ );
}
return null;
@@ -47,7 +52,8 @@ var Node = React.createClass({
dragging: dragging,
paddingLeft: _this.props.paddingLeft,
onCollapse: _this.props.onCollapse,
- onDragStart: _this.props.onDragStart
+ onDragStart: _this.props.onDragStart,
+ renderCollapse: _this.props.renderCollapse
});
})
);
diff --git a/dist/react-ui-tree.js b/dist/react-ui-tree.js
index 9b1accec..5824f0de 100644
--- a/dist/react-ui-tree.js
+++ b/dist/react-ui-tree.js
@@ -60,7 +60,8 @@ module.exports = React.createClass({
React.createElement(Node, {
tree: tree,
index: draggingIndex,
- paddingLeft: this.props.paddingLeft
+ paddingLeft: this.props.paddingLeft,
+ renderCollapse: this.props.renderCollapse
})
);
}
@@ -83,7 +84,8 @@ module.exports = React.createClass({
paddingLeft: this.props.paddingLeft,
onDragStart: this.dragStart,
onCollapse: this.toggleCollapse,
- dragging: dragging && dragging.id
+ dragging: dragging && dragging.id,
+ renderCollapse: this.props.renderCollapse
})
);
},
diff --git a/example/app.js b/example/app.js
index e7b0016e..b4e8f8b9 100644
--- a/example/app.js
+++ b/example/app.js
@@ -33,6 +33,7 @@ var App = React.createClass({
},
renderCollapse(collapsed) {
+ debugger;
return (
<span
className={cx('collapse', collapsed ? 'caret-right' : 'caret-down')}
From 4e8c04f2140960997ae61c74bbda62e0cbdcbc44 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:11:36 -0300
Subject: [PATCH 04/11] 2.6.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 3913470d..96326f98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.1",
+ "version": "2.6.2",
"description": "React tree component",
"main": "index.js",
"scripts": {
From 7a3b4ea755b494635dfb27813d4b0594af3ad14d Mon Sep 17 00:00:00 2001
From: Wagner Horta <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:34:13 -0300
Subject: [PATCH 05/11] Update app.js
---
example/app.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/example/app.js b/example/app.js
index b4e8f8b9..e7b0016e 100644
--- a/example/app.js
+++ b/example/app.js
@@ -33,7 +33,6 @@ var App = React.createClass({
},
renderCollapse(collapsed) {
- debugger;
return (
<span
className={cx('collapse', collapsed ? 'caret-right' : 'caret-down')}
From 18f8fccbf075d228f0d2a1faba83d7ee9009a5f9 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:35:15 -0300
Subject: [PATCH 06/11] 2.6.3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 96326f98..199d877b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.2",
+ "version": "2.6.3",
"description": "React tree component",
"main": "index.js",
"scripts": {
From 2958cd9f2d068d1df50e4cc6b29a8d474db782a9 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:35:50 -0300
Subject: [PATCH 07/11] 2.6.4
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 199d877b..497b5f93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.3",
+ "version": "2.6.4",
"description": "React tree component",
"main": "index.js",
"scripts": {
From dd2a34429017f0103a54a0cbed8c1e59392597c9 Mon Sep 17 00:00:00 2001
From: Wagner Horta <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 03:36:15 -0300
Subject: [PATCH 08/11] Update package.json
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 497b5f93..3913470d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.4",
+ "version": "2.6.1",
"description": "React tree component",
"main": "index.js",
"scripts": {
From 42f53cdf6cf73e242b833683b9a07ec1cd10f3f2 Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 05:39:34 -0300
Subject: [PATCH 09/11] passing id of node in render node
---
lib/node.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/node.js b/lib/node.js
index e01a7bc3..944679db 100644
--- a/lib/node.js
+++ b/lib/node.js
@@ -72,7 +72,7 @@ var Node = React.createClass({
})} style={styles}>
<div className="inner" ref="inner" onMouseDown={this.handleMouseDown}>
{this.renderCollapse()}
- {tree.renderNode(node)}
+ {tree.renderNode(node, index.id)}
</div>
{this.renderChildren()}
</div>
From 8727f2116fd008847d7f6e05d9d7744a22b2ce8e Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 05:41:21 -0300
Subject: [PATCH 10/11] sending node id in render node
---
dist/node.js | 2 +-
package.json | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dist/node.js b/dist/node.js
index 511b4d8c..539769bb 100644
--- a/dist/node.js
+++ b/dist/node.js
@@ -77,7 +77,7 @@ var Node = React.createClass({
'div',
{ className: 'inner', ref: 'inner', onMouseDown: this.handleMouseDown },
this.renderCollapse(),
- tree.renderNode(node)
+ tree.renderNode(node, index.id)
),
this.renderChildren()
);
diff --git a/package.json b/package.json
index 3913470d..4b231a8c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
"start": "webpack-dev-server -c --port=8888",
"build": "make",
"deploy": "npm run build && github-pages-deploy",
- "test": "mocha"
+ "test": "mocha",
+ "upgrade:version": "npm run build && npm version patch && git push && npm publish"
},
"github-pages-deploy": {
"src": "example"
From 79acfcac3d1cdf293251676861c623782c34111a Mon Sep 17 00:00:00 2001
From: whortaneto <wneto@wagnerhorta.com>
Date: Wed, 19 Apr 2017 05:41:36 -0300
Subject: [PATCH 11/11] 2.6.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 4b231a8c..e9e3d007 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-ui-tree",
- "version": "2.6.1",
+ "version": "2.6.2",
"description": "React tree component",
"main": "index.js",
"scripts": {