Skip to content

Commit

Permalink
Fix swiping columns on mobile sometimes failing (mastodon#11200)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire authored and hiyuki2578 committed Oct 2, 2019
1 parent 3fc3230 commit e74b88a
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ class ColumnsArea extends ImmutablePureComponent {
// React-router does this for us, but too late, feeling laggy.
document.querySelector(currentLinkSelector).classList.remove('active');
document.querySelector(nextLinkSelector).classList.add('active');

if (!this.state.shouldAnimate && typeof this.pendingIndex === 'number') {
this.context.router.history.push(getLink(this.pendingIndex));
this.pendingIndex = null;
}
}

handleAnimationEnd = () => {
Expand Down Expand Up @@ -160,7 +165,6 @@ class ColumnsArea extends ImmutablePureComponent {
const { shouldAnimate } = this.state;

const columnIndex = getIndex(this.context.router.history.location.pathname);
this.pendingIndex = null;

if (singleColumn) {
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
Expand Down

0 comments on commit e74b88a

Please sign in to comment.