Fix ptt over elements. FIxes #370

auto_join_3.3
Håvar Aambø Fosstveit 2020-05-15 20:54:48 +02:00
parent 8ab8d0529f
commit 05d7cb571c
1 changed files with 17 additions and 9 deletions

View File

@ -145,15 +145,11 @@ const styles = (theme) =>
textAlign : 'center', textAlign : 'center',
opacity : 0, opacity : 0,
transition : 'opacity 1s ease', transition : 'opacity 1s ease',
pointerEvents : 'none',
'&.enabled' : '&.enabled' :
{ {
transition : 'opacity 0.1s', transition : 'opacity 0.1s',
opacity : 1, opacity : 1
visibility : 'visible'
},
'&.disabled' :
{
visibility : 'hidden'
} }
} }
}); });
@ -369,19 +365,31 @@ const Me = (props) =>
style={spacingStyle} style={spacingStyle}
> >
{ me.browser.platform !== 'mobile' && { me.browser.platform !== 'mobile' && smallContainer &&
<div className={classnames( <div className={classnames(
classes.ptt, classes.ptt,
(micState === 'muted' && me.isSpeaking) ? 'enabled' : 'disabled' (micState === 'muted' && me.isSpeaking) ? 'enabled' : null
)} )}
> >
<FormattedMessage <FormattedMessage
id='me.mutedPTT' id='me.mutedPTT'
defaultMessage='You are muted, hold down SPACE-BAR to talk' defaultMessage='You are muted, hold down SPACE-BAR to talk'
/> />
</div> </div>
} }
<div className={classes.viewContainer} style={style}> <div className={classes.viewContainer} style={style}>
{ me.browser.platform !== 'mobile' && !smallContainer &&
<div className={classnames(
classes.ptt,
(micState === 'muted' && me.isSpeaking) ? 'enabled' : null
)}
>
<FormattedMessage
id='me.mutedPTT'
defaultMessage='You are muted, hold down SPACE-BAR to talk'
/>
</div>
}
<p className={ <p className={
classnames( classnames(
classes.meTag, classes.meTag,