mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
made call members looking properly in the small mode
This commit is contained in:
1 parent
cb98100dfd
commit
bd246d6d3c
2 files changed
+229
-221
No files matched your search
@@ -383,250 +383,255 @@ export function RoomNavItem({
|
||||
.filter(Boolean)
|
||||
.join(', ');
|
||||
return (
|
||||
<Box
|
||||
direction="Column"
|
||||
grow="Yes"
|
||||
style={{ ...hideTextStyling(hideText), marginTop: hideText ? toRem(5) : '0' }}
|
||||
>
|
||||
<NavItem
|
||||
variant="Background"
|
||||
radii="400"
|
||||
highlight={shouldShowUnreadIndicator}
|
||||
aria-selected={selected}
|
||||
data-hover={!!menuAnchor}
|
||||
onContextMenu={handleContextMenu}
|
||||
{...hoverProps}
|
||||
{...focusWithinProps}
|
||||
style={hideTextStyling(hideText)}
|
||||
<>
|
||||
<Box
|
||||
direction="Column"
|
||||
grow="Yes"
|
||||
style={{ ...hideTextStyling(hideText), marginTop: hideText ? toRem(5) : '0' }}
|
||||
>
|
||||
<TooltipProvider
|
||||
position="Right"
|
||||
offset={4}
|
||||
tooltip={
|
||||
hideText && (
|
||||
<Tooltip>
|
||||
<Text>{roomName}</Text>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
<NavItem
|
||||
variant="Background"
|
||||
radii="400"
|
||||
highlight={shouldShowUnreadIndicator}
|
||||
aria-selected={selected}
|
||||
data-hover={!!menuAnchor}
|
||||
onContextMenu={handleContextMenu}
|
||||
{...hoverProps}
|
||||
{...focusWithinProps}
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
<NavButton
|
||||
onClick={handleNavItemClick}
|
||||
aria-label={ariaLabel}
|
||||
ref={triggerRef}
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
<NavItemContent style={hideTextStyling(hideText)}>
|
||||
<Box as="span" grow="Yes" alignItems="Center" style={hideTextStyling(hideText)}>
|
||||
<AvatarPresence
|
||||
badge={
|
||||
presence &&
|
||||
presence.presence !== Presence.Offline && (
|
||||
<PresenceBadge
|
||||
presence={presence.presence}
|
||||
size={hideText ? '300' : '200'}
|
||||
/>
|
||||
)
|
||||
}
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
<Avatar
|
||||
size={hideText ? undefined : '200'}
|
||||
radii="400"
|
||||
<TooltipProvider
|
||||
position="Right"
|
||||
offset={4}
|
||||
tooltip={
|
||||
hideText && (
|
||||
<Tooltip>
|
||||
<Text>{roomName}</Text>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
<NavButton
|
||||
onClick={handleNavItemClick}
|
||||
aria-label={ariaLabel}
|
||||
ref={triggerRef}
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
<NavItemContent style={hideTextStyling(hideText)}>
|
||||
<Box as="span" grow="Yes" alignItems="Center" style={hideTextStyling(hideText)}>
|
||||
<AvatarPresence
|
||||
badge={
|
||||
presence &&
|
||||
presence.presence !== Presence.Offline && (
|
||||
<PresenceBadge
|
||||
presence={presence.presence}
|
||||
size={hideText ? '300' : '200'}
|
||||
/>
|
||||
)
|
||||
}
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
{showAvatar ? (
|
||||
<RoomAvatar
|
||||
roomId={room.roomId}
|
||||
src={
|
||||
((!direct || customDMCards) &&
|
||||
getRoomAvatarUrl(mx, room, 96, useAuthentication)) ||
|
||||
getDirectRoomAvatarUrl(mx, room, 96, useAuthentication)
|
||||
}
|
||||
uniformIcons
|
||||
alt={roomName}
|
||||
renderFallback={() => (
|
||||
<Text as="span" size="H6">
|
||||
{nameInitials(roomName)}
|
||||
<Avatar
|
||||
size={hideText ? undefined : '200'}
|
||||
radii="400"
|
||||
style={hideTextStyling(hideText)}
|
||||
>
|
||||
{showAvatar ? (
|
||||
<RoomAvatar
|
||||
roomId={room.roomId}
|
||||
src={
|
||||
((!direct || customDMCards) &&
|
||||
getRoomAvatarUrl(mx, room, 96, useAuthentication)) ||
|
||||
getDirectRoomAvatarUrl(mx, room, 96, useAuthentication)
|
||||
}
|
||||
uniformIcons
|
||||
alt={roomName}
|
||||
renderFallback={() => (
|
||||
<Text as="span" size="H6">
|
||||
{nameInitials(roomName)}
|
||||
</Text>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
<RoomIcon
|
||||
style={{
|
||||
opacity:
|
||||
unread || hasRoomUnread || isActiveCall
|
||||
? config.opacity.P500
|
||||
: config.opacity.P300,
|
||||
}}
|
||||
filled={selected || isActiveCall}
|
||||
size="100"
|
||||
joinRule={room.getJoinRule()}
|
||||
roomType={room.getType()}
|
||||
/>
|
||||
)}
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
{unread && hideText && (
|
||||
<SidebarUnreadBadge
|
||||
highlight={unread.highlight > 0}
|
||||
count={unread.highlight > 0 ? unread.highlight : unread.total}
|
||||
/>
|
||||
)}
|
||||
|
||||
{!hideText && (
|
||||
<>
|
||||
<Box as="span" grow="Yes" direction="Column">
|
||||
<Text
|
||||
priority={unread || hasRoomUnread || isActiveCall ? '500' : '400'}
|
||||
as="span"
|
||||
size="Inherit"
|
||||
truncate
|
||||
>
|
||||
{roomName}
|
||||
</Text>
|
||||
{roomTopic && (
|
||||
<Text
|
||||
truncate
|
||||
size="T200"
|
||||
priority="300"
|
||||
style={{
|
||||
opacity: config.opacity.P300,
|
||||
marginTop: '-2px',
|
||||
}}
|
||||
>
|
||||
{roomTopic}
|
||||
</Text>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
<RoomIcon
|
||||
style={{
|
||||
opacity:
|
||||
unread || hasRoomUnread || isActiveCall
|
||||
? config.opacity.P500
|
||||
: config.opacity.P300,
|
||||
}}
|
||||
filled={selected || isActiveCall}
|
||||
size="100"
|
||||
joinRule={room.getJoinRule()}
|
||||
roomType={room.getType()}
|
||||
/>
|
||||
)}
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
{unread && hideText && (
|
||||
<SidebarUnreadBadge
|
||||
highlight={unread.highlight > 0}
|
||||
count={unread.highlight > 0 ? unread.highlight : unread.total}
|
||||
/>
|
||||
)}
|
||||
|
||||
{!hideText && (
|
||||
<>
|
||||
<Box as="span" grow="Yes" direction="Column">
|
||||
<Text
|
||||
priority={unread || hasRoomUnread || isActiveCall ? '500' : '400'}
|
||||
as="span"
|
||||
size="Inherit"
|
||||
truncate
|
||||
>
|
||||
{roomName}
|
||||
</Text>
|
||||
{roomTopic && (
|
||||
<Text
|
||||
truncate
|
||||
size="T200"
|
||||
priority="300"
|
||||
style={{
|
||||
opacity: config.opacity.P300,
|
||||
marginTop: '-2px',
|
||||
}}
|
||||
>
|
||||
{roomTopic}
|
||||
</Text>
|
||||
)}
|
||||
</Box>
|
||||
{!optionsVisible && !unread && !selected && typingMember.length > 0 && (
|
||||
<Badge size="300" variant="Secondary" fill="Soft" radii="Pill" outlined>
|
||||
<TypingIndicator size="300" disableAnimation />
|
||||
</Badge>
|
||||
)}
|
||||
{!optionsVisible && shouldShowUnreadIndicator && (
|
||||
<UnreadBadgeCenter>
|
||||
<UnreadBadge
|
||||
highlight={!!unread && unread.highlight > 0}
|
||||
count={unreadCount}
|
||||
dm={direct}
|
||||
/>
|
||||
</UnreadBadgeCenter>
|
||||
)}
|
||||
{!optionsVisible && notificationMode !== RoomNotificationMode.Unset && (
|
||||
<Icon
|
||||
size="50"
|
||||
src={getRoomNotificationModeIcon(notificationMode)}
|
||||
aria-label={notificationMode}
|
||||
/>
|
||||
)}
|
||||
{(room.isCallRoom() || direct) &&
|
||||
callMembers.length > 0 &&
|
||||
!optionsVisible && (
|
||||
<Badge variant="Critical" fill="Solid" size="400">
|
||||
<Box alignItems="Center" gap="100">
|
||||
<Icon size="50" src={Icons.Phone} color="Inherit" />
|
||||
<Text as="span" size="L400" truncate>
|
||||
{direct ? 'Calling' : `${callMembers.length} Live`}
|
||||
</Text>
|
||||
</Box>
|
||||
</Box>
|
||||
{!optionsVisible && !unread && !selected && typingMember.length > 0 && (
|
||||
<Badge size="300" variant="Secondary" fill="Soft" radii="Pill" outlined>
|
||||
<TypingIndicator size="300" disableAnimation />
|
||||
</Badge>
|
||||
)}
|
||||
</>
|
||||
{!optionsVisible && shouldShowUnreadIndicator && (
|
||||
<UnreadBadgeCenter>
|
||||
<UnreadBadge
|
||||
highlight={!!unread && unread.highlight > 0}
|
||||
count={unreadCount}
|
||||
dm={direct}
|
||||
/>
|
||||
</UnreadBadgeCenter>
|
||||
)}
|
||||
{!optionsVisible && notificationMode !== RoomNotificationMode.Unset && (
|
||||
<Icon
|
||||
size="50"
|
||||
src={getRoomNotificationModeIcon(notificationMode)}
|
||||
aria-label={notificationMode}
|
||||
/>
|
||||
)}
|
||||
{(room.isCallRoom() || direct) &&
|
||||
callMembers.length > 0 &&
|
||||
!optionsVisible && (
|
||||
<Badge variant="Critical" fill="Solid" size="400">
|
||||
<Box alignItems="Center" gap="100">
|
||||
<Icon size="50" src={Icons.Phone} color="Inherit" />
|
||||
<Text as="span" size="L400" truncate>
|
||||
{direct ? 'Calling' : `${callMembers.length} Live`}
|
||||
</Text>
|
||||
</Box>
|
||||
</Badge>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</Box>
|
||||
</NavItemContent>
|
||||
</NavButton>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
{optionsVisible && !hideText && (
|
||||
<NavItemOptions>
|
||||
{(room.isCallRoom() || (direct && callMembers.length > 0)) && (
|
||||
<TooltipProvider
|
||||
position="Bottom"
|
||||
offset={4}
|
||||
tooltip={
|
||||
<Tooltip>
|
||||
<Text>{isChatOpen ? 'Hide Chat' : 'Show Chat'}</Text>
|
||||
</Tooltip>
|
||||
}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
<IconButton
|
||||
ref={triggerRef}
|
||||
data-testid="chat-button"
|
||||
onClick={handleChatButtonClick}
|
||||
aria-pressed={isChatOpen && selected}
|
||||
aria-label="Open Chat"
|
||||
variant="Background"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="50" src={Icons.Message} filled={isChatOpen} />
|
||||
</IconButton>
|
||||
)}
|
||||
</Box>
|
||||
</NavItemContent>
|
||||
</NavButton>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
{optionsVisible && !hideText && (
|
||||
<NavItemOptions>
|
||||
{(room.isCallRoom() || (direct && callMembers.length > 0)) && (
|
||||
<TooltipProvider
|
||||
</TooltipProvider>
|
||||
)}
|
||||
<PopOut
|
||||
id={`menu-${room.roomId}`}
|
||||
aria-expanded={!!menuAnchor}
|
||||
anchor={menuAnchor}
|
||||
offset={menuAnchor?.width === 0 ? 0 : undefined}
|
||||
alignOffset={menuAnchor?.width === 0 ? 0 : -5}
|
||||
position="Bottom"
|
||||
offset={4}
|
||||
tooltip={
|
||||
<Tooltip>
|
||||
<Text>{isChatOpen ? 'Hide Chat' : 'Show Chat'}</Text>
|
||||
</Tooltip>
|
||||
align={menuAnchor?.width === 0 ? 'Start' : 'End'}
|
||||
content={
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
returnFocusOnDeactivate: false,
|
||||
onDeactivate: () => setMenuAnchor(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
|
||||
isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<RoomNavItemMenu
|
||||
room={room}
|
||||
requestClose={() => setMenuAnchor(undefined)}
|
||||
notificationMode={notificationMode}
|
||||
/>
|
||||
</FocusTrap>
|
||||
}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
{!hideText && (
|
||||
<IconButton
|
||||
ref={triggerRef}
|
||||
data-testid="chat-button"
|
||||
onClick={handleChatButtonClick}
|
||||
aria-pressed={isChatOpen && selected}
|
||||
aria-label="Open Chat"
|
||||
onClick={handleOpenMenu}
|
||||
aria-pressed={!!menuAnchor}
|
||||
aria-controls={`menu-${room.roomId}`}
|
||||
aria-label="More Options"
|
||||
variant="Background"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="50" src={Icons.Message} filled={isChatOpen} />
|
||||
<Icon size="50" src={Icons.VerticalDots} />
|
||||
</IconButton>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
)}
|
||||
<PopOut
|
||||
id={`menu-${room.roomId}`}
|
||||
aria-expanded={!!menuAnchor}
|
||||
anchor={menuAnchor}
|
||||
offset={menuAnchor?.width === 0 ? 0 : undefined}
|
||||
alignOffset={menuAnchor?.width === 0 ? 0 : -5}
|
||||
position="Bottom"
|
||||
align={menuAnchor?.width === 0 ? 'Start' : 'End'}
|
||||
content={
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
returnFocusOnDeactivate: false,
|
||||
onDeactivate: () => setMenuAnchor(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
|
||||
isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<RoomNavItemMenu
|
||||
room={room}
|
||||
requestClose={() => setMenuAnchor(undefined)}
|
||||
notificationMode={notificationMode}
|
||||
/>
|
||||
</FocusTrap>
|
||||
}
|
||||
>
|
||||
{!hideText && (
|
||||
<IconButton
|
||||
onClick={handleOpenMenu}
|
||||
aria-pressed={!!menuAnchor}
|
||||
aria-controls={`menu-${room.roomId}`}
|
||||
aria-label="More Options"
|
||||
variant="Background"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="50" src={Icons.VerticalDots} />
|
||||
</IconButton>
|
||||
)}
|
||||
</PopOut>
|
||||
</NavItemOptions>
|
||||
)}
|
||||
</NavItem>
|
||||
|
||||
</PopOut>
|
||||
</NavItemOptions>
|
||||
)}
|
||||
</NavItem>
|
||||
</Box>
|
||||
{room.isCallRoom() && (
|
||||
<Box direction="Column" style={{ paddingLeft: config.space.S200 }}>
|
||||
<Box
|
||||
direction="Column"
|
||||
style={{ paddingLeft: hideText ? config.space.S0 : config.space.S200 }}
|
||||
>
|
||||
{callMembers.map((callMembership) => (
|
||||
<RoomNavUser
|
||||
key={callMembership.membershipID}
|
||||
room={room}
|
||||
callMembership={callMembership}
|
||||
hideText={hideText}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -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 (
|
||||
<NavItem variant="Background" radii="400">
|
||||
<NavButton onClick={handleNavUserClick} aria-label={ariaLabel}>
|
||||
<NavItemContent as="div">
|
||||
<NavItemContent as="div" style={hideText ? { padding: '0' } : {}}>
|
||||
<Box direction="Column" grow="Yes" gap="200" justifyContent="Stretch">
|
||||
<Box alignItems="Center" gap="200">
|
||||
<Box alignItems="Center" gap="200" justifyContent={hideText ? 'Center' : 'Start'}>
|
||||
<Avatar size="200">
|
||||
<UserAvatar
|
||||
userId={userId}
|
||||
@@ -56,9 +57,11 @@ export function RoomNavUser({ room, callMembership }: RoomNavUserProps) {
|
||||
renderFallback={() => <Icon size="50" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
<Text as="span" size="B400" priority="300" truncate>
|
||||
{name}
|
||||
</Text>
|
||||
{!hideText && (
|
||||
<Text as="span" size="B400" priority="300" truncate>
|
||||
{name}
|
||||
</Text>
|
||||
)}
|
||||
</Box>
|
||||
</Box>
|
||||
</NavItemContent>
|
||||
|
||||
Reference in new issue
Block a user