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

fix(pinning) Fix pinning (#11693) 

Hide Pin to Stage button while screensharing
Fix pin indicator while screensharing
This commit is contained in:
Robert Pintilii 2022-06-17 13:15:14 +01:00 committed by GitHub
parent 38abca8a65
commit 38b21e986d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/filmstrip/components/web/PinnedIndicator.js
View File

@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
import { IconPinParticipant } from '../../../base/icons'; import { IconPinParticipant } from '../../../base/icons';
import { getParticipantById } from '../../../base/participants'; import { getParticipantById } from '../../../base/participants';
import { BaseIndicator } from '../../../base/react'; import { BaseIndicator } from '../../../base/react';
import { getPinnedActiveParticipants, isStageFilmstripEnabled } from '../../functions.web'; import { getPinnedActiveParticipants, isStageFilmstripAvailable } from '../../functions.web';
/** /**
* The type of the React {@code Component} props of {@link PinnedIndicator}. * The type of the React {@code Component} props of {@link PinnedIndicator}.
@ -54,7 +54,7 @@ const PinnedIndicator = ({
participantId, participantId,
tooltipPosition tooltipPosition
}: Props) => { }: Props) => {
const stageFilmstrip = useSelector(isStageFilmstripEnabled); const stageFilmstrip = useSelector(isStageFilmstripAvailable);
const pinned = useSelector(state => getParticipantById(state, participantId))?.pinned; const pinned = useSelector(state => getParticipantById(state, participantId))?.pinned;
const isPinned = useSelector(getPinnedActiveParticipants).find(p => p.participantId === participantId); const isPinned = useSelector(getPinnedActiveParticipants).find(p => p.participantId === participantId);
const styles = useStyles(); const styles = useStyles();

4
react/features/video-menu/components/web/LocalVideoMenuTriggerButton.js
View File

@ -19,7 +19,7 @@ import { getHideSelfView } from '../../../base/settings';
import { getLocalVideoTrack } from '../../../base/tracks'; import { getLocalVideoTrack } from '../../../base/tracks';
import ConnectionIndicatorContent from '../../../connection-indicator/components/web/ConnectionIndicatorContent'; import ConnectionIndicatorContent from '../../../connection-indicator/components/web/ConnectionIndicatorContent';
import { THUMBNAIL_TYPE } from '../../../filmstrip'; import { THUMBNAIL_TYPE } from '../../../filmstrip';
import { isStageFilmstripEnabled } from '../../../filmstrip/functions.web'; import { isStageFilmstripAvailable } from '../../../filmstrip/functions.web';
import { renderConnectionStatus } from '../../actions.web'; import { renderConnectionStatus } from '../../actions.web';
import ConnectionStatusButton from './ConnectionStatusButton'; import ConnectionStatusButton from './ConnectionStatusButton';
@ -305,7 +305,7 @@ function _mapStateToProps(state, ownProps) {
_overflowDrawer: overflowDrawer, _overflowDrawer: overflowDrawer,
_localParticipantId: localParticipant.id, _localParticipantId: localParticipant.id,
_showConnectionInfo: showConnectionInfo, _showConnectionInfo: showConnectionInfo,
_showPinToStage: isStageFilmstripEnabled(state) _showPinToStage: isStageFilmstripAvailable(state)
}; };
} }

4
react/features/video-menu/components/web/ParticipantContextMenu.js
View File

@ -16,7 +16,7 @@ import { getLocalParticipant, PARTICIPANT_ROLE } from '../../../base/participant
import { isParticipantAudioMuted } from '../../../base/tracks'; import { isParticipantAudioMuted } from '../../../base/tracks';
import { getBreakoutRooms, getCurrentRoomId, isInBreakoutRoom } from '../../../breakout-rooms/functions'; import { getBreakoutRooms, getCurrentRoomId, isInBreakoutRoom } from '../../../breakout-rooms/functions';
import { setVolume } from '../../../filmstrip/actions.web'; import { setVolume } from '../../../filmstrip/actions.web';
import { isStageFilmstripEnabled } from '../../../filmstrip/functions.web'; import { isStageFilmstripAvailable } from '../../../filmstrip/functions.web';
import { isForceMuted } from '../../../participants-pane/functions'; import { isForceMuted } from '../../../participants-pane/functions';
import { requestRemoteControl, stopController } from '../../../remote-control'; import { requestRemoteControl, stopController } from '../../../remote-control';
import { stopSharedVideo } from '../../../shared-video/actions.any'; import { stopSharedVideo } from '../../../shared-video/actions.any';
@ -146,7 +146,7 @@ const ParticipantContextMenu = ({
: participant?.id ? participantsVolume[participant?.id] : undefined) ?? 1; : participant?.id ? participantsVolume[participant?.id] : undefined) ?? 1;
const isBreakoutRoom = useSelector(isInBreakoutRoom); const isBreakoutRoom = useSelector(isInBreakoutRoom);
const isModerationSupported = useSelector(isAvModerationSupported); const isModerationSupported = useSelector(isAvModerationSupported);
const stageFilmstrip = useSelector(isStageFilmstripEnabled); const stageFilmstrip = useSelector(isStageFilmstripAvailable);
const _currentRoomId = useSelector(getCurrentRoomId); const _currentRoomId = useSelector(getCurrentRoomId);
const _rooms = Object.values(useSelector(getBreakoutRooms)); const _rooms = Object.values(useSelector(getBreakoutRooms));