diff --git a/packages/ui-voip/src/views/MediaCallRoomSection/MediaCallRoomSection.tsx b/packages/ui-voip/src/views/MediaCallRoomSection/MediaCallRoomSection.tsx index 0429312e03f6e..c0bf5f3d72766 100644 --- a/packages/ui-voip/src/views/MediaCallRoomSection/MediaCallRoomSection.tsx +++ b/packages/ui-voip/src/views/MediaCallRoomSection/MediaCallRoomSection.tsx @@ -1,16 +1,13 @@ -import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage'; -import { memo, useState } from 'react'; +import { Box, ButtonGroup } from '@rocket.chat/fuselage'; +import { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import PeerCardsView from './PeerCardsView'; import { ToggleButton, Timer, DevicePicker, ActionButton, - CardListContainer, - CardListSection, - PeerCard, - StreamCard, useShouldWrapCards, CARD_LIST_SECTION_MAX_HEIGHT, ActionStrip, @@ -19,7 +16,6 @@ import { import { useMediaCallInstance } from '../../context/MediaCallInstanceContext'; import { useMediaCallView } from '../../context/MediaCallViewContext'; import useRegisterView from '../../context/useRegisterView'; -import { usePlayMediaStream } from '../../providers/usePlayMediaStream'; type MediaCallRoomSectionProps = { showChat: boolean; @@ -48,7 +44,6 @@ const getSplitStyles = (showChat?: boolean) => { const MediaCallRoomSection = ({ showChat, onToggleChat, user, containerHeight }: MediaCallRoomSectionProps) => { const { t } = useTranslation(); - const [focusedCard, setFocusedCard] = useState<'remote' | 'local' | null>('remote'); const { sessionState, onMute, @@ -58,74 +53,25 @@ const MediaCallRoomSection = ({ showChat, onToggleChat, user, containerHeight }: onToggleScreenSharing, onOpenPopout, onClosePopout, - streams: { remoteScreen, localScreen }, + streams: { localScreen }, } = useMediaCallView(); const { currentViews } = useMediaCallInstance(); const isPopout = currentViews.includes('popout'); - const { muted, held, remoteMuted, remoteHeld, peerInfo, connectionState, startedAt } = sessionState; + const { muted, held, peerInfo, connectionState, startedAt } = sessionState; const shouldWrapCards = useShouldWrapCards(showChat, containerHeight); const connecting = connectionState === 'CONNECTING'; const reconnecting = connectionState === 'RECONNECTING'; - const [remoteStreamRefCallback] = usePlayMediaStream(remoteScreen?.stream ?? null); - const [localStreamRefCallback] = usePlayMediaStream(localScreen?.stream ?? null); - useRegisterView('room'); - const onClickFocusRemoteCard = () => { - setFocusedCard((prev) => (prev === 'remote' ? null : 'remote')); - }; - - const onClickFocusLocalCard = () => { - setFocusedCard((prev) => (prev === 'local' ? null : 'local')); - }; - if (!peerInfo || 'number' in peerInfo) { return null; } - const remoteStreamCard = remoteScreen?.active ? ( - - - - ) : null; - - const localStreamCard = localScreen?.active ? ( - - - - ) : null; - - const focusedCardElement = focusedCard === 'remote' ? remoteStreamCard : localStreamCard; - return ( - - {isPopout && ( - - - {t('Call_open_separate_window')} - - - - )} - {!isPopout && ( - - - - {focusedCard !== 'remote' && remoteStreamCard} - {focusedCard !== 'local' && localStreamCard} - - )} - + diff --git a/packages/ui-voip/src/views/MediaCallRoomSection/PeerCardsView.tsx b/packages/ui-voip/src/views/MediaCallRoomSection/PeerCardsView.tsx new file mode 100644 index 0000000000000..0b25b1246df0b --- /dev/null +++ b/packages/ui-voip/src/views/MediaCallRoomSection/PeerCardsView.tsx @@ -0,0 +1,108 @@ +import { Box, Button } from '@rocket.chat/fuselage'; +import { useState } from 'react'; +import { useTranslation } from 'react-i18next'; + +import { CardListContainer, CardListSection, PeerCard, StreamCard } from '../../components'; +import { useMediaCallView } from '../../context'; +import { useMediaCallInstance } from '../../context/MediaCallInstanceContext'; +import { usePlayMediaStream } from '../../providers/usePlayMediaStream'; + +type PeerCardsViewProps = { + shouldWrapCards: boolean; + user: { + displayName: string; + avatarUrl: string; + }; +}; + +const PeerCardsView = ({ user, shouldWrapCards }: PeerCardsViewProps) => { + const { t } = useTranslation(); + const [focusedCard, setFocusedCard] = useState<'remote' | 'local' | null>('remote'); + const { + sessionState, + onToggleScreenSharing, + onClosePopout, + streams: { remoteScreen, localScreen }, + } = useMediaCallView(); + const { currentViews } = useMediaCallInstance(); + const isPopout = currentViews.includes('popout'); + const { muted, held, remoteMuted, remoteHeld, peerInfo } = sessionState; + + const [remoteStreamRefCallback] = usePlayMediaStream(remoteScreen?.stream ?? null); + const [localStreamRefCallback] = usePlayMediaStream(localScreen?.stream ?? null); + + const onClickFocusRemoteCard = () => { + setFocusedCard((prev) => (prev === 'remote' ? null : 'remote')); + }; + + const onClickFocusLocalCard = () => { + setFocusedCard((prev) => (prev === 'local' ? null : 'local')); + }; + + if (!peerInfo || 'number' in peerInfo) { + return null; + } + + const remoteStreamCard = remoteScreen?.active ? ( + + + + ) : null; + + const localStreamCard = localScreen?.active ? ( + + + + ) : null; + + const focusedCardElement = focusedCard === 'remote' ? remoteStreamCard : localStreamCard; + + return ( + + {isPopout && ( + + + {t('Call_open_separate_window')} + + + + )} + {!isPopout && ( + + + + {focusedCard !== 'remote' && remoteStreamCard} + {focusedCard !== 'local' && localStreamCard} + + )} + + ); +}; + +export default PeerCardsView;