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:
		
							
								
								
									
										60
									
								
								app/javascript/mastodon/features/report/components/option.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								app/javascript/mastodon/features/report/components/option.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,60 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import classNames from 'classnames';
 | 
			
		||||
import Check from 'mastodon/components/check';
 | 
			
		||||
 | 
			
		||||
export default class Option extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
  static propTypes = {
 | 
			
		||||
    name: PropTypes.string.isRequired,
 | 
			
		||||
    value: PropTypes.string.isRequired,
 | 
			
		||||
    checked: PropTypes.bool,
 | 
			
		||||
    label: PropTypes.node,
 | 
			
		||||
    description: PropTypes.node,
 | 
			
		||||
    onToggle: PropTypes.func,
 | 
			
		||||
    multiple: PropTypes.bool,
 | 
			
		||||
    labelComponent: PropTypes.node,
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleKeyPress = e => {
 | 
			
		||||
    const { value, checked, onToggle } = this.props;
 | 
			
		||||
 | 
			
		||||
    if (e.key === 'Enter' || e.key === ' ') {
 | 
			
		||||
      e.stopPropagation();
 | 
			
		||||
      e.preventDefault();
 | 
			
		||||
      onToggle(value, !checked);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  handleChange = e => {
 | 
			
		||||
    const { value, onToggle } = this.props;
 | 
			
		||||
    onToggle(value, e.target.checked);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { name, value, checked, label, labelComponent, description, multiple } = this.props;
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <label className='dialog-option poll__option selectable'>
 | 
			
		||||
        <input type={multiple ? 'checkbox' : 'radio'} name={name} value={value} checked={checked} onChange={this.handleChange} />
 | 
			
		||||
 | 
			
		||||
        <span
 | 
			
		||||
          className={classNames('poll__input', { active: checked, checkbox: multiple })}
 | 
			
		||||
          tabIndex='0'
 | 
			
		||||
          role='radio'
 | 
			
		||||
          onKeyPress={this.handleKeyPress}
 | 
			
		||||
          aria-checked={checked}
 | 
			
		||||
          aria-label={label}
 | 
			
		||||
        >{checked && <Check />}</span>
 | 
			
		||||
 | 
			
		||||
        {labelComponent ? labelComponent : (
 | 
			
		||||
          <span className='poll__option__text'>
 | 
			
		||||
            <strong>{label}</strong>
 | 
			
		||||
            {description}
 | 
			
		||||
          </span>
 | 
			
		||||
        )}
 | 
			
		||||
      </label>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user