From bd246d6d3cc57daa5fa8de442898fbee89f70da0 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Tue, 12 May 2026 04:17:15 +0300 Subject: [PATCH] made call members looking properly in the small mode --- src/app/features/room-nav/RoomNavItem.tsx | 435 +++++++++++----------- src/app/features/room-nav/RoomNavUser.tsx | 15 +- 2 files changed, 229 insertions(+), 221 deletions(-) diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx index 41deed03b..6b535c6ce 100644 --- a/src/app/features/room-nav/RoomNavItem.tsx +++ b/src/app/features/room-nav/RoomNavItem.tsx @@ -383,250 +383,255 @@ export function RoomNavItem({ .filter(Boolean) .join(', '); return ( - - + - - {roomName} - - ) - } + - {(triggerRef) => ( - - - - - ) - } - style={hideTextStyling(hideText)} - > - + {roomName} + + ) + } + > + {(triggerRef) => ( + + + + + ) + } style={hideTextStyling(hideText)} > - {showAvatar ? ( - ( - - {nameInitials(roomName)} + + {showAvatar ? ( + ( + + {nameInitials(roomName)} + + )} + /> + ) : ( + + )} + + + {unread && hideText && ( + 0} + count={unread.highlight > 0 ? unread.highlight : unread.total} + /> + )} + + {!hideText && ( + <> + + + {roomName} + + {roomTopic && ( + + {roomTopic} )} - /> - ) : ( - - )} - - - {unread && hideText && ( - 0} - count={unread.highlight > 0 ? unread.highlight : unread.total} - /> - )} - - {!hideText && ( - <> - - - {roomName} - - {roomTopic && ( - - {roomTopic} - - )} - - {!optionsVisible && !unread && !selected && typingMember.length > 0 && ( - - - - )} - {!optionsVisible && shouldShowUnreadIndicator && ( - - 0} - count={unreadCount} - dm={direct} - /> - - )} - {!optionsVisible && notificationMode !== RoomNotificationMode.Unset && ( - - )} - {(room.isCallRoom() || direct) && - callMembers.length > 0 && - !optionsVisible && ( - - - - - {direct ? 'Calling' : `${callMembers.length} Live`} - - + + {!optionsVisible && !unread && !selected && typingMember.length > 0 && ( + + )} - + {!optionsVisible && shouldShowUnreadIndicator && ( + + 0} + count={unreadCount} + dm={direct} + /> + + )} + {!optionsVisible && notificationMode !== RoomNotificationMode.Unset && ( + + )} + {(room.isCallRoom() || direct) && + callMembers.length > 0 && + !optionsVisible && ( + + + + + {direct ? 'Calling' : `${callMembers.length} Live`} + + + + )} + + )} + + + + )} + + {optionsVisible && !hideText && ( + + {(room.isCallRoom() || (direct && callMembers.length > 0)) && ( + + {isChatOpen ? 'Hide Chat' : 'Show Chat'} + + } + > + {(triggerRef) => ( + + + )} - - - - )} - - {optionsVisible && !hideText && ( - - {(room.isCallRoom() || (direct && callMembers.length > 0)) && ( - + )} + - {isChatOpen ? 'Hide Chat' : 'Show Chat'} - + align={menuAnchor?.width === 0 ? 'Start' : 'End'} + content={ + setMenuAnchor(undefined), + clickOutsideDeactivates: true, + isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown', + isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp', + escapeDeactivates: stopPropagation, + }} + > + setMenuAnchor(undefined)} + notificationMode={notificationMode} + /> + } > - {(triggerRef) => ( + {!hideText && ( - + )} - - )} - setMenuAnchor(undefined), - clickOutsideDeactivates: true, - isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown', - isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp', - escapeDeactivates: stopPropagation, - }} - > - setMenuAnchor(undefined)} - notificationMode={notificationMode} - /> - - } - > - {!hideText && ( - - - - )} - - - )} - - + + + )} + + {room.isCallRoom() && ( - + {callMembers.map((callMembership) => ( ))} )} - + ); } diff --git a/src/app/features/room-nav/RoomNavUser.tsx b/src/app/features/room-nav/RoomNavUser.tsx index c574b1b3d..488545b32 100644 --- a/src/app/features/room-nav/RoomNavUser.tsx +++ b/src/app/features/room-nav/RoomNavUser.tsx @@ -16,9 +16,10 @@ import { useCallEmbed } from '$hooks/useCallEmbed'; type RoomNavUserProps = { room: Room; callMembership: CallMembership; + hideText?: boolean; }; -export function RoomNavUser({ room, callMembership }: RoomNavUserProps) { +export function RoomNavUser({ room, callMembership, hideText }: RoomNavUserProps) { const mx = useMatrixClient(); const useAuthentication = useMediaAuthentication(); const openProfile = useOpenUserRoomProfile(); @@ -45,9 +46,9 @@ export function RoomNavUser({ room, callMembership }: RoomNavUserProps) { return ( - + - + } /> - - {name} - + {!hideText && ( + + {name} + + )}