Fix(multi-stream) fix an issue where avatar shows up occasionally.
* fix occasional unexpected avatar * fix ss stats popover not shown * fix linter issue
This commit is contained in:
parent
96ee61ec07
commit
f62cb7a0c7
|
@ -54,8 +54,8 @@ export const ConnectionIndicatorIcon = ({
|
|||
const dispatch = useDispatch();
|
||||
const sourceName = track?.jitsiTrack?.getSourceName();
|
||||
|
||||
const handleTrackStreamingStatusChanged = streamingStatus => {
|
||||
dispatch(trackStreamingStatusChanged(track.jitsiTrack, streamingStatus));
|
||||
const handleTrackStreamingStatusChanged = (jitsiTrack, streamingStatus) => {
|
||||
dispatch(trackStreamingStatusChanged(jitsiTrack, streamingStatus));
|
||||
};
|
||||
|
||||
// TODO: replace this with a custom hook to be reused where track streaming status is needed.
|
||||
|
|
|
@ -77,6 +77,11 @@ type Props = {
|
|||
*/
|
||||
styles: Object,
|
||||
|
||||
/**
|
||||
* The type of thumbnail.
|
||||
*/
|
||||
thumbnailType: string,
|
||||
|
||||
/**
|
||||
* JitsiTrack instance.
|
||||
*/
|
||||
|
@ -97,7 +102,8 @@ const FakeScreenShareParticipant = ({
|
|||
onTouchStart,
|
||||
participantId,
|
||||
styles,
|
||||
videoTrack
|
||||
videoTrack,
|
||||
thumbnailType
|
||||
}: Props) => {
|
||||
const currentLayout = useSelector(getCurrentLayout);
|
||||
const videoTrackId = videoTrack?.jitsiTrack?.getId();
|
||||
|
@ -137,7 +143,8 @@ const FakeScreenShareParticipant = ({
|
|||
currentLayout = { currentLayout }
|
||||
isFakeScreenShareParticipant = { true }
|
||||
isHovered = { isHovered }
|
||||
participantId = { participantId } />
|
||||
participantId = { participantId }
|
||||
thumbnailType = { thumbnailType } />
|
||||
</div>
|
||||
<div
|
||||
className = { clsx(classes.indicatorsContainer,
|
||||
|
|
|
@ -1125,7 +1125,7 @@ class Thumbnail extends Component<Props, State> {
|
|||
|
||||
if (_isFakeScreenShareParticipant) {
|
||||
const { isHovered } = this.state;
|
||||
const { _videoTrack, _isMobile, classes } = this.props;
|
||||
const { _videoTrack, _isMobile, classes, _thumbnailType } = this.props;
|
||||
|
||||
return (
|
||||
<FakeScreenShareParticipant
|
||||
|
@ -1142,6 +1142,7 @@ class Thumbnail extends Component<Props, State> {
|
|||
onTouchStart = { this._onTouchStart }
|
||||
participantId = { _participant.id }
|
||||
styles = { this._getStyles() }
|
||||
thumbnailType = { _thumbnailType }
|
||||
videoTrack = { _videoTrack } />
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue