Cleaned up Peer container

master
Håvar Aambø Fosstveit 2019-06-25 22:34:18 +02:00
parent 07ef68d62e
commit 115bcfc62d
1 changed files with 20 additions and 26 deletions

View File

@ -102,15 +102,9 @@ const styles = (theme) =>
const Peer = (props) => const Peer = (props) =>
{ {
const [ hover, setHover ] = useState(false); const [ hover, setHover ] = useState(false);
const [ webcamHover, setWebcamHover ] = useState(false);
const [ screenHover, setScreenHover ] = useState(false);
let touchTimeout = null; let touchTimeout = null;
let touchWebcamTimeout = null;
let touchScreenTimeout = null;
const { const {
roomClient, roomClient,
advancedMode, advancedMode,
@ -206,24 +200,24 @@ const Peer = (props) =>
} }
<div <div
className={classnames(classes.controls, webcamHover ? 'hover' : null)} className={classnames(classes.controls, hover ? 'hover' : null)}
onMouseOver={() => setWebcamHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setWebcamHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
{ {
if (touchWebcamTimeout) if (touchTimeout)
clearTimeout(touchWebcamTimeout); clearTimeout(touchTimeout);
setWebcamHover(true); setHover(true);
}} }}
onTouchEnd={() => onTouchEnd={() =>
{ {
if (touchWebcamTimeout) if (touchTimeout)
clearTimeout(touchWebcamTimeout); clearTimeout(touchTimeout);
touchWebcamTimeout = setTimeout(() => touchTimeout = setTimeout(() =>
{ {
setWebcamHover(false); setHover(false);
}, 2000); }, 2000);
}} }}
> >
@ -330,25 +324,25 @@ const Peer = (props) =>
{ screenVisible ? { screenVisible ?
<div className={classnames(classes.viewContainer)}> <div className={classnames(classes.viewContainer)}>
<div <div
className={classnames(classes.controls, screenHover ? 'hover' : null)} className={classnames(classes.controls, hover ? 'hover' : null)}
onMouseOver={() => setScreenHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setScreenHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
{ {
if (touchScreenTimeout) if (touchTimeout)
clearTimeout(touchScreenTimeout); clearTimeout(touchTimeout);
setScreenHover(true); setHover(true);
}} }}
onTouchEnd={() => onTouchEnd={() =>
{ {
if (touchScreenTimeout) if (touchTimeout)
clearTimeout(touchScreenTimeout); clearTimeout(touchTimeout);
touchScreenTimeout = setTimeout(() => touchTimeout = setTimeout(() =>
{ {
setScreenHover(false); setHover(false);
}, 2000); }, 2000);
}} }}
> >