g4borg/cinny
1
0
Fork 0
forked from github/cinny
Code Pull Requests Packages Wiki Activity

Add ideal call room join behavior where text rooms to call room simply joins, but doesn't swap current view

Browse Source
This commit is contained in:
Gigiaj
2025-05-20 11:26:54 -05:00
parent 3e3d68602f
commit 1e44557406
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/features/room-nav/RoomNavItem.tsx
View File

@@ -21,6 +21,7 @@ import {
} from 'folds'; } from 'folds';
import { useFocusWithin, useHover } from 'react-aria'; import { useFocusWithin, useHover } from 'react-aria';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { useParams } from 'react-router-dom';
import { NavItem, NavItemContent, NavItemOptions, NavLink } from '../../components/nav'; import { NavItem, NavItemContent, NavItemOptions, NavLink } from '../../components/nav';
import { UnreadBadge, UnreadBadgeCenter } from '../../components/unread-badge'; import { UnreadBadge, UnreadBadgeCenter } from '../../components/unread-badge';
import { RoomAvatar, RoomIcon } from '../../components/room-avatar'; import { RoomAvatar, RoomIcon } from '../../components/room-avatar';
@@ -53,7 +54,6 @@ import {
import { RoomNotificationModeSwitcher } from '../../components/RoomNotificationSwitcher'; import { RoomNotificationModeSwitcher } from '../../components/RoomNotificationSwitcher';
import { useCallState } from '../../pages/client/CallProvider'; import { useCallState } from '../../pages/client/CallProvider';
import { useRoomNavigate } from '../../hooks/useRoomNavigate'; import { useRoomNavigate } from '../../hooks/useRoomNavigate';
import { logger } from 'matrix-js-sdk/lib/logger';
type RoomNavItemMenuProps = { type RoomNavItemMenuProps = {
room: Room; room: Room;
@@ -235,6 +235,7 @@ export function RoomNavItem({
(receipt) => receipt.userId !== mx.getUserId() (receipt) => receipt.userId !== mx.getUserId()
); );
const { navigateRoom } = useRoomNavigate(); const { navigateRoom } = useRoomNavigate();
const { roomIdOrAlias: viewedRoomId } = useParams();
const handleContextMenu: MouseEventHandler<HTMLElement> = (evt) => { const handleContextMenu: MouseEventHandler<HTMLElement> = (evt) => {
evt.preventDefault(); evt.preventDefault();
@@ -261,10 +262,11 @@ export function RoomNavItem({
if (room.isCallRoom() && activeCallRoomId !== room.roomId) { if (room.isCallRoom() && activeCallRoomId !== room.roomId) {
hangUp(); hangUp();
logger.error(room?.normalizedName);
setActiveCallRoomId(room.roomId); setActiveCallRoomId(room.roomId);
setViewedCallRoomId(room.roomId); setViewedCallRoomId(room.roomId);
if (mx.getRoom(viewedRoomId)?.isCallRoom()) {
navigateRoom(room.roomId); navigateRoom(room.roomId);
}
} else { } else {
navigateRoom(room.roomId); navigateRoom(room.roomId);
} }