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

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 { 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 (
<Box
@ -96,19 +115,18 @@ export function CallNavBottom() {
</Tooltip>
}
>
{(triggerRef) =>
viewedRoomId !== (activeCallRoomId ?? '') ? (
<NavLink ref={triggerRef} to={activeCallRoomId}>
<Chip variant="Background" radii="Inherit" size="500" fill="Soft">
Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName}
</Chip>
</NavLink>
) : (
<Chip variant="Background" ref={triggerRef} radii="Inherit" size="500" fill="Soft">
Active Call: {mx.getRoom(activeCallRoomId)?.normalizedName}
</Chip>
)
}
{(triggerRef) => (
<Chip
radii="Inherit"
size="500"
fill="Soft"
as="button"
onClick={handleGoToCallRoom}
ref={triggerRef}
>
{mx.getRoom(activeCallRoomId)?.normalizedName}
</Chip>
)}
</TooltipProvider>
</Box>
</Box>