* feat(aria): Add aria-labels to underlabelled tab nav items The drawer tabs which control primary navigation are only labelled by a title which is not available to many screenreaders. Add an aria-label attribute to each link to improve readability with screenreaders. Organize link attributes so link target is first followed by classname. Issue #1349 * feat(aria): Replace abstract aria role of section with region Abstract aria roles such as section should not be used in content. Use non-abstract 'region' aria role instead. That role expects an aria-labelledby attribute with an id. Pass an ID to the column header. Remove the aria-label attribute on the ColumnHeader because the same value is output in plaintext as its child. Issue #1349 * fix(aria): Remove aria-controls attribute until solution is found Columns do not have wrappers, so these icons can't point to a column wrapper which it controls. Instead these icons function as triggers to show or hide individual columns. #1349 * fix(typo): Remove type of aria-labelledby instead of aria-label
		
			
				
	
	
		
			85 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			85 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
import ComposeFormContainer from './containers/compose_form_container';
 | 
						|
import UploadFormContainer from './containers/upload_form_container';
 | 
						|
import NavigationContainer from './containers/navigation_container';
 | 
						|
import PropTypes from 'prop-types';
 | 
						|
import { connect } from 'react-redux';
 | 
						|
import { mountCompose, unmountCompose } from '../../actions/compose';
 | 
						|
import { Link } from 'react-router';
 | 
						|
import { injectIntl, defineMessages } from 'react-intl';
 | 
						|
import SearchContainer from './containers/search_container';
 | 
						|
import { Motion, spring } from 'react-motion';
 | 
						|
import SearchResultsContainer from './containers/search_results_container';
 | 
						|
 | 
						|
const messages = defineMessages({
 | 
						|
  start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
 | 
						|
  public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
 | 
						|
  community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
 | 
						|
  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
 | 
						|
  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }
 | 
						|
});
 | 
						|
 | 
						|
const mapStateToProps = state => ({
 | 
						|
  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden'])
 | 
						|
});
 | 
						|
 | 
						|
class Compose extends React.PureComponent {
 | 
						|
 | 
						|
  componentDidMount () {
 | 
						|
    this.props.dispatch(mountCompose());
 | 
						|
  }
 | 
						|
 | 
						|
  componentWillUnmount () {
 | 
						|
    this.props.dispatch(unmountCompose());
 | 
						|
  }
 | 
						|
 | 
						|
  render () {
 | 
						|
    const { withHeader, showSearch, intl } = this.props;
 | 
						|
 | 
						|
    let header = '';
 | 
						|
 | 
						|
    if (withHeader) {
 | 
						|
      header = (
 | 
						|
        <div className='drawer__header'>
 | 
						|
          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><i className='fa fa-fw fa-asterisk' /></Link>
 | 
						|
          <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><i className='fa fa-fw fa-users' /></Link>
 | 
						|
          <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><i className='fa fa-fw fa-globe' /></Link>
 | 
						|
          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><i className='fa fa-fw fa-cog' /></a>
 | 
						|
          <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)}><i className='fa fa-fw fa-sign-out' /></a>
 | 
						|
        </div>
 | 
						|
      );
 | 
						|
    }
 | 
						|
 | 
						|
    return (
 | 
						|
      <div className='drawer'>
 | 
						|
        {header}
 | 
						|
 | 
						|
        <SearchContainer />
 | 
						|
 | 
						|
        <div className='drawer__pager'>
 | 
						|
          <div className='drawer__inner'>
 | 
						|
            <NavigationContainer />
 | 
						|
            <ComposeFormContainer />
 | 
						|
          </div>
 | 
						|
 | 
						|
          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
 | 
						|
            {({ x }) =>
 | 
						|
              <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
 | 
						|
                <SearchResultsContainer />
 | 
						|
              </div>
 | 
						|
            }
 | 
						|
          </Motion>
 | 
						|
        </div>
 | 
						|
      </div>
 | 
						|
    );
 | 
						|
  }
 | 
						|
 | 
						|
}
 | 
						|
 | 
						|
Compose.propTypes = {
 | 
						|
  dispatch: PropTypes.func.isRequired,
 | 
						|
  withHeader: PropTypes.bool,
 | 
						|
  showSearch: PropTypes.bool,
 | 
						|
  intl: PropTypes.object.isRequired
 | 
						|
};
 | 
						|
 | 
						|
export default connect(mapStateToProps)(injectIntl(Compose));
 |