Skip to content

Commit 972759a

Browse files
committed
React 15.5 React.PropTypes deprecation
1 parent 9e7e849 commit 972759a

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

lib/index.js

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
(function (global, factory) {
22
if (typeof define === "function" && define.amd) {
3-
define(['module', 'exports', 'react'], factory);
3+
define(['module', 'exports', 'react', 'prop-types'], factory);
44
} else if (typeof exports !== "undefined") {
5-
factory(module, exports, require('react'));
5+
factory(module, exports, require('react'), require('prop-types'));
66
} else {
77
var mod = {
88
exports: {}
99
};
10-
factory(mod, mod.exports, global.React);
10+
factory(mod, mod.exports, global.React, global.propTypes);
1111
global.TextTruncate = mod.exports;
1212
}
13-
})(this, function (module, exports, _react) {
13+
})(this, function (module, exports, _react, _propTypes) {
1414
'use strict';
1515

1616
Object.defineProperty(exports, "__esModule", {
@@ -19,6 +19,8 @@
1919

2020
var _react2 = _interopRequireDefault(_react);
2121

22+
var _propTypes2 = _interopRequireDefault(_propTypes);
23+
2224
function _interopRequireDefault(obj) {
2325
return obj && obj.__esModule ? obj : {
2426
default: obj
@@ -133,14 +135,13 @@
133135
}, {
134136
key: 'getRenderText',
135137
value: function getRenderText() {
136-
var _props = this.props;
137-
var containerClassName = _props.containerClassName;
138-
var line = _props.line;
139-
var text = _props.text;
140-
var textTruncateChild = _props.textTruncateChild;
141-
var truncateText = _props.truncateText;
142-
143-
var props = _objectWithoutProperties(_props, ['containerClassName', 'line', 'text', 'textTruncateChild', 'truncateText']);
138+
var _props = this.props,
139+
containerClassName = _props.containerClassName,
140+
line = _props.line,
141+
text = _props.text,
142+
textTruncateChild = _props.textTruncateChild,
143+
truncateText = _props.truncateText,
144+
props = _objectWithoutProperties(_props, ['containerClassName', 'line', 'text', 'textTruncateChild', 'truncateText']);
144145

145146
var scopeWidth = this.refs.scope.getBoundingClientRect().width;
146147

@@ -230,9 +231,9 @@
230231
}, {
231232
key: 'render',
232233
value: function render() {
233-
var _props2 = this.props;
234-
var text = _props2.text;
235-
var containerClassName = _props2.containerClassName;
234+
var _props2 = this.props,
235+
text = _props2.text,
236+
containerClassName = _props2.containerClassName;
236237

237238

238239
var renderText = text;
@@ -252,11 +253,11 @@
252253
}(_react.Component);
253254

254255
TextTruncate.propTypes = {
255-
containerClassName: _react2.default.PropTypes.string,
256-
line: _react2.default.PropTypes.number,
257-
text: _react2.default.PropTypes.string,
258-
textTruncateChild: _react2.default.PropTypes.node,
259-
truncateText: _react2.default.PropTypes.string
256+
containerClassName: _propTypes2.default.string,
257+
line: _propTypes2.default.number,
258+
text: _propTypes2.default.string,
259+
textTruncateChild: _propTypes2.default.node,
260+
truncateText: _propTypes2.default.string
260261
};
261262
TextTruncate.defaultProps = {
262263
line: 1,

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,8 @@
4747
"peerDependencies": {
4848
"react": "^0.14.7 || ^15.0.0",
4949
"react-dom": "^0.14.7 || ^15.0.0"
50+
},
51+
"dependencies": {
52+
"prop-types": "^15.5.4"
5053
}
5154
}

src/TextTruncate.js

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

34
export default class TextTruncate extends Component {
45
static propTypes = {
5-
containerClassName: React.PropTypes.string,
6-
line: React.PropTypes.number,
7-
text: React.PropTypes.string,
8-
textTruncateChild: React.PropTypes.node,
9-
truncateText: React.PropTypes.string
6+
containerClassName: PropTypes.string,
7+
line: PropTypes.number,
8+
text: PropTypes.string,
9+
textTruncateChild: PropTypes.node,
10+
truncateText: PropTypes.string
1011
};
1112

1213
static defaultProps = {

0 commit comments

Comments
 (0)