From 38b21e986d497691a8ded5ca7648d23e0607443b Mon Sep 17 00:00:00 2001 From: Robert Pintilii Date: Fri, 17 Jun 2022 13:15:14 +0100 Subject: [PATCH] fix(pinning) Fix pinning (#11693) Hide Pin to Stage button while screensharing Fix pin indicator while screensharing --- react/features/filmstrip/components/web/PinnedIndicator.js | 4 ++-- .../video-menu/components/web/LocalVideoMenuTriggerButton.js | 4 ++-- .../video-menu/components/web/ParticipantContextMenu.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/react/features/filmstrip/components/web/PinnedIndicator.js b/react/features/filmstrip/components/web/PinnedIndicator.js index d1be1721d..036e1fe4f 100644 --- a/react/features/filmstrip/components/web/PinnedIndicator.js +++ b/react/features/filmstrip/components/web/PinnedIndicator.js @@ -7,7 +7,7 @@ import { useSelector } from 'react-redux'; import { IconPinParticipant } from '../../../base/icons'; import { getParticipantById } from '../../../base/participants'; 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}. @@ -54,7 +54,7 @@ const PinnedIndicator = ({ participantId, tooltipPosition }: Props) => { - const stageFilmstrip = useSelector(isStageFilmstripEnabled); + const stageFilmstrip = useSelector(isStageFilmstripAvailable); const pinned = useSelector(state => getParticipantById(state, participantId))?.pinned; const isPinned = useSelector(getPinnedActiveParticipants).find(p => p.participantId === participantId); const styles = useStyles(); diff --git a/react/features/video-menu/components/web/LocalVideoMenuTriggerButton.js b/react/features/video-menu/components/web/LocalVideoMenuTriggerButton.js index 0af278309..39a7a4a2c 100644 --- a/react/features/video-menu/components/web/LocalVideoMenuTriggerButton.js +++ b/react/features/video-menu/components/web/LocalVideoMenuTriggerButton.js @@ -19,7 +19,7 @@ import { getHideSelfView } from '../../../base/settings'; import { getLocalVideoTrack } from '../../../base/tracks'; import ConnectionIndicatorContent from '../../../connection-indicator/components/web/ConnectionIndicatorContent'; import { THUMBNAIL_TYPE } from '../../../filmstrip'; -import { isStageFilmstripEnabled } from '../../../filmstrip/functions.web'; +import { isStageFilmstripAvailable } from '../../../filmstrip/functions.web'; import { renderConnectionStatus } from '../../actions.web'; import ConnectionStatusButton from './ConnectionStatusButton'; @@ -305,7 +305,7 @@ function _mapStateToProps(state, ownProps) { _overflowDrawer: overflowDrawer, _localParticipantId: localParticipant.id, _showConnectionInfo: showConnectionInfo, - _showPinToStage: isStageFilmstripEnabled(state) + _showPinToStage: isStageFilmstripAvailable(state) }; } diff --git a/react/features/video-menu/components/web/ParticipantContextMenu.js b/react/features/video-menu/components/web/ParticipantContextMenu.js index f8dc6856a..e646af850 100644 --- a/react/features/video-menu/components/web/ParticipantContextMenu.js +++ b/react/features/video-menu/components/web/ParticipantContextMenu.js @@ -16,7 +16,7 @@ import { getLocalParticipant, PARTICIPANT_ROLE } from '../../../base/participant import { isParticipantAudioMuted } from '../../../base/tracks'; import { getBreakoutRooms, getCurrentRoomId, isInBreakoutRoom } from '../../../breakout-rooms/functions'; 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 { requestRemoteControl, stopController } from '../../../remote-control'; import { stopSharedVideo } from '../../../shared-video/actions.any'; @@ -146,7 +146,7 @@ const ParticipantContextMenu = ({ : participant?.id ? participantsVolume[participant?.id] : undefined) ?? 1; const isBreakoutRoom = useSelector(isInBreakoutRoom); const isModerationSupported = useSelector(isAvModerationSupported); - const stageFilmstrip = useSelector(isStageFilmstripEnabled); + const stageFilmstrip = useSelector(isStageFilmstripAvailable); const _currentRoomId = useSelector(getCurrentRoomId); const _rooms = Object.values(useSelector(getBreakoutRooms));