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

fix(rn,thumbnail) show SS indicator on the local thumbnail

This commit is contained in:
Saúl Ibarra Corretgé 2022-08-29 21:06:26 +02:00 committed by Saúl Ibarra Corretgé
parent fb9d35a991
commit 104bfe7339
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
react/features/filmstrip/components/native/Thumbnail.js
View File

@ -61,11 +61,6 @@ type Props = {
*/ */
_isFakeParticipant: boolean, _isFakeParticipant: boolean,
/**
* Indicates whether multi-stream support is enabled.
*/
_isMultiStreamSupportEnabled: boolean,
/** /**
* Indicates whether the participant is screen sharing. * Indicates whether the participant is screen sharing.
*/ */
@ -213,7 +208,6 @@ class Thumbnail extends PureComponent<Props> {
_renderIndicators() { _renderIndicators() {
const { const {
_audioMuted: audioMuted, _audioMuted: audioMuted,
_isMultiStreamSupportEnabled,
_isScreenShare: isScreenShare, _isScreenShare: isScreenShare,
_isVirtualScreenshare, _isVirtualScreenshare,
_isFakeParticipant, _isFakeParticipant,
@ -247,10 +241,7 @@ class Thumbnail extends PureComponent<Props> {
{ audioMuted && !_isVirtualScreenshare && <AudioMutedIndicator /> } { audioMuted && !_isVirtualScreenshare && <AudioMutedIndicator /> }
{ !tileView && _pinned && <PinnedIndicator />} { !tileView && _pinned && <PinnedIndicator />}
{ renderModeratorIndicator && !_isVirtualScreenshare && <ModeratorIndicator />} { renderModeratorIndicator && !_isVirtualScreenshare && <ModeratorIndicator />}
{ !tileView && ((isScreenShare && !_isMultiStreamSupportEnabled) || _isVirtualScreenshare) { !tileView && (isScreenShare || _isVirtualScreenshare) && <ScreenShareIndicator /> }
&& <ScreenShareIndicator /> /* Do not show screensharing indicator on the local camera
thumbnail when a virtual SS participant tile is created for local screenshare */
}
</Container> </Container>
{ {
renderDisplayName && <DisplayNameLabel renderDisplayName && <DisplayNameLabel
@ -430,7 +421,6 @@ function _mapStateToProps(state, ownProps) {
_audioMuted: audioTrack?.muted ?? true, _audioMuted: audioTrack?.muted ?? true,
_gifSrc: mode === 'chat' ? null : gifSrc, _gifSrc: mode === 'chat' ? null : gifSrc,
_isFakeParticipant: participant?.isFakeParticipant, _isFakeParticipant: participant?.isFakeParticipant,
_isMultiStreamSupportEnabled: isMultiStreamSupportEnabled,
_isScreenShare: isScreenShare, _isScreenShare: isScreenShare,
_isVirtualScreenshare: isMultiStreamSupportEnabled && participant?.isVirtualScreenshareParticipant, _isVirtualScreenshare: isMultiStreamSupportEnabled && participant?.isVirtualScreenshareParticipant,
_local: participant?.local, _local: participant?.local,