Skip to content

Commit be750b6

Browse files
committed
Update deps and use React.cloneElement instead of cloneWithProps.
1 parent 263e16e commit be750b6

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

lib/Resizable.jsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
'use strict';
22
var React = require('react');
33
var Draggable = require('react-draggable');
4-
var assign = require('object-assign');
5-
var PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
6-
var cloneWithProps = require('react/lib/cloneWithProps');
74

85
var Resizable = module.exports = React.createClass({
96
displayName: 'Resizable',
10-
mixins: [PureRenderMixin],
117

128
propTypes: {
139
children: React.PropTypes.element,
@@ -54,13 +50,13 @@ var Resizable = module.exports = React.createClass({
5450

5551
render() {
5652
var p = this.props;
53+
5754
// What we're doing here is getting the child of this element, and cloning it with this element's props.
5855
// We are then defining its children as:
5956
// Its original children (resizable's child's children), and
6057
// A draggable handle.
61-
62-
return cloneWithProps(p.children, assign({}, p, {
63-
children: [
58+
return React.cloneElement(p.children, p,
59+
[
6460
p.children.props.children,
6561
<Draggable
6662
{...p.draggableOpts}
@@ -71,11 +67,12 @@ var Resizable = module.exports = React.createClass({
7167
onDrag={this.resizeHandler('onResize')}
7268
minConstraints={this.minConstraints()}
7369
maxConstraints={this.maxConstraints()}
70+
key="draggable"
7471
>
7572
<span className="react-resizable-handle" />
7673
</Draggable>
7774
]
78-
}));
75+
);
7976
}
8077
});
8178

lib/ResizableBox.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
'use strict';
22
var React = require('react');
3-
var PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
43
var Resizable = require('./Resizable');
54

65
// An example use of Resizable.
76
var ResizableBox = module.exports = React.createClass({
87
displayName: 'ResizableBox',
9-
mixins: [PureRenderMixin],
108

119
propTypes: {
1210
},

package.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,30 @@
2727
},
2828
"homepage": "https://github.com/STRML/react-resizable",
2929
"devDependencies": {
30-
"6to5": "^2.2.0",
31-
"6to5-loader": "^1.0.0",
32-
"css-loader": "^0.9.0",
33-
"jshint": "^2.5.11",
34-
"lodash": "^2.4.1",
35-
"precommit-hook": "^1.0.7",
36-
"react": "^0.12.2",
37-
"react-hot-loader": "^1.0.4",
38-
"style-loader": "^0.8.2",
39-
"webpack": "^1.4.14",
40-
"webpack-dev-server": "^1.7.0"
30+
"babel": "^5.0.1",
31+
"babel-core": "^5.0.1",
32+
"babel-loader": "^5.0.0",
33+
"css-loader": "^0.9.1",
34+
"jshint": "^2.6.3",
35+
"lodash": "^3.6.0",
36+
"pre-commit": "^1.0.6",
37+
"precommit-hook": "^2.0.1",
38+
"react": "^0.13.1",
39+
"react-hot-loader": "^1.2.4",
40+
"style-loader": "^0.9.0",
41+
"webpack": "^1.7.3",
42+
"webpack-dev-server": "^1.8.0"
43+
},
44+
"peerDependencies": {
45+
"react": "^0.13"
4146
},
4247
"dependencies": {
43-
"object-assign": "^2.0.0",
4448
"react-draggable": "strml/react-draggable"
4549
},
4650
"publishConfig": {
4751
"registry": "https://registry.npmjs.org"
4852
},
4953
"precommit": [
50-
"check-build",
5154
"lint"
5255
]
5356
}

webpack-dev-server.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ module.exports = {
1212
},
1313
module: {
1414
loaders: [
15-
{test: /\.jsx?$/, exclude: /node_modules/, loader: '6to5-loader?experimental=true'},
15+
{test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?stage=0'},
1616
{test: /\.jsx$/, exclude: /node_modules/, loader: 'react-hot-loader'}
1717
]
1818
},
1919
debug: true,
20-
devtool: "#inline-source-map",
20+
devtool: "eval",
2121
resolve: {
2222
extensions: ["", ".webpack.js", ".web.js", ".js", ".jsx"]
2323
}

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
},
1111
module: {
1212
loaders: [
13-
{test: /\.jsx?$/, exclude: /node_modules/, loader: '6to5-loader?experimental=true'},
13+
{test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?stage=0'},
1414
]
1515
},
1616
resolve: {

0 commit comments

Comments
 (0)