mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
Merge pull request #98 from nushea/sable-statuses-good-hopefully-i-swear-to-god
Display acount status in the member drawer and profile card
This commit is contained in:
4 files changed
+119
-57
No files matched your search
@@ -22,10 +22,9 @@ const PresenceToColor: Record<Presence, MainColor> = {
|
||||
|
||||
type PresenceBadgeProps = {
|
||||
presence: Presence;
|
||||
status?: string;
|
||||
size?: '200' | '300' | '400' | '500';
|
||||
};
|
||||
export function PresenceBadge({ presence, status, size }: PresenceBadgeProps) {
|
||||
export function PresenceBadge({ presence, size }: PresenceBadgeProps) {
|
||||
const label = usePresenceLabel();
|
||||
const badgeLabelId = useId();
|
||||
|
||||
@@ -39,8 +38,6 @@ export function PresenceBadge({ presence, status, size }: PresenceBadgeProps) {
|
||||
<Tooltip id={badgeLabelId}>
|
||||
<Box style={{ maxWidth: toRem(250) }} alignItems="Baseline" gap="100">
|
||||
<Text size="L400">{label[presence]}</Text>
|
||||
{status && <Text size="T200">•</Text>}
|
||||
{status && <Text size="T200">{status}</Text>}
|
||||
</Box>
|
||||
</Tooltip>
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ import {
|
||||
OverlayBackdrop,
|
||||
OverlayCenter,
|
||||
Text,
|
||||
Tooltip,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import classNames from 'classnames';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
@@ -34,6 +36,7 @@ type UserHeroProps = {
|
||||
};
|
||||
export function UserHero({ userId, avatarUrl, bannerUrl, presence }: UserHeroProps) {
|
||||
const [viewAvatar, setViewAvatar] = useState<string>();
|
||||
const [isFullStatus, setIsFullStatus] = useState(false);
|
||||
|
||||
const cachedBannerUrl = useBlobCache(bannerUrl);
|
||||
const cachedAvatarUrl = useBlobCache(avatarUrl);
|
||||
@@ -58,51 +61,80 @@ export function UserHero({ userId, avatarUrl, bannerUrl, presence }: UserHeroPro
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<div className={css.UserHeroAvatarContainer}>
|
||||
<AvatarPresence
|
||||
className={css.UserAvatarContainer}
|
||||
badge={
|
||||
presence && <PresenceBadge presence={presence.presence} status={presence.status} />
|
||||
}
|
||||
>
|
||||
<Avatar
|
||||
as={avatarUrl ? 'button' : 'div'}
|
||||
onClick={avatarUrl ? () => setViewAvatar(avatarUrl) : undefined}
|
||||
className={css.UserHeroAvatar}
|
||||
size="500"
|
||||
<Box direction="Row" className={css.UserHeroAvatarStatusContainer}>
|
||||
<div className={css.UserHeroAvatarContainer}>
|
||||
<AvatarPresence
|
||||
className={css.UserAvatarContainer}
|
||||
badge={presence && <PresenceBadge presence={presence.presence} />}
|
||||
>
|
||||
<UserAvatar
|
||||
className={css.UserHeroAvatarImg}
|
||||
userId={userId}
|
||||
src={avatarUrl}
|
||||
alt={userId}
|
||||
renderFallback={() => <Icon size="500" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
{viewAvatar && (
|
||||
<Overlay open backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
onDeactivate: () => setViewAvatar(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
escapeDeactivates: stopPropagation,
|
||||
<Avatar
|
||||
as={avatarUrl ? 'button' : 'div'}
|
||||
onClick={avatarUrl ? () => setViewAvatar(avatarUrl) : undefined}
|
||||
className={css.UserHeroAvatar}
|
||||
size="500"
|
||||
>
|
||||
<UserAvatar
|
||||
className={css.UserHeroAvatarImg}
|
||||
userId={userId}
|
||||
src={avatarUrl}
|
||||
alt={userId}
|
||||
renderFallback={() => <Icon size="500" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
{viewAvatar && (
|
||||
<Overlay open backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
onDeactivate: () => setViewAvatar(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<Modal size="500" onContextMenu={(evt: any) => evt.stopPropagation()}>
|
||||
<ImageViewer
|
||||
src={viewAvatar}
|
||||
alt={userId}
|
||||
requestClose={() => setViewAvatar(undefined)}
|
||||
/>
|
||||
</Modal>
|
||||
</FocusTrap>
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
)}
|
||||
</div>
|
||||
{presence?.status?.length && (
|
||||
<div className={css.UserHeroStatusContainer}>
|
||||
<Tooltip
|
||||
onClick={() => setIsFullStatus(!isFullStatus)}
|
||||
className={css.UserHeroStatusTooltip}
|
||||
style={{
|
||||
maxHeight: isFullStatus ? toRem(105) : toRem(48),
|
||||
}}
|
||||
>
|
||||
<Text
|
||||
size="T200"
|
||||
style={{
|
||||
overflow: isFullStatus ? 'scroll' : 'hidden',
|
||||
height: '100%',
|
||||
wordBreak: 'break-word',
|
||||
}}
|
||||
>
|
||||
<Modal size="500" onContextMenu={(evt: any) => evt.stopPropagation()}>
|
||||
<ImageViewer
|
||||
src={viewAvatar}
|
||||
alt={userId}
|
||||
requestClose={() => setViewAvatar(undefined)}
|
||||
/>
|
||||
</Modal>
|
||||
</FocusTrap>
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
{presence.status}
|
||||
</Text>
|
||||
{presence.status.length > 70 && (
|
||||
<Icon
|
||||
size="50"
|
||||
style={{ position: 'relative', left: '2.5%' }}
|
||||
src={isFullStatus ? Icons.ChevronTop : Icons.ChevronBottom}
|
||||
/>
|
||||
)}
|
||||
</Tooltip>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</Box>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -31,17 +31,38 @@ export const UserHeroCoverFallback = style({
|
||||
transform: 'scale(2)',
|
||||
});
|
||||
|
||||
export const UserHeroAvatarContainer = style({
|
||||
export const UserHeroAvatarStatusContainer = style({
|
||||
position: 'relative',
|
||||
height: toRem(29),
|
||||
width: '100%',
|
||||
});
|
||||
export const UserHeroAvatarContainer = style({
|
||||
position: 'relative',
|
||||
paddingLeft: config.space.S400,
|
||||
});
|
||||
export const UserAvatarContainer = style({
|
||||
position: 'absolute',
|
||||
left: config.space.S400,
|
||||
position: 'relative',
|
||||
top: 0,
|
||||
transform: 'translateY(-50%)',
|
||||
backgroundColor: color.Surface.Container,
|
||||
});
|
||||
export const UserHeroStatusContainer = style({
|
||||
position: 'relative',
|
||||
transform: 'translateY(-50%)',
|
||||
textAlign: 'justify',
|
||||
display: 'grid',
|
||||
width: '100%',
|
||||
paddingLeft: '2%',
|
||||
});
|
||||
export const UserHeroStatusTooltip = style({
|
||||
maxWidth: '98%',
|
||||
justifySelf: 'left',
|
||||
cursor: 'pointer',
|
||||
':hover': {
|
||||
filter: 'brightness(0.8)',
|
||||
transform: 'translateY(-1px)',
|
||||
},
|
||||
});
|
||||
export const UserHeroAvatar = style({
|
||||
outline: `${config.borderWidth.B600} solid ${color.Surface.Container}`,
|
||||
selectors: {
|
||||
|
||||
@@ -30,6 +30,8 @@ import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
|
||||
import { useVirtualizer } from '@tanstack/react-virtual';
|
||||
import classNames from 'classnames';
|
||||
|
||||
import { AvatarPresence, PresenceBadge } from '$components/presence';
|
||||
import { useUserPresence } from '$hooks/useUserPresence';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { UseStateProvider } from '$components/UseStateProvider';
|
||||
import { SearchItemStrGetter, UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
|
||||
@@ -128,6 +130,7 @@ function MemberItem({
|
||||
? mx.mxcUrlToHttp(avatarMxcUrl, 100, 100, 'crop', undefined, false, useAuthentication)
|
||||
: undefined;
|
||||
|
||||
const presence = useUserPresence(member.userId);
|
||||
const { color, font } = useSableCosmetics(member.userId, room);
|
||||
|
||||
return (
|
||||
@@ -139,14 +142,18 @@ function MemberItem({
|
||||
radii="400"
|
||||
onClick={onClick}
|
||||
before={
|
||||
<Avatar size="200">
|
||||
<UserAvatar
|
||||
userId={member.userId}
|
||||
src={avatarUrl ?? undefined}
|
||||
alt={name}
|
||||
renderFallback={() => <Icon size="50" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
<AvatarPresence
|
||||
badge={presence && <PresenceBadge presence={presence.presence} size="200" />}
|
||||
>
|
||||
<Avatar size="200">
|
||||
<UserAvatar
|
||||
userId={member.userId}
|
||||
src={avatarUrl ?? undefined}
|
||||
alt={name}
|
||||
renderFallback={() => <Icon size="50" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
}
|
||||
after={
|
||||
typing && (
|
||||
@@ -156,10 +163,15 @@ function MemberItem({
|
||||
)
|
||||
}
|
||||
>
|
||||
<Box grow="Yes">
|
||||
<Box direction="Column" grow="Yes">
|
||||
<Text size="T400" truncate style={{ color, fontFamily: font }}>
|
||||
{name}
|
||||
</Text>
|
||||
{presence?.status && (
|
||||
<Text size="T300" truncate style={{ color: config.opacity.P300, fontFamily: font }}>
|
||||
{presence.status}
|
||||
</Text>
|
||||
)}
|
||||
</Box>
|
||||
</MenuItem>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user