djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Use withRouter for TabsBar

Browse Source 
Port 61e6275781 to glitch-soc
This commit is contained in:
Thibaut Girka 2018-08-31 13:34:58 +02:00 committed by ThibG
parent 5f035a2a1a
commit 76a3f373e3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { NavLink } from 'react-router-dom'; import { NavLink, withRouter } from 'react-router-dom';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import { isUserTouching } from 'flavours/glitch/util/is_mobile'; import { isUserTouching } from 'flavours/glitch/util/is_mobile';
@ -24,14 +24,12 @@ export function getLink (index) {
} }
@injectIntl @injectIntl
export default class TabsBar extends React.Component { @withRouter
export default class TabsBar extends React.PureComponent {
static contextTypes = {
router: PropTypes.object.isRequired,
}
static propTypes = { static propTypes = {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
} }
setRef = ref => { setRef = ref => {
@ -59,7 +57,7 @@ export default class TabsBar extends React.Component {
const listener = debounce(() => { const listener = debounce(() => {
nextTab.removeEventListener('transitionend', listener); nextTab.removeEventListener('transitionend', listener);
this.context.router.history.push(to); this.props.history.push(to);
}, 50); }, 50);
nextTab.addEventListener('transitionend', listener); nextTab.addEventListener('transitionend', listener);