Skip to content

Use prop-types lib instead of deprecated React.PropTypes #13

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
jgimbel merged 1 commit into from
Apr 26, 2017
Merged

Use prop-types lib instead of deprecated React.PropTypes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions dist/control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ var _react = require('react');

var _reactLeaflet = require('react-leaflet');

var _propTypes = require('prop-types');

var _propTypes2 = _interopRequireDefault(_propTypes);

var _leaflet = require('leaflet');

var _Control = require('./Control.Dumb');
Expand All @@ -36,31 +40,30 @@ var Control = function (_MapControl) {
function Control(props) {
_classCallCheck(this, Control);

return _possibleConstructorReturn(this, Object.getPrototypeOf(Control).call(this, props));
return _possibleConstructorReturn(this, (Control.__proto__ || Object.getPrototypeOf(Control)).call(this, props));
}

_createClass(Control, [{
key: 'componentWillMount',
value: function componentWillMount() {
var _props = this.props;
var _children = _props.children;
var _map = _props.map;
var popupContainer = _props.popupContainer;

var props = _objectWithoutProperties(_props, ['children', 'map', 'popupContainer']);
var _props = this.props,
_children = _props.children,
_map = _props.map,
popupContainer = _props.popupContainer,
props = _objectWithoutProperties(_props, ['children', 'map', 'popupContainer']);

this.leafletElement = new _Control2.default(props);
}
}, {
key: 'componentDidMount',
value: function componentDidMount() {
_get(Object.getPrototypeOf(Control.prototype), 'componentDidMount', this).call(this);
_get(Control.prototype.__proto__ || Object.getPrototypeOf(Control.prototype), 'componentDidMount', this).call(this);
this.renderContent();
}
}, {
key: 'componentDidUpdate',
value: function componentDidUpdate(next) {
_get(Object.getPrototypeOf(Control.prototype), 'componentDidUpdate', this).call(this, next);
_get(Control.prototype.__proto__ || Object.getPrototypeOf(Control.prototype), 'componentDidUpdate', this).call(this, next);
this.renderContent();
}
}, {
Expand All @@ -87,9 +90,9 @@ var Control = function (_MapControl) {
Control.contextTypes = _reactLeaflet.MapControl.contextTypes;
Control.childContextTypes = _reactLeaflet.MapControl.childContextTypes;
Control.propTypes = {
children: _react.PropTypes.node,
map: _react.PropTypes.instanceOf(_leaflet.Map),
popupContainer: _react.PropTypes.object,
position: _react.PropTypes.string
children: _propTypes2.default.node,
map: _propTypes2.default.instanceOf(_leaflet.Map),
popupContainer: _propTypes2.default.object,
position: _propTypes2.default.string
};
exports.default = Control;
3 changes: 2 additions & 1 deletion lib/control.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, PropTypes, Children } from 'react';
import { Component, Children } from 'react';
import { MapControl } from 'react-leaflet';
import PropTypes from 'prop-types';
import { Map } from 'leaflet';
import Dumb from './Control.Dumb';
import { render, unmountComponentAtNode } from 'react-dom';
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react-leaflet": "^0.11.5"
},
"dependencies": {
"prop-types": "^15.5.7"
}
}