From d11bdb2f8502d62b9263fea254414daa0e5bdd95 Mon Sep 17 00:00:00 2001 From: Gigiaj Date: Sun, 4 May 2025 15:03:46 -0500 Subject: [PATCH] Rename callnavbottom and fix linking implementation to actually be correct --- .../{CallNavBottom.tsx => CallNavStatus.tsx} | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) rename src/app/pages/call/{CallNavBottom.tsx => CallNavStatus.tsx} (71%) diff --git a/src/app/pages/call/CallNavBottom.tsx b/src/app/pages/call/CallNavStatus.tsx similarity index 71% rename from src/app/pages/call/CallNavBottom.tsx rename to src/app/pages/call/CallNavStatus.tsx index 5a12405d..35b48e62 100644 --- a/src/app/pages/call/CallNavBottom.tsx +++ b/src/app/pages/call/CallNavStatus.tsx @@ -4,13 +4,32 @@ import { Box, Chip, Icon, IconButton, Icons, Text, Tooltip, TooltipProvider } fr import React from 'react'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useCallState } from '../client/CallProvider'; +import { getSpaceRoomPath } from '../pathUtils'; +import { getCanonicalAliasOrRoomId } from '../../utils/matrix'; +import { useNavToActivePathMapper } from '../../hooks/useNavToActivePathMapper'; +import { useSpace } from '../../hooks/useSpace'; +import { Room } from 'matrix-js-sdk'; +import { useMentionClickHandler } from '../../hooks/useMentionClickHandler'; +import { + makeMentionCustomProps, + renderMatrixMention, +} from '../../plugins/react-custom-html-parser'; +import { useRoomNavigate } from '../../hooks/useRoomNavigate'; -export function CallNavBottom() { +type CallNavStatusProps = { + space: Room | null; +}; +export function CallNavStatus({ space }: CallNavStatusProps) { const { activeCallRoomId, isAudioEnabled, isVideoEnabled, toggleAudio, toggleVideo, hangUp } = useCallState(); const mx = useMatrixClient(); + const { navigateRoom } = useRoomNavigate(); const { roomIdOrAlias: viewedRoomId } = useParams<{ roomIdOrAlias: string }>(); - + const handleGoToCallRoom = () => { + if (activeCallRoomId) { + navigateRoom(activeCallRoomId); + } + }; if (!activeCallRoomId) { return ( } > - {(triggerRef) => - viewedRoomId !== (activeCallRoomId ?? '') ? ( - - - Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName} - - - ) : ( - - Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName} - - ) - } + {(triggerRef) => ( + + {mx.getRoom(activeCallRoomId)?.normalizedName} + + )}