haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
pangrr 2022-04-28 18:25:45 -04:00 committed by GitHub
parent 96ee61ec07
commit f62cb7a0c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
View File

@ -54,8 +54,8 @@ export const ConnectionIndicatorIcon = ({
const dispatch = useDispatch(); const dispatch = useDispatch();
const sourceName = track?.jitsiTrack?.getSourceName(); const sourceName = track?.jitsiTrack?.getSourceName();
const handleTrackStreamingStatusChanged = streamingStatus => { const handleTrackStreamingStatusChanged = (jitsiTrack, streamingStatus) => {
dispatch(trackStreamingStatusChanged(track.jitsiTrack, streamingStatus)); dispatch(trackStreamingStatusChanged(jitsiTrack, streamingStatus));
}; };
// TODO: replace this with a custom hook to be reused where track streaming status is needed. // TODO: replace this with a custom hook to be reused where track streaming status is needed.

11
react/features/filmstrip/components/web/FakeScreenShareParticipant.js
View File

@ -77,6 +77,11 @@ type Props = {
*/ */
styles: Object, styles: Object,
/**
* The type of thumbnail.
*/
thumbnailType: string,
/** /**
* JitsiTrack instance. * JitsiTrack instance.
*/ */
@ -97,7 +102,8 @@ const FakeScreenShareParticipant = ({
onTouchStart, onTouchStart,
participantId, participantId,
styles, styles,
videoTrack videoTrack,
thumbnailType
}: Props) => { }: Props) => {
const currentLayout = useSelector(getCurrentLayout); const currentLayout = useSelector(getCurrentLayout);
const videoTrackId = videoTrack?.jitsiTrack?.getId(); const videoTrackId = videoTrack?.jitsiTrack?.getId();
@ -137,7 +143,8 @@ const FakeScreenShareParticipant = ({
currentLayout = { currentLayout } currentLayout = { currentLayout }
isFakeScreenShareParticipant = { true } isFakeScreenShareParticipant = { true }
isHovered = { isHovered } isHovered = { isHovered }
participantId = { participantId } /> participantId = { participantId }
thumbnailType = { thumbnailType } />
</div> </div>
<div <div
className = { clsx(classes.indicatorsContainer, className = { clsx(classes.indicatorsContainer,

3
react/features/filmstrip/components/web/Thumbnail.js
View File

@ -1125,7 +1125,7 @@ class Thumbnail extends Component<Props, State> {
if (_isFakeScreenShareParticipant) { if (_isFakeScreenShareParticipant) {
const { isHovered } = this.state; const { isHovered } = this.state;
const { _videoTrack, _isMobile, classes } = this.props; const { _videoTrack, _isMobile, classes, _thumbnailType } = this.props;
return ( return (
<FakeScreenShareParticipant <FakeScreenShareParticipant
@ -1142,6 +1142,7 @@ class Thumbnail extends Component<Props, State> {
onTouchStart = { this._onTouchStart } onTouchStart = { this._onTouchStart }
participantId = { _participant.id } participantId = { _participant.id }
styles = { this._getStyles() } styles = { this._getStyles() }
thumbnailType = { _thumbnailType }
videoTrack = { _videoTrack } /> videoTrack = { _videoTrack } />
); );
} }