MM-9922 Fixed CSS transition when mousing onto internal link
This commit is contained in:
parent
d1b70863b5
commit
71dcec33a4
|
@ -2,10 +2,6 @@ const React = require('react');
|
|||
const PropTypes = require('prop-types');
|
||||
|
||||
function HoveringURL(props) {
|
||||
if (props.targetURL.startsWith(props.currentTeamURL)) {
|
||||
return <div/>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='HoveringURL HoveringURL-left'>
|
||||
{props.targetURL}
|
||||
|
@ -14,7 +10,6 @@ function HoveringURL(props) {
|
|||
}
|
||||
|
||||
HoveringURL.propTypes = {
|
||||
currentTeamURL: PropTypes.string,
|
||||
targetURL: PropTypes.string,
|
||||
};
|
||||
|
||||
|
|
|
@ -317,6 +317,7 @@ const MainPage = createReactClass({
|
|||
authServerURL = `${tmpURL.protocol}//${tmpURL.host}`;
|
||||
authInfo = this.state.loginQueue[0].authInfo;
|
||||
}
|
||||
var currentTeamURL = this.props.teams[this.state.key].url;
|
||||
var modal = (
|
||||
<NewTeamModal
|
||||
show={this.state.showNewTeamModal}
|
||||
|
@ -364,7 +365,7 @@ const MainPage = createReactClass({
|
|||
{ viewsRow }
|
||||
</Grid>
|
||||
<TransitionGroup>
|
||||
{ (this.state.targetURL === '') ?
|
||||
{ (this.state.targetURL === '' || this.state.targetURL.startsWith(currentTeamURL)) ?
|
||||
null :
|
||||
<CSSTransition
|
||||
classNames='hovering'
|
||||
|
@ -372,7 +373,6 @@ const MainPage = createReactClass({
|
|||
>
|
||||
<HoveringURL
|
||||
key='hoveringURL'
|
||||
currentTeamURL={this.props.teams[this.state.key].url}
|
||||
targetURL={this.state.targetURL}
|
||||
/>
|
||||
</CSSTransition>
|
||||
|
|
Loading…
Reference in a new issue