08e4c78e78
* Fix accessibility of column headers As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed: * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling. * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks. * I didn't even realize there was a Settings toggle until I made this change. Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands. Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks! * Styling fixes * Fixed overflow issue
156 lines
5.2 KiB
JavaScript
156 lines
5.2 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import classNames from 'classnames';
|
|
import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
|
|
|
|
const messages = defineMessages({
|
|
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
|
|
hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
|
|
moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
|
|
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
|
|
});
|
|
|
|
@injectIntl
|
|
export default class ColumnHeader extends React.PureComponent {
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object,
|
|
};
|
|
|
|
static propTypes = {
|
|
intl: PropTypes.object.isRequired,
|
|
title: PropTypes.node.isRequired,
|
|
icon: PropTypes.string.isRequired,
|
|
active: PropTypes.bool,
|
|
multiColumn: PropTypes.bool,
|
|
showBackButton: PropTypes.bool,
|
|
children: PropTypes.node,
|
|
pinned: PropTypes.bool,
|
|
onPin: PropTypes.func,
|
|
onMove: PropTypes.func,
|
|
onClick: PropTypes.func,
|
|
};
|
|
|
|
state = {
|
|
collapsed: true,
|
|
animating: false,
|
|
};
|
|
|
|
handleToggleClick = (e) => {
|
|
e.stopPropagation();
|
|
this.setState({ collapsed: !this.state.collapsed, animating: true });
|
|
}
|
|
|
|
handleTitleClick = () => {
|
|
this.props.onClick();
|
|
}
|
|
|
|
handleMoveLeft = () => {
|
|
this.props.onMove(-1);
|
|
}
|
|
|
|
handleMoveRight = () => {
|
|
this.props.onMove(1);
|
|
}
|
|
|
|
handleBackClick = () => {
|
|
if (window.history && window.history.length === 1) this.context.router.history.push('/');
|
|
else this.context.router.history.goBack();
|
|
}
|
|
|
|
handleTransitionEnd = () => {
|
|
this.setState({ animating: false });
|
|
}
|
|
|
|
render () {
|
|
const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage } } = this.props;
|
|
const { collapsed, animating } = this.state;
|
|
|
|
const wrapperClassName = classNames('column-header__wrapper', {
|
|
'active': active,
|
|
});
|
|
|
|
const buttonClassName = classNames('column-header', {
|
|
'active': active,
|
|
});
|
|
|
|
const collapsibleClassName = classNames('column-header__collapsible', {
|
|
'collapsed': collapsed,
|
|
'animating': animating,
|
|
});
|
|
|
|
const collapsibleButtonClassName = classNames('column-header__button', {
|
|
'active': !collapsed,
|
|
});
|
|
|
|
let extraContent, pinButton, moveButtons, backButton, collapseButton;
|
|
|
|
if (children) {
|
|
extraContent = (
|
|
<div key='extra-content' className='column-header__collapsible__extra'>
|
|
{children}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (multiColumn && pinned) {
|
|
pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
|
|
|
|
moveButtons = (
|
|
<div key='move-buttons' className='column-header__setting-arrows'>
|
|
<button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='text-btn column-header__setting-btn' onClick={this.handleMoveLeft}><i className='fa fa-chevron-left' /></button>
|
|
<button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='text-btn column-header__setting-btn' onClick={this.handleMoveRight}><i className='fa fa-chevron-right' /></button>
|
|
</div>
|
|
);
|
|
} else if (multiColumn) {
|
|
pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
|
|
}
|
|
|
|
if (!pinned && (multiColumn || showBackButton)) {
|
|
backButton = (
|
|
<button onClick={this.handleBackClick} className='column-header__back-button'>
|
|
<i className='fa fa-fw fa-chevron-left column-back-button__icon' />
|
|
<FormattedMessage id='column_back_button.label' defaultMessage='Back' />
|
|
</button>
|
|
);
|
|
}
|
|
|
|
const collapsedContent = [
|
|
extraContent,
|
|
];
|
|
|
|
if (multiColumn) {
|
|
collapsedContent.push(moveButtons);
|
|
collapsedContent.push(pinButton);
|
|
}
|
|
|
|
if (children || multiColumn) {
|
|
collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
|
|
}
|
|
|
|
return (
|
|
<div className={wrapperClassName}>
|
|
<h1 className={buttonClassName}>
|
|
<button onClick={this.handleTitleClick}>
|
|
<i className={`fa fa-fw fa-${icon} column-header__icon`} />
|
|
<span className='column-header__title'>
|
|
{title}
|
|
</span>
|
|
</button>
|
|
|
|
<div className='column-header__buttons'>
|
|
{backButton}
|
|
{collapseButton}
|
|
</div>
|
|
</h1>
|
|
|
|
<div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}>
|
|
<div className='column-header__collapsible-inner'>
|
|
{(!collapsed || animating) && collapsedContent}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|