Skip to content

Commit dfa4466

Browse files
committed
Account for arbitrary, breaking PropTypes change in React 15.5
1 parent 25622dc commit dfa4466

File tree

4 files changed

+35
-31
lines changed

4 files changed

+35
-31
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@
5353
"react": "^15.4.2",
5454
"react-addons-test-utils": "^15.4.2",
5555
"react-dom": "^15.4.2",
56+
"react-test-renderer": "^15.5.4",
5657
"webpack": "^2.2.1",
5758
"webpack-stream": "^3.2.0"
5859
},
5960
"dependencies": {
6061
"classnames": "^2.2.5",
62+
"prop-types": "^15.5.8",
6163
"shortid": "^2.2.6"
6264
}
6365
}

src/js/CheckboxTree.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import PropTypes from 'prop-types';
12
import React from 'react';
23
import shortid from 'shortid';
34

@@ -6,15 +7,15 @@ import nodeShape from './nodeShape';
67

78
class CheckboxTree extends React.Component {
89
static propTypes = {
9-
nodes: React.PropTypes.arrayOf(nodeShape).isRequired,
10-
11-
checked: React.PropTypes.arrayOf(React.PropTypes.string),
12-
expanded: React.PropTypes.arrayOf(React.PropTypes.string),
13-
name: React.PropTypes.string,
14-
nameAsArray: React.PropTypes.bool,
15-
optimisticToggle: React.PropTypes.bool,
16-
onCheck: React.PropTypes.func,
17-
onExpand: React.PropTypes.func,
10+
nodes: PropTypes.arrayOf(nodeShape).isRequired,
11+
12+
checked: PropTypes.arrayOf(React.PropTypes.string),
13+
expanded: PropTypes.arrayOf(React.PropTypes.string),
14+
name: PropTypes.string,
15+
nameAsArray: PropTypes.bool,
16+
optimisticToggle: PropTypes.bool,
17+
onCheck: PropTypes.func,
18+
onExpand: PropTypes.func,
1819
};
1920

2021
static defaultProps = {

src/js/TreeNode.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
import classNames from 'classnames';
2+
import PropTypes from 'prop-types';
23
import React from 'react';
34

45
import nodeShape from './nodeShape';
56

67
class TreeNode extends React.Component {
78
static propTypes = {
8-
checked: React.PropTypes.number.isRequired,
9-
expanded: React.PropTypes.bool.isRequired,
10-
label: React.PropTypes.string.isRequired,
11-
optimisticToggle: React.PropTypes.bool.isRequired,
12-
treeId: React.PropTypes.string.isRequired,
13-
value: React.PropTypes.string.isRequired,
14-
onCheck: React.PropTypes.func.isRequired,
15-
onExpand: React.PropTypes.func.isRequired,
16-
17-
children: React.PropTypes.node,
18-
icon: React.PropTypes.node,
19-
rawChildren: React.PropTypes.arrayOf(nodeShape),
9+
checked: PropTypes.number.isRequired,
10+
expanded: PropTypes.bool.isRequired,
11+
label: PropTypes.string.isRequired,
12+
optimisticToggle: PropTypes.bool.isRequired,
13+
treeId: PropTypes.string.isRequired,
14+
value: PropTypes.string.isRequired,
15+
onCheck: PropTypes.func.isRequired,
16+
onExpand: PropTypes.func.isRequired,
17+
18+
children: PropTypes.node,
19+
icon: PropTypes.node,
20+
rawChildren: PropTypes.arrayOf(nodeShape),
2021
};
2122

2223
static defaultProps = {

src/js/nodeShape.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import React from 'react';
1+
import PropTypes from 'prop-types';
22

33
const nodeShape = {
4-
label: React.PropTypes.string.isRequired,
5-
value: React.PropTypes.oneOfType([
6-
React.PropTypes.string,
7-
React.PropTypes.number,
4+
label: PropTypes.string.isRequired,
5+
value: PropTypes.oneOfType([
6+
PropTypes.string,
7+
PropTypes.number,
88
]).isRequired,
99

10-
icon: React.PropTypes.node,
10+
icon: PropTypes.node,
1111
};
1212

13-
const nodeShapeWithChildren = React.PropTypes.oneOfType([
14-
React.PropTypes.shape(nodeShape),
15-
React.PropTypes.shape({
13+
const nodeShapeWithChildren = PropTypes.oneOfType([
14+
PropTypes.shape(nodeShape),
15+
PropTypes.shape({
1616
...nodeShape,
17-
children: React.PropTypes.arrayOf(nodeShape).isRequired,
17+
children: PropTypes.arrayOf(nodeShape).isRequired,
1818
}),
1919
]);
2020

0 commit comments

Comments
 (0)