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

add a roomview window for calls and rename room to roomId for accuracy

Browse source
This commit is contained in:
Gigiaj 2025-04-18 03:03:13 -05:00
parent 1ac5b3d8fd
commit 1a3b10e32d
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/app/pages/call/PersistentCallContainer.tsx
View file

@ -15,9 +15,11 @@ import { Page, PageRoot } from '../../components/page';
import { RouteSpaceProvider, Space, SpaceRouteRoomProvider } from '../client/space'; import { RouteSpaceProvider, Space, SpaceRouteRoomProvider } from '../client/space';
import { MobileFriendlyPageNav } from '../MobileFriendly'; import { MobileFriendlyPageNav } from '../MobileFriendly';
import { SPACE_PATH } from '../paths'; import { SPACE_PATH } from '../paths';
import { PowerLevelsContextProvider } from '../../hooks/usePowerLevels'; import { PowerLevelsContextProvider, usePowerLevels } from '../../hooks/usePowerLevels';
import { useSelectedRoom } from '../../hooks/router/useSelectedRoom'; import { useSelectedRoom } from '../../hooks/router/useSelectedRoom';
import { useClientConfig } from '../../hooks/useClientConfig'; import { useClientConfig } from '../../hooks/useClientConfig';
import { RoomView } from '../../features/room/RoomView';
import { useParams } from 'react-router-dom';
interface PersistentCallContainerProps { interface PersistentCallContainerProps {
isVisible: boolean; isVisible: boolean;
@ -25,9 +27,12 @@ interface PersistentCallContainerProps {
export function PersistentCallContainer({ isVisible }: PersistentCallContainerProps) { export function PersistentCallContainer({ isVisible }: PersistentCallContainerProps) {
const { activeCallRoomId, setActiveCallRoomId, registerActiveTransport } = useCallState(); const { activeCallRoomId, setActiveCallRoomId, registerActiveTransport } = useCallState();
const { eventId } = useParams();
const mx = useMatrixClient(); const mx = useMatrixClient();
const room = useSelectedRoom(); const roomId = useSelectedRoom();
const clientConfig = useClientConfig(); const clientConfig = useClientConfig();
const room = mx.getRoom(roomId);
const powerLevels = usePowerLevels(room ?? null);
logger.info(room); logger.info(room);
@ -59,12 +64,12 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
} }
widgetApiRef.current = null; widgetApiRef.current = null;
smallWidgetRef.current = null; smallWidgetRef.current = null;
iframeRef.current.src = 'about:blank'; if (iframeRef.current) iframeRef.current.src = 'about:blank';
}; };
if (activeCallRoomId && mx?.getUserId()) { if (activeCallRoomId && mx?.getUserId()) {
if (cleanupRoomId !== activeCallRoomId) { if (cleanupRoomId !== activeCallRoomId) {
const newUrl = getWidgetUrl(mx, room, clientConfig.elementCallUrl ?? ''); const newUrl = getWidgetUrl(mx, roomId, clientConfig.elementCallUrl ?? '');
if (iframeRef.current && iframeRef.current.src !== newUrl.toString()) { if (iframeRef.current && iframeRef.current.src !== newUrl.toString()) {
logger.info( logger.info(
@ -140,7 +145,7 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
return ( return (
<Page style={containerStyle}> <Page style={containerStyle}>
<Box direction="Row" grow="Yes" style={{ height: '100%', width: '100%' }}> <Box direction="Row" grow="Yes" style={{ height: '100%', width: '100%' }}>
{activeCallRoomId && room && ( {activeCallRoomId && roomId && (
<Box <Box
shrink="No" shrink="No"
style={{ style={{
@ -166,9 +171,9 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
direction="Column" direction="Column"
style={{ position: 'relative', height: '100%', width: '100%', overflow: 'hidden' }} style={{ position: 'relative', height: '100%', width: '100%', overflow: 'hidden' }}
> >
{activeCallRoomId && room && ( {activeCallRoomId && roomId && (
<Box direction="Column" style={{ width: '100%' }}> <Box direction="Column" style={{ width: '100%' }}>
<PowerLevelsContextProvider value={null}> <PowerLevelsContextProvider value={powerLevels}>
<RouteSpaceProvider> <RouteSpaceProvider>
<SpaceRouteRoomProvider> <SpaceRouteRoomProvider>
<RoomViewHeader /> <RoomViewHeader />
@ -195,6 +200,17 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
/> />
</Box> </Box>
</Box> </Box>
<Box direction="Column" style={{ position: 'relative' }}>
{activeCallRoomId && roomId !== null && (
<PowerLevelsContextProvider value={powerLevels}>
<RouteSpaceProvider>
<SpaceRouteRoomProvider>
<RoomView room={room} eventId={eventId} />
</SpaceRouteRoomProvider>
</RouteSpaceProvider>
</PowerLevelsContextProvider>
)}
</Box>
</Box> </Box>
</Page> </Page>
); );