mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-21 20:15:10 +01:00
fix(tabs_bar): Allow animation to end before navigating (#4429)
* fix(tabs_bar): Allow animation to end before navigating * fix(tabs_bar): Do not use event.path
This commit is contained in:
parent
7e0c00a555
commit
3d378ed0b4
@ -2,6 +2,7 @@ import React from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import NavLink from 'react-router-dom/NavLink';
|
import NavLink from 'react-router-dom/NavLink';
|
||||||
import { FormattedMessage, injectIntl } from 'react-intl';
|
import { FormattedMessage, injectIntl } from 'react-intl';
|
||||||
|
import { debounce } from 'lodash';
|
||||||
|
|
||||||
export const links = [
|
export const links = [
|
||||||
<NavLink className='tabs-bar__link primary' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
|
<NavLink className='tabs-bar__link primary' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
|
||||||
@ -25,16 +26,47 @@ export function getLink (index) {
|
|||||||
@injectIntl
|
@injectIntl
|
||||||
export default class TabsBar extends React.Component {
|
export default class TabsBar extends React.Component {
|
||||||
|
|
||||||
|
static contextTypes = {
|
||||||
|
router: PropTypes.object.isRequired,
|
||||||
|
}
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
intl: PropTypes.object.isRequired,
|
intl: PropTypes.object.isRequired,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setRef = ref => {
|
||||||
|
this.node = ref;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleClick = (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.persist();
|
||||||
|
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
const tabs = Array(...this.node.querySelectorAll('.tabs-bar__link'));
|
||||||
|
const currentTab = tabs.find(tab => tab.classList.contains('active'));
|
||||||
|
const nextTab = tabs.find(tab => tab.contains(e.target));
|
||||||
|
const { props: { to } } = links[Array(...this.node.childNodes).indexOf(nextTab)];
|
||||||
|
|
||||||
|
currentTab.classList.remove('active');
|
||||||
|
|
||||||
|
const listener = debounce(() => {
|
||||||
|
nextTab.removeEventListener('transitionend', listener);
|
||||||
|
this.context.router.history.push(to);
|
||||||
|
}, 50);
|
||||||
|
|
||||||
|
nextTab.addEventListener('transitionend', listener);
|
||||||
|
nextTab.classList.add('active');
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { intl: { formatMessage } } = this.props;
|
const { intl: { formatMessage } } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<nav className='tabs-bar'>
|
<nav className='tabs-bar' ref={this.setRef}>
|
||||||
{links.map(link => React.cloneElement(link, { key: link.props.to, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
|
{links.map(link => React.cloneElement(link, { key: link.props.to, onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
|
||||||
</nav>
|
</nav>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user