Skip to content

React 15.5 React.PropTypes deprecation #44

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

React 15.5 React.PropTypes deprecation #44

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
41 changes: 21 additions & 20 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define(['module', 'exports', 'react'], factory);
define(['module', 'exports', 'react', 'prop-types'], factory);
} else if (typeof exports !== "undefined") {
factory(module, exports, require('react'));
factory(module, exports, require('react'), require('prop-types'));
} else {
var mod = {
exports: {}
};
factory(mod, mod.exports, global.React);
factory(mod, mod.exports, global.React, global.propTypes);
global.TextTruncate = mod.exports;
}
})(this, function (module, exports, _react) {
})(this, function (module, exports, _react, _propTypes) {
'use strict';

Object.defineProperty(exports, "__esModule", {
Expand All @@ -19,6 +19,8 @@

var _react2 = _interopRequireDefault(_react);

var _propTypes2 = _interopRequireDefault(_propTypes);

function _interopRequireDefault(obj) {
return obj && obj.__esModule ? obj : {
default: obj
Expand Down Expand Up @@ -133,14 +135,13 @@
}, {
key: 'getRenderText',
value: function getRenderText() {
var _props = this.props;
var containerClassName = _props.containerClassName;
var line = _props.line;
var text = _props.text;
var textTruncateChild = _props.textTruncateChild;
var truncateText = _props.truncateText;

var props = _objectWithoutProperties(_props, ['containerClassName', 'line', 'text', 'textTruncateChild', 'truncateText']);
var _props = this.props,
containerClassName = _props.containerClassName,
line = _props.line,
text = _props.text,
textTruncateChild = _props.textTruncateChild,
truncateText = _props.truncateText,
props = _objectWithoutProperties(_props, ['containerClassName', 'line', 'text', 'textTruncateChild', 'truncateText']);

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

Expand Down Expand Up @@ -230,9 +231,9 @@
}, {
key: 'render',
value: function render() {
var _props2 = this.props;
var text = _props2.text;
var containerClassName = _props2.containerClassName;
var _props2 = this.props,
text = _props2.text,
containerClassName = _props2.containerClassName;


var renderText = text;
Expand All @@ -252,11 +253,11 @@
}(_react.Component);

TextTruncate.propTypes = {
containerClassName: _react2.default.PropTypes.string,
line: _react2.default.PropTypes.number,
text: _react2.default.PropTypes.string,
textTruncateChild: _react2.default.PropTypes.node,
truncateText: _react2.default.PropTypes.string
containerClassName: _propTypes2.default.string,
line: _propTypes2.default.number,
text: _propTypes2.default.string,
textTruncateChild: _propTypes2.default.node,
truncateText: _propTypes2.default.string
};
TextTruncate.defaultProps = {
line: 1,
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 @@ -47,5 +47,8 @@
"peerDependencies": {
"react": "^0.14.7 || ^15.0.0",
"react-dom": "^0.14.7 || ^15.0.0"
},
"dependencies": {
"prop-types": "^15.5.4"
}
}
11 changes: 6 additions & 5 deletions src/TextTruncate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';

export default class TextTruncate extends Component {
static propTypes = {
containerClassName: React.PropTypes.string,
line: React.PropTypes.number,
text: React.PropTypes.string,
textTruncateChild: React.PropTypes.node,
truncateText: React.PropTypes.string
containerClassName: PropTypes.string,
line: PropTypes.number,
text: PropTypes.string,
textTruncateChild: PropTypes.node,
truncateText: PropTypes.string
};

static defaultProps = {
Expand Down