Skip to content

Commit

Permalink
fix(status): Don't add tabIndex to wrapped status (#4437)
Browse files Browse the repository at this point in the history
  • Loading branch information
unarist authored and Gargron committed Jul 29, 2017
1 parent a46ba4a commit a5e0cf2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/javascript/mastodon/components/status.js
Expand Up @@ -172,7 +172,7 @@ export default class Status extends ImmutablePureComponent {

// Exclude intersectionObserverWrapper from `other` variable
// because intersection is managed in here.
const { status, account, intersectionObserverWrapper, index, listLength, ...other } = this.props;
const { status, account, intersectionObserverWrapper, index, listLength, wrapped, ...other } = this.props;
const { isExpanded, isIntersecting, isHidden } = this.state;

if (status === null) {
Expand Down Expand Up @@ -234,7 +234,7 @@ export default class Status extends ImmutablePureComponent {
}

return (
<article aria-posinset={index} aria-setsize={listLength} className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`} data-id={status.get('id')} tabIndex='0' ref={this.handleRef}>
<article aria-posinset={index} aria-setsize={listLength} className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`} data-id={status.get('id')} tabIndex={wrapped ? null : '0'} ref={this.handleRef}>
<div className='status__info'>
<a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>

Expand Down

0 comments on commit a5e0cf2

Please sign in to comment.