mirror of https://github.com/mastodon/mastodon.git
feat(tabs_bar): Avoid optimization for non-touch devices (#4444)
* fix(tabs_bar): Check if transition is necessary * feat(tabs_bar): Only apply optimization for touch devicespull/4445/head
parent
990cea471e
commit
4f04981dde
|
@ -3,6 +3,7 @@ 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';
|
import { debounce } from 'lodash';
|
||||||
|
import { isUserTouching } from '../../../is_mobile';
|
||||||
|
|
||||||
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>,
|
||||||
|
@ -39,27 +40,34 @@ export default class TabsBar extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
handleClick = (e) => {
|
handleClick = (e) => {
|
||||||
e.preventDefault();
|
// Only apply optimization for touch devices, which we assume are slower
|
||||||
e.persist();
|
// We thus avoid the 250ms delay for non-touch devices and the lag for touch devices
|
||||||
|
if (isUserTouching()) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.persist();
|
||||||
|
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
const tabs = Array(...this.node.querySelectorAll('.tabs-bar__link'));
|
const tabs = Array(...this.node.querySelectorAll('.tabs-bar__link'));
|
||||||
const currentTab = tabs.find(tab => tab.classList.contains('active'));
|
const currentTab = tabs.find(tab => tab.classList.contains('active'));
|
||||||
const nextTab = tabs.find(tab => tab.contains(e.target));
|
const nextTab = tabs.find(tab => tab.contains(e.target));
|
||||||
const { props: { to } } = links[Array(...this.node.childNodes).indexOf(nextTab)];
|
const { props: { to } } = links[Array(...this.node.childNodes).indexOf(nextTab)];
|
||||||
|
|
||||||
if (currentTab) {
|
|
||||||
currentTab.classList.remove('active');
|
|
||||||
}
|
|
||||||
|
|
||||||
const listener = debounce(() => {
|
if (currentTab !== nextTab) {
|
||||||
nextTab.removeEventListener('transitionend', listener);
|
if (currentTab) {
|
||||||
this.context.router.history.push(to);
|
currentTab.classList.remove('active');
|
||||||
}, 50);
|
}
|
||||||
|
|
||||||
nextTab.addEventListener('transitionend', listener);
|
const listener = debounce(() => {
|
||||||
nextTab.classList.add('active');
|
nextTab.removeEventListener('transitionend', listener);
|
||||||
});
|
this.context.router.history.push(to);
|
||||||
|
}, 50);
|
||||||
|
|
||||||
|
nextTab.addEventListener('transitionend', listener);
|
||||||
|
nextTab.classList.add('active');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue