* Refactor shouldUpdateScroll passing So far, shouldUpdateScroll has been manually passed down from the very top of the React component hierarchy even though it is a static function common to all ScrollContainer instances, so replaced that with a custom class extending ScrollContainer. * Generalize “press back to close modal” to any modal and to public pages * Fix boost confirmation modal closing media modal
		
			
				
	
	
		
			87 lines
		
	
	
	
		
			2.7 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
	
		
			2.7 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| import React from 'react';
 | |
| import { connect } from 'react-redux';
 | |
| import ImmutablePureComponent from 'react-immutable-pure-component';
 | |
| import PropTypes from 'prop-types';
 | |
| import ImmutablePropTypes from 'react-immutable-proptypes';
 | |
| import LoadingIndicator from '../../components/loading_indicator';
 | |
| import { fetchReblogs } from '../../actions/interactions';
 | |
| import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 | |
| import AccountContainer from '../../containers/account_container';
 | |
| import Column from '../ui/components/column';
 | |
| import ScrollableList from '../../components/scrollable_list';
 | |
| import Icon from 'mastodon/components/icon';
 | |
| import ColumnHeader from '../../components/column_header';
 | |
| 
 | |
| const messages = defineMessages({
 | |
|   refresh: { id: 'refresh', defaultMessage: 'Refresh' },
 | |
| });
 | |
| 
 | |
| const mapStateToProps = (state, props) => ({
 | |
|   accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
 | |
| });
 | |
| 
 | |
| export default @connect(mapStateToProps)
 | |
| @injectIntl
 | |
| class Reblogs extends ImmutablePureComponent {
 | |
| 
 | |
|   static propTypes = {
 | |
|     params: PropTypes.object.isRequired,
 | |
|     dispatch: PropTypes.func.isRequired,
 | |
|     accountIds: ImmutablePropTypes.list,
 | |
|     multiColumn: PropTypes.bool,
 | |
|     intl: PropTypes.object.isRequired,
 | |
|   };
 | |
| 
 | |
|   componentWillMount () {
 | |
|     if (!this.props.accountIds) {
 | |
|       this.props.dispatch(fetchReblogs(this.props.params.statusId));
 | |
|     }
 | |
|   }
 | |
| 
 | |
|   componentWillReceiveProps(nextProps) {
 | |
|     if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
 | |
|       this.props.dispatch(fetchReblogs(nextProps.params.statusId));
 | |
|     }
 | |
|   }
 | |
| 
 | |
|   handleRefresh = () => {
 | |
|     this.props.dispatch(fetchReblogs(this.props.params.statusId));
 | |
|   }
 | |
| 
 | |
|   render () {
 | |
|     const { intl, accountIds, multiColumn } = this.props;
 | |
| 
 | |
|     if (!accountIds) {
 | |
|       return (
 | |
|         <Column>
 | |
|           <LoadingIndicator />
 | |
|         </Column>
 | |
|       );
 | |
|     }
 | |
| 
 | |
|     const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this toot yet. When someone does, they will show up here.' />;
 | |
| 
 | |
|     return (
 | |
|       <Column bindToDocument={!multiColumn}>
 | |
|         <ColumnHeader
 | |
|           showBackButton
 | |
|           multiColumn={multiColumn}
 | |
|           extraButton={(
 | |
|             <button className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
 | |
|           )}
 | |
|         />
 | |
| 
 | |
|         <ScrollableList
 | |
|           scrollKey='reblogs'
 | |
|           emptyMessage={emptyMessage}
 | |
|           bindToDocument={!multiColumn}
 | |
|         >
 | |
|           {accountIds.map(id =>
 | |
|             <AccountContainer key={id} id={id} withNote={false} />,
 | |
|           )}
 | |
|         </ScrollableList>
 | |
|       </Column>
 | |
|     );
 | |
|   }
 | |
| 
 | |
| }
 |