mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-06 23:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename callnavbottom and fix linking implementation to actually be correct

Browse source
This commit is contained in:
Gigiaj 2025-05-04 15:03:46 -05:00
parent 4083bbb31e
commit d11bdb2f85
1 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/app/pages/call/CallNavBottom.tsx → src/app/pages/call/CallNavStatus.tsx
View file

@ -4,13 +4,32 @@ import { Box, Chip, Icon, IconButton, Icons, Text, Tooltip, TooltipProvider } fr
import React from 'react'; import React from 'react';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
import { useCallState } from '../client/CallProvider'; 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 } = const { activeCallRoomId, isAudioEnabled, isVideoEnabled, toggleAudio, toggleVideo, hangUp } =
useCallState(); useCallState();
const mx = useMatrixClient(); const mx = useMatrixClient();
const { navigateRoom } = useRoomNavigate();
const { roomIdOrAlias: viewedRoomId } = useParams<{ roomIdOrAlias: string }>(); const { roomIdOrAlias: viewedRoomId } = useParams<{ roomIdOrAlias: string }>();
const handleGoToCallRoom = () => {
if (activeCallRoomId) {
navigateRoom(activeCallRoomId);
}
};
if (!activeCallRoomId) { if (!activeCallRoomId) {
return ( return (
<Box <Box
@ -96,19 +115,18 @@ export function CallNavBottom() {
</Tooltip> </Tooltip>
} }
> >
{(triggerRef) => {(triggerRef) => (
viewedRoomId !== (activeCallRoomId ?? '') ? ( <Chip
<NavLink ref={triggerRef} to={activeCallRoomId}> radii="Inherit"
<Chip variant="Background" radii="Inherit" size="500" fill="Soft"> size="500"
Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName} fill="Soft"
</Chip> as="button"
</NavLink> onClick={handleGoToCallRoom}
) : ( ref={triggerRef}
<Chip variant="Background" ref={triggerRef} radii="Inherit" size="500" fill="Soft"> >
Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName} {mx.getRoom(activeCallRoomId)?.normalizedName}
</Chip> </Chip>
) )}
}
</TooltipProvider> </TooltipProvider>
</Box> </Box>
</Box> </Box>