commit: 3d378ed0b42eab98f74ba1572924029e7d6992ac
parent: 7e0c00a555ddf9140800356535ef9e683ef0eb00
Author: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 28 Jul 2017 22:55:13 +0200
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
Diffstat:
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import NavLink from 'react-router-dom/NavLink';
import { FormattedMessage, injectIntl } from 'react-intl';
+import { debounce } from 'lodash';
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>,
@@ -25,16 +26,47 @@ export function getLink (index) {
@injectIntl
export default class TabsBar extends React.Component {
+ static contextTypes = {
+ router: PropTypes.object.isRequired,
+ }
+
static propTypes = {
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 () {
const { intl: { formatMessage } } = this.props;
return (
- <nav className='tabs-bar'>
- {links.map(link => React.cloneElement(link, { key: link.props.to, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
+ <nav className='tabs-bar' ref={this.setRef}>
+ {links.map(link => React.cloneElement(link, { key: link.props.to, onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
</nav>
);
}