Remove deprecated features at React v15.5 (#1905)
* Remove deprecated features at React v15.5
- [x] React.PropTypes
- [x] react-addons-pure-render-mixin
- [x] react-addons-test-utils
* Uncommented out & Add browserify_rails options
* re-add react-addons-shallow
* Fix syntax error from resolve conflicts
* follow up 59a77923b3
			
			
This commit is contained in:
		
							parent
							
								
									27ea2a88c1
								
							
						
					
					
						commit
						1948f9e767
					
				
					 83 changed files with 1441 additions and 1291 deletions
				
			
		|  | @ -1,5 +1,5 @@ | |||
| import { connect } from 'react-redux'; | ||||
| import PureRenderMixin from 'react-addons-pure-render-mixin'; | ||||
| import PropTypes from 'prop-types'; | ||||
| import ImmutablePropTypes from 'react-immutable-proptypes'; | ||||
| import LoadingIndicator from '../../components/loading_indicator'; | ||||
| import { fetchFavourites } from '../../actions/interactions'; | ||||
|  | @ -12,25 +12,17 @@ const mapStateToProps = (state, props) => ({ | |||
|   accountIds: state.getIn(['user_lists', 'favourited_by', Number(props.params.statusId)]) | ||||
| }); | ||||
| 
 | ||||
| const Favourites = React.createClass({ | ||||
| 
 | ||||
|   propTypes: { | ||||
|     params: React.PropTypes.object.isRequired, | ||||
|     dispatch: React.PropTypes.func.isRequired, | ||||
|     accountIds: ImmutablePropTypes.list | ||||
|   }, | ||||
| 
 | ||||
|   mixins: [PureRenderMixin], | ||||
| class Favourites extends React.PureComponent { | ||||
| 
 | ||||
|   componentWillMount () { | ||||
|     this.props.dispatch(fetchFavourites(Number(this.props.params.statusId))); | ||||
|   }, | ||||
|   } | ||||
| 
 | ||||
|   componentWillReceiveProps(nextProps) { | ||||
|     if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) { | ||||
|       this.props.dispatch(fetchFavourites(Number(nextProps.params.statusId))); | ||||
|     } | ||||
|   }, | ||||
|   } | ||||
| 
 | ||||
|   render () { | ||||
|     const { accountIds } = this.props; | ||||
|  | @ -56,6 +48,12 @@ const Favourites = React.createClass({ | |||
|     ); | ||||
|   } | ||||
| 
 | ||||
| }); | ||||
| } | ||||
| 
 | ||||
| Favourites.propTypes = { | ||||
|   params: PropTypes.object.isRequired, | ||||
|   dispatch: PropTypes.func.isRequired, | ||||
|   accountIds: ImmutablePropTypes.list | ||||
| }; | ||||
| 
 | ||||
| export default connect(mapStateToProps)(Favourites); | ||||
|  |  | |||
		Reference in a new issue