Merge branch 'main' of github.com:vector-im/matrix-video-chat

This commit is contained in:
Robert Long
2021-10-06 11:20:00 -07:00
12 changed files with 198 additions and 28 deletions

View File

@@ -22,6 +22,7 @@ import {
MicButton,
VideoButton,
LayoutToggleButton,
ScreenshareButton,
} from "./RoomButton";
import { Header, LeftNav, RightNav, CenterNav } from "./Header";
import { Button, ErrorMessage } from "./Input";
@@ -270,8 +271,6 @@ function InRoomView({
});
}
console.log("items changed", participants);
return participants;
}, [userMediaFeeds, activeSpeaker, screenshareFeeds]);
@@ -303,7 +302,10 @@ function InRoomView({
enabled={localVideoMuted}
onClick={toggleLocalVideoMuted}
/>
<VideoButton enabled={isScreensharing} onClick={toggleScreensharing} />
<ScreenshareButton
enabled={isScreensharing}
onClick={toggleScreensharing}
/>
<HangupButton onClick={onLeave} />
</div>
</>