Skip to content

Commit da4f780

Browse files
authored
Merge pull request #12 from cjpete/master
Use prop-types rather than React.PropTypes
2 parents 2cd6cf5 + 8ef1308 commit da4f780

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea
22
node_modules
3-
public
3+
public
4+
**/npm-debug.log

dist/scripts/switch.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
1414

1515
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
1616

17+
var _propTypes = require('prop-types');
18+
19+
var _propTypes2 = _interopRequireDefault(_propTypes);
20+
1721
var _react = require('react');
1822

1923
var _react2 = _interopRequireDefault(_react);
2024

21-
var Switch = (function (_React$Component) {
22-
_inherits(Switch, _React$Component);
25+
var Switch = (function (_Component) {
26+
_inherits(Switch, _Component);
2327

2428
_createClass(Switch, null, [{
2529
key: 'propTypes',
2630
value: {
27-
on: _react2['default'].PropTypes.bool,
28-
onClick: _react2['default'].PropTypes.func,
29-
enabled: _react2['default'].PropTypes.bool,
30-
className: _react2['default'].PropTypes.string
31+
on: _propTypes2['default'].bool,
32+
onClick: _propTypes2['default'].func,
33+
enabled: _propTypes2['default'].bool,
34+
className: _propTypes2['default'].string
3135
},
3236
enumerable: true
3337
}, {
@@ -77,7 +81,7 @@ var Switch = (function (_React$Component) {
7781
}]);
7882

7983
return Switch;
80-
})(_react2['default'].Component);
84+
})(_react.Component);
8185

8286
exports['default'] = Switch;
8387
module.exports = exports['default'];

dist/scripts/switch.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/app/scripts/main.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React from 'react';
1+
import React, {Component} from 'react';
22
import ReactDom from 'react-dom';
33
import Switch from 'react-toggle-switch';
44
import 'styles/main.scss';
55

6-
class Usage1 extends React.Component {
6+
class Usage1 extends Component {
77
constructor(props) {
88
super(props);
99
this.state = {on: false};
@@ -20,7 +20,7 @@ class Usage1 extends React.Component {
2020
}
2121
}
2222

23-
class Usage2 extends React.Component {
23+
class Usage2 extends Component {
2424
constructor(props) {
2525
super(props);
2626
this.state = {on: false};
@@ -40,7 +40,7 @@ class Usage2 extends React.Component {
4040
}
4141
}
4242

43-
class Usage3 extends React.Component {
43+
class Usage3 extends Component {
4444
constructor(props) {
4545
super(props);
4646
this.state = {on: false};
@@ -59,7 +59,7 @@ class Usage3 extends React.Component {
5959
}
6060
}
6161

62-
class App extends React.Component {
62+
class App extends Component {
6363
constructor(props) {
6464
super(props);
6565
this.state = {
@@ -79,4 +79,4 @@ class App extends React.Component {
7979
}
8080
}
8181

82-
ReactDom.render(<App/>, document.getElementById('app'));
82+
ReactDom.render(<App/>, document.getElementById('app'));

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"name": "react-toggle-switch",
3-
"version": "2.1.3",
3+
"version": "2.1.4",
44
"description": "Simple iOS inspired toggle switch",
55
"scripts": {
66
"dist": "gulp"
77
},
88
"peerDependencies": {
9-
"react": ">=0.13.3"
9+
"react": ">=0.13.3",
10+
"prop-types": "^15.5.10"
1011
},
1112
"devDependencies": {
1213
"gulp": "^3.9.1",

src/scripts/switch.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import React from 'react';
1+
import PropTypes from 'prop-types';
2+
import React, {Component} from 'react';
23

3-
export default class Switch extends React.Component {
4+
export default class Switch extends Component {
45
static propTypes = {
5-
on: React.PropTypes.bool,
6-
onClick: React.PropTypes.func,
7-
enabled: React.PropTypes.bool,
8-
className: React.PropTypes.string
6+
on: PropTypes.bool,
7+
onClick: PropTypes.func,
8+
enabled: PropTypes.bool,
9+
className: PropTypes.string
910
};
1011

1112
static defaultProps = {
@@ -40,4 +41,4 @@ export default class Switch extends React.Component {
4041
</div>
4142
);
4243
}
43-
}
44+
}

0 commit comments

Comments
 (0)