Change report modal to include category selection in web UI (#17565)
* Change report modal to include category selection in web UI * Various fixes and improvements - Change thank you text to be different based on category - Change starting headline to be different for account and status reports - Change toggle components to have a checkmark when checked - Fix report dialog being cut off on small screens - Fix thank you screen offering mute or block if already muted or blocked - Refactor toggle components in report dialog into one component * Change wording on final screen * Change checkboxes to be square when multiple options are possible
This commit is contained in:
		
							
								
								
									
										58
									
								
								app/javascript/mastodon/features/report/statuses.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										58
									
								
								app/javascript/mastodon/features/report/statuses.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,58 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import { connect } from 'react-redux';
 | 
			
		||||
import StatusCheckBox from 'mastodon/features/report/containers/status_check_box_container';
 | 
			
		||||
import { OrderedSet } from 'immutable';
 | 
			
		||||
import { FormattedMessage } from 'react-intl';
 | 
			
		||||
import Button from 'mastodon/components/button';
 | 
			
		||||
 | 
			
		||||
const mapStateToProps = (state, { accountId }) => ({
 | 
			
		||||
  availableStatusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])),
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
export default @connect(mapStateToProps)
 | 
			
		||||
class Statuses extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
  static propTypes = {
 | 
			
		||||
    onNextStep: PropTypes.func.isRequired,
 | 
			
		||||
    accountId: PropTypes.string.isRequired,
 | 
			
		||||
    availableStatusIds: ImmutablePropTypes.set.isRequired,
 | 
			
		||||
    selectedStatusIds: ImmutablePropTypes.set.isRequired,
 | 
			
		||||
    onToggle: PropTypes.func.isRequired,
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleNextClick = () => {
 | 
			
		||||
    const { onNextStep } = this.props;
 | 
			
		||||
    onNextStep('comment');
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { availableStatusIds, selectedStatusIds, onToggle } = this.props;
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <React.Fragment>
 | 
			
		||||
        <h3 className='report-dialog-modal__title'><FormattedMessage id='report.statuses.title' defaultMessage='Are there any posts that back up this report?' /></h3>
 | 
			
		||||
        <p className='report-dialog-modal__lead'><FormattedMessage id='report.statuses.subtitle' defaultMessage='Select all that apply' /></p>
 | 
			
		||||
 | 
			
		||||
        <div className='report-dialog-modal__statuses'>
 | 
			
		||||
          {availableStatusIds.union(selectedStatusIds).map(statusId => (
 | 
			
		||||
            <StatusCheckBox
 | 
			
		||||
              id={statusId}
 | 
			
		||||
              key={statusId}
 | 
			
		||||
              checked={selectedStatusIds.includes(statusId)}
 | 
			
		||||
              onToggle={onToggle}
 | 
			
		||||
            />
 | 
			
		||||
          ))}
 | 
			
		||||
        </div>
 | 
			
		||||
 | 
			
		||||
        <div className='flex-spacer' />
 | 
			
		||||
 | 
			
		||||
        <div className='report-dialog-modal__actions'>
 | 
			
		||||
          <Button onClick={this.handleNextClick}><FormattedMessage id='report.next' defaultMessage='Next' /></Button>
 | 
			
		||||
        </div>
 | 
			
		||||
      </React.Fragment>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user