move room members to new sdk
This commit is contained in:
parent
e56eeace64
commit
d254565447
5 changed files with 196 additions and 161 deletions
|
|
@ -1,48 +1,73 @@
|
|||
import React, { ReactNode } from 'react';
|
||||
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
|
||||
import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
|
||||
import { getMemberDisplayName } from '../../utils/room';
|
||||
import { getMxIdLocalPart } from '../../utils/matrix';
|
||||
import { UserAvatar } from '../user-avatar';
|
||||
import * as css from './style.css';
|
||||
|
||||
const getName = (room: Room, member: RoomMember) =>
|
||||
getMemberDisplayName(room, member.userId) ?? getMxIdLocalPart(member.userId) ?? member.userId;
|
||||
import { ClientContext } from '../../../client/context';
|
||||
import { JoinRoomMemberObject } from '../../../client/storage/collections';
|
||||
import { GetRoomMemberNameCallback, GetRoomMemberAvatarCallback } from '../../hooks/useRoomMembers';
|
||||
import { useUserPresence } from '../../hooks/useUserPresence';
|
||||
import { mxcToHttp } from '../../../client/mxcToHttp';
|
||||
import { getMxIdLocalPart } from '../../utils/matrix';
|
||||
import { PresenceBadge, AvatarPresence } from '../presence';
|
||||
|
||||
type MemberTileProps = {
|
||||
mx: MatrixClient;
|
||||
room: Room;
|
||||
member: RoomMember;
|
||||
ct: ClientContext;
|
||||
member: JoinRoomMemberObject;
|
||||
getName: GetRoomMemberNameCallback;
|
||||
getAvatar: GetRoomMemberAvatarCallback;
|
||||
useAuthentication: boolean;
|
||||
after?: ReactNode;
|
||||
};
|
||||
export const MemberTile = as<'button', MemberTileProps>(
|
||||
({ as: AsMemberTile = 'button', mx, room, member, useAuthentication, after, ...props }, ref) => {
|
||||
const name = getName(room, member);
|
||||
(
|
||||
{
|
||||
as: AsMemberTile = 'button',
|
||||
ct,
|
||||
member,
|
||||
getName,
|
||||
getAvatar,
|
||||
useAuthentication,
|
||||
after,
|
||||
...props
|
||||
},
|
||||
ref
|
||||
) => {
|
||||
const presence = useUserPresence(member.userId);
|
||||
const username = getMxIdLocalPart(member.userId);
|
||||
|
||||
const avatarMxcUrl = member.getMxcAvatarUrl();
|
||||
const name = getName(member.userId);
|
||||
const avatarMxcUrl = getAvatar(member.userId);
|
||||
const avatarUrl = avatarMxcUrl
|
||||
? mx.mxcUrlToHttp(avatarMxcUrl, 100, 100, 'crop', undefined, false, useAuthentication)
|
||||
? mxcToHttp(ct.session.baseUrl, avatarMxcUrl, useAuthentication).thumbnail({
|
||||
width: 96,
|
||||
height: 96,
|
||||
method: 'crop',
|
||||
})
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<AsMemberTile className={css.MemberTile} {...props} ref={ref}>
|
||||
<Avatar size="300" radii="400">
|
||||
<UserAvatar
|
||||
userId={member.userId}
|
||||
src={avatarUrl ?? undefined}
|
||||
alt={name}
|
||||
renderFallback={() => <Icon size="300" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
<AvatarPresence
|
||||
variant="Surface"
|
||||
badge={presence && <PresenceBadge size="300" presence={presence.presence} />}
|
||||
>
|
||||
<Avatar size="300" radii="400">
|
||||
<UserAvatar
|
||||
userId={member.userId}
|
||||
src={avatarUrl ?? undefined}
|
||||
alt={name}
|
||||
renderFallback={() => <Icon size="300" src={Icons.User} filled />}
|
||||
/>
|
||||
</Avatar>
|
||||
</AvatarPresence>
|
||||
|
||||
<Box grow="Yes" as="span" direction="Column">
|
||||
<Text as="span" size="T300" truncate>
|
||||
<b>{name}</b>
|
||||
</Text>
|
||||
<Box alignItems="Center" justifyContent="SpaceBetween" gap="100">
|
||||
<Text as="span" size="T200" priority="300" truncate>
|
||||
{username}
|
||||
@{username}
|
||||
</Text>
|
||||
</Box>
|
||||
</Box>
|
||||
|
|
|
|||
|
|
@ -22,24 +22,16 @@ import {
|
|||
toRem,
|
||||
} from 'folds';
|
||||
import { useVirtualizer } from '@tanstack/react-virtual';
|
||||
import { RoomMember } from 'matrix-js-sdk';
|
||||
import { Page, PageContent, PageHeader } from '../../../components/page';
|
||||
import { useRoom } from '../../../hooks/useRoom';
|
||||
import { useRoomMembers } from '../../../hooks/useRoomMembers';
|
||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||
import { useGetMemberPowerLevel, usePowerLevels } from '../../../hooks/usePowerLevels';
|
||||
import { useGetMemberPowerLevel, usePowerLevelsContext } from '../../../hooks/usePowerLevels';
|
||||
import { VirtualTile } from '../../../components/virtualizer';
|
||||
import { MemberTile } from '../../../components/member-tile';
|
||||
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||
import { getMxIdLocalPart, getMxIdServer } from '../../../utils/matrix';
|
||||
import { getMxIdServer } from '../../../utils/matrix';
|
||||
import { ServerBadge } from '../../../components/server-badge';
|
||||
import { useDebounce } from '../../../hooks/useDebounce';
|
||||
import {
|
||||
SearchItemStrGetter,
|
||||
useAsyncSearch,
|
||||
UseAsyncSearchOptions,
|
||||
} from '../../../hooks/useAsyncSearch';
|
||||
import { getMemberSearchStr } from '../../../utils/room';
|
||||
import { useAsyncSearch, UseAsyncSearchOptions } from '../../../hooks/useAsyncSearch';
|
||||
import { useMembershipFilter, useMembershipFilterMenu } from '../../../hooks/useMemberFilter';
|
||||
import { useMemberPowerSort, useMemberSort, useMemberSortMenu } from '../../../hooks/useMemberSort';
|
||||
import { settingsAtom } from '../../../state/settings';
|
||||
|
|
@ -56,6 +48,11 @@ import { useSpaceOptionally } from '../../../hooks/useSpace';
|
|||
import { useFlattenPowerTagMembers, useGetMemberPowerTag } from '../../../hooks/useMemberPowerTag';
|
||||
import { useRoomCreators } from '../../../hooks/useRoomCreators';
|
||||
import { getMouseEventCords } from '../../../utils/dom';
|
||||
import { useClient } from '../../../hooks/useClient';
|
||||
import { usePendingMembers } from '../../../hooks/usePendingMembers';
|
||||
import { JoinRoomMemberObject } from '../../../../client/storage/collections';
|
||||
import { useRoomMembersAPI } from '../../../hooks/useRoomMembers';
|
||||
import { getMemberSearchStr } from '../../../utils/room';
|
||||
|
||||
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
|
||||
limit: 1000,
|
||||
|
|
@ -67,58 +64,65 @@ const SEARCH_OPTIONS: UseAsyncSearchOptions = {
|
|||
},
|
||||
};
|
||||
|
||||
const mxIdToName = (mxId: string) => getMxIdLocalPart(mxId) ?? mxId;
|
||||
const getRoomMemberStr: SearchItemStrGetter<RoomMember> = (m, query) =>
|
||||
getMemberSearchStr(m, query, mxIdToName);
|
||||
|
||||
type MembersProps = {
|
||||
requestClose: () => void;
|
||||
};
|
||||
const EMPTY_MEMBER_LIST: JoinRoomMemberObject[] = [];
|
||||
export function Members({ requestClose }: MembersProps) {
|
||||
const mx = useMatrixClient();
|
||||
const ct = useClient();
|
||||
const roomId = useRoom();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const room = useRoom();
|
||||
const members = useRoomMembers(mx, room.roomId);
|
||||
const fetchingMembers = members.length < room.getJoinedMemberCount();
|
||||
const openProfile = useOpenUserRoomProfile();
|
||||
const profileUser = useUserRoomProfileState();
|
||||
const space = useSpaceOptionally();
|
||||
|
||||
const powerLevels = usePowerLevels(room);
|
||||
const creators = useRoomCreators(room);
|
||||
const getPowerTag = useGetMemberPowerTag(room, creators, powerLevels);
|
||||
const powerLevels = usePowerLevelsContext();
|
||||
const creators = useRoomCreators(roomId);
|
||||
const getPowerTag = useGetMemberPowerTag(creators, powerLevels);
|
||||
const getPowerLevel = useGetMemberPowerLevel(powerLevels);
|
||||
|
||||
const [membershipFilterIndex, setMembershipFilterIndex] = useState(0);
|
||||
const membersAPI = useRoomMembersAPI();
|
||||
const members = membersAPI.memberEventsResult.value ?? EMPTY_MEMBER_LIST;
|
||||
const loadingFromMemory = membersAPI.memberEventsResult.pending;
|
||||
|
||||
const fetchingMembers = usePendingMembers(roomId);
|
||||
|
||||
const openProfile = useOpenUserRoomProfile();
|
||||
const spaceId = useSpaceOptionally();
|
||||
const profileUser = useUserRoomProfileState();
|
||||
|
||||
const membershipFilterMenu = useMembershipFilterMenu(membersAPI.getMembership);
|
||||
const sortFilterMenu = useMemberSortMenu(membersAPI.getName);
|
||||
const [sortFilterIndex, setSortFilterIndex] = useSetting(settingsAtom, 'memberSortFilterIndex');
|
||||
const membershipFilter = useMembershipFilter(membershipFilterIndex, useMembershipFilterMenu());
|
||||
const memberSort = useMemberSort(sortFilterIndex, useMemberSortMenu());
|
||||
const [membershipFilterIndex, setMembershipFilterIndex] = useState(0);
|
||||
|
||||
const membershipFilter = useMembershipFilter(membershipFilterIndex, membershipFilterMenu);
|
||||
const memberSort = useMemberSort(sortFilterIndex, sortFilterMenu);
|
||||
const memberPowerSort = useMemberPowerSort(creators, getPowerLevel);
|
||||
|
||||
const scrollRef = useRef<HTMLDivElement>(null);
|
||||
const searchInputRef = useRef<HTMLInputElement>(null);
|
||||
const scrollTopAnchorRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const sortedMembers = useMemo(
|
||||
() =>
|
||||
Array.from(members)
|
||||
.filter(membershipFilter.filterFn)
|
||||
.sort(memberSort.sortFn)
|
||||
.sort(memberPowerSort),
|
||||
const filteredMembers = useMemo(
|
||||
() => members.filter(membershipFilter.filterFn).sort(memberSort.sortFn).sort(memberPowerSort),
|
||||
[members, membershipFilter, memberSort, memberPowerSort]
|
||||
);
|
||||
const memberCount = filteredMembers.length ?? 0;
|
||||
|
||||
const [result, search, resetSearch] = useAsyncSearch(
|
||||
sortedMembers,
|
||||
getRoomMemberStr,
|
||||
filteredMembers,
|
||||
useCallback(
|
||||
(m, query) => getMemberSearchStr(m, query, membersAPI.getName),
|
||||
[membersAPI.getName]
|
||||
),
|
||||
SEARCH_OPTIONS
|
||||
);
|
||||
if (!result && searchInputRef.current?.value) search(searchInputRef.current.value);
|
||||
|
||||
const flattenTagMembers = useFlattenPowerTagMembers(result?.items ?? sortedMembers, getPowerTag);
|
||||
const processMembers = result ? result.items : filteredMembers;
|
||||
|
||||
const PLTagOrRoomMember = useFlattenPowerTagMembers(processMembers, getPowerTag);
|
||||
|
||||
const virtualizer = useVirtualizer({
|
||||
count: flattenTagMembers.length,
|
||||
count: PLTagOrRoomMember.length,
|
||||
getScrollElement: () => scrollRef.current,
|
||||
estimateSize: () => 40,
|
||||
overscan: 10,
|
||||
|
|
@ -147,7 +151,7 @@ export function Members({ requestClose }: MembersProps) {
|
|||
const btn = evt.currentTarget as HTMLButtonElement;
|
||||
const userId = btn.getAttribute('data-user-id');
|
||||
if (userId) {
|
||||
openProfile(room.roomId, space?.roomId, userId, getMouseEventCords(evt.nativeEvent));
|
||||
openProfile(roomId, spaceId, userId, getMouseEventCords(evt.nativeEvent));
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -157,7 +161,7 @@ export function Members({ requestClose }: MembersProps) {
|
|||
<Box grow="Yes" gap="200">
|
||||
<Box grow="Yes" alignItems="Center" gap="200">
|
||||
<Text size="H3" truncate>
|
||||
{room.getJoinedMemberCount()} Members
|
||||
{memberCount} Members
|
||||
</Text>
|
||||
</Box>
|
||||
<Box shrink="No">
|
||||
|
|
@ -287,13 +291,13 @@ export function Members({ requestClose }: MembersProps) {
|
|||
<Icon src={Icons.ChevronTop} size="300" />
|
||||
</IconButton>
|
||||
</ScrollTopContainer>
|
||||
{fetchingMembers && (
|
||||
{(fetchingMembers || loadingFromMemory) && (
|
||||
<Box justifyContent="Center">
|
||||
<Spinner />
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{!fetchingMembers && !result && flattenTagMembers.length === 0 && (
|
||||
{!loadingFromMemory && !fetchingMembers && !result && processMembers.length === 0 && (
|
||||
<Text style={{ padding: config.space.S300 }} align="Center">
|
||||
{`No "${membershipFilter.name}" Members`}
|
||||
</Text>
|
||||
|
|
@ -308,7 +312,7 @@ export function Members({ requestClose }: MembersProps) {
|
|||
gap="100"
|
||||
>
|
||||
{virtualizer.getVirtualItems().map((vItem) => {
|
||||
const tagOrMember = flattenTagMembers[vItem.index];
|
||||
const tagOrMember = PLTagOrRoomMember[vItem.index];
|
||||
|
||||
if ('userId' in tagOrMember) {
|
||||
const server = getMxIdServer(tagOrMember.userId);
|
||||
|
|
@ -323,9 +327,10 @@ export function Members({ requestClose }: MembersProps) {
|
|||
data-user-id={tagOrMember.userId}
|
||||
onClick={handleMemberClick}
|
||||
aria-pressed={profileUser?.userId === tagOrMember.userId}
|
||||
mx={mx}
|
||||
room={room}
|
||||
ct={ct}
|
||||
member={tagOrMember}
|
||||
getName={membersAPI.getName}
|
||||
getAvatar={membersAPI.getAvatar}
|
||||
useAuthentication={useAuthentication}
|
||||
after={
|
||||
server && (
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ import {
|
|||
usePowerLevelTags,
|
||||
usePowerLevelTagsState,
|
||||
} from '../../hooks/usePowerLevelTags';
|
||||
import { RoomMembersAPIProvider, useCreateRoomMembersAPI } from '../../hooks/useRoomMembers';
|
||||
import { usePendingMemberLoader, usePendingMembers } from '../../hooks/usePendingMembers';
|
||||
|
||||
type RoomSettingsMenuItem = {
|
||||
page: RoomSettingsPage;
|
||||
|
|
@ -86,6 +88,10 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) {
|
|||
const powerLevelTagsResult = usePowerLevelTagsState(roomId);
|
||||
const powerLevelTags = usePowerLevelTags(powerLevels, powerLevelTagsResult.value);
|
||||
|
||||
const membersAPI = useCreateRoomMembersAPI(roomId);
|
||||
const membersPending = usePendingMembers(roomId);
|
||||
usePendingMemberLoader(roomId, membersPending);
|
||||
|
||||
const roomToJoinRule = useObservableValue(ct.roomToJoinRule);
|
||||
|
||||
const avatarUrl = roomAvatar
|
||||
|
|
@ -112,91 +118,93 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) {
|
|||
};
|
||||
|
||||
return (
|
||||
<PowerLevelsContextProvider value={powerLevels}>
|
||||
<PowerLevelTagsContextProvider value={powerLevelTags}>
|
||||
<PageRoot
|
||||
nav={
|
||||
screenSize === ScreenSize.Mobile && activePage !== undefined ? undefined : (
|
||||
<PageNav size="300">
|
||||
<PageNavHeader outlined={false}>
|
||||
<Box grow="Yes" gap="200">
|
||||
<Avatar size="200" radii="300">
|
||||
<RoomAvatar
|
||||
roomId={roomId}
|
||||
src={avatarUrl}
|
||||
alt={roomName}
|
||||
renderFallback={() => (
|
||||
<RoomIcon
|
||||
size="50"
|
||||
roomType={ct.roomToType.read.get(roomId)}
|
||||
joinRule={roomToJoinRule.get(roomId)}
|
||||
filled
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</Avatar>
|
||||
<Text size="H4" truncate>
|
||||
{roomName}
|
||||
</Text>
|
||||
</Box>
|
||||
<Box shrink="No">
|
||||
{screenSize === ScreenSize.Mobile && (
|
||||
<IconButton onClick={requestClose} variant="Background">
|
||||
<Icon src={Icons.Cross} />
|
||||
</IconButton>
|
||||
)}
|
||||
</Box>
|
||||
</PageNavHeader>
|
||||
<Box grow="Yes" direction="Column">
|
||||
<PageNavContent>
|
||||
<div style={{ flexGrow: 1 }}>
|
||||
{menuItems.map((item) => (
|
||||
<MenuItem
|
||||
key={item.name}
|
||||
variant="Background"
|
||||
radii="400"
|
||||
aria-pressed={activePage === item.page}
|
||||
before={
|
||||
<Icon src={item.icon} size="100" filled={activePage === item.page} />
|
||||
}
|
||||
onClick={() => setActivePage(item.page)}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
fontWeight:
|
||||
activePage === item.page ? config.fontWeight.W600 : undefined,
|
||||
}}
|
||||
size="T300"
|
||||
truncate
|
||||
<RoomMembersAPIProvider value={membersAPI}>
|
||||
<PowerLevelsContextProvider value={powerLevels}>
|
||||
<PowerLevelTagsContextProvider value={powerLevelTags}>
|
||||
<PageRoot
|
||||
nav={
|
||||
screenSize === ScreenSize.Mobile && activePage !== undefined ? undefined : (
|
||||
<PageNav size="300">
|
||||
<PageNavHeader outlined={false}>
|
||||
<Box grow="Yes" gap="200">
|
||||
<Avatar size="200" radii="300">
|
||||
<RoomAvatar
|
||||
roomId={roomId}
|
||||
src={avatarUrl}
|
||||
alt={roomName}
|
||||
renderFallback={() => (
|
||||
<RoomIcon
|
||||
size="50"
|
||||
roomType={ct.roomToType.read.get(roomId)}
|
||||
joinRule={roomToJoinRule.get(roomId)}
|
||||
filled
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</Avatar>
|
||||
<Text size="H4" truncate>
|
||||
{roomName}
|
||||
</Text>
|
||||
</Box>
|
||||
<Box shrink="No">
|
||||
{screenSize === ScreenSize.Mobile && (
|
||||
<IconButton onClick={requestClose} variant="Background">
|
||||
<Icon src={Icons.Cross} />
|
||||
</IconButton>
|
||||
)}
|
||||
</Box>
|
||||
</PageNavHeader>
|
||||
<Box grow="Yes" direction="Column">
|
||||
<PageNavContent>
|
||||
<div style={{ flexGrow: 1 }}>
|
||||
{menuItems.map((item) => (
|
||||
<MenuItem
|
||||
key={item.name}
|
||||
variant="Background"
|
||||
radii="400"
|
||||
aria-pressed={activePage === item.page}
|
||||
before={
|
||||
<Icon src={item.icon} size="100" filled={activePage === item.page} />
|
||||
}
|
||||
onClick={() => setActivePage(item.page)}
|
||||
>
|
||||
{item.name}
|
||||
</Text>
|
||||
</MenuItem>
|
||||
))}
|
||||
</div>
|
||||
</PageNavContent>
|
||||
</Box>
|
||||
</PageNav>
|
||||
)
|
||||
}
|
||||
>
|
||||
{activePage === RoomSettingsPage.GeneralPage && (
|
||||
<General requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.MembersPage && (
|
||||
<Members requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.PermissionsPage && (
|
||||
<Permissions requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.EmojisStickersPage && (
|
||||
<EmojisStickers requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.DeveloperToolsPage && (
|
||||
<DeveloperTools requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
</PageRoot>
|
||||
</PowerLevelTagsContextProvider>
|
||||
</PowerLevelsContextProvider>
|
||||
<Text
|
||||
style={{
|
||||
fontWeight:
|
||||
activePage === item.page ? config.fontWeight.W600 : undefined,
|
||||
}}
|
||||
size="T300"
|
||||
truncate
|
||||
>
|
||||
{item.name}
|
||||
</Text>
|
||||
</MenuItem>
|
||||
))}
|
||||
</div>
|
||||
</PageNavContent>
|
||||
</Box>
|
||||
</PageNav>
|
||||
)
|
||||
}
|
||||
>
|
||||
{activePage === RoomSettingsPage.GeneralPage && (
|
||||
<General requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.MembersPage && (
|
||||
<Members requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.PermissionsPage && (
|
||||
<Permissions requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.EmojisStickersPage && (
|
||||
<EmojisStickers requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
{activePage === RoomSettingsPage.DeveloperToolsPage && (
|
||||
<DeveloperTools requestClose={handlePageRequestClose} />
|
||||
)}
|
||||
</PageRoot>
|
||||
</PowerLevelTagsContextProvider>
|
||||
</PowerLevelsContextProvider>
|
||||
</RoomMembersAPIProvider>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,17 +66,17 @@ import { useUserPresence } from '../../hooks/useUserPresence';
|
|||
import { AvatarPresence, PresenceBadge } from '../../components/presence';
|
||||
|
||||
type MemberDrawerHeaderProps = {
|
||||
joinedMemberCount: number;
|
||||
memberCount: number;
|
||||
};
|
||||
function MemberDrawerHeader({ joinedMemberCount }: MemberDrawerHeaderProps) {
|
||||
function MemberDrawerHeader({ memberCount }: MemberDrawerHeaderProps) {
|
||||
const setPeopleDrawer = useSetSetting(settingsAtom, 'isPeopleDrawer');
|
||||
|
||||
return (
|
||||
<Header className={css.MembersDrawerHeader} variant="Background" size="600">
|
||||
<Box grow="Yes" alignItems="Center" gap="200">
|
||||
<Box grow="Yes" alignItems="Center" gap="200">
|
||||
<Text title={`${joinedMemberCount} Members`} size="H5" truncate>
|
||||
{joinedMemberCount > 0 ? `${millify(joinedMemberCount)} Members` : 'Members'}
|
||||
<Text title={`${memberCount} Members`} size="H5" truncate>
|
||||
{memberCount > 0 ? `${millify(memberCount)} Members` : 'Members'}
|
||||
</Text>
|
||||
</Box>
|
||||
<Box shrink="No" alignItems="Center">
|
||||
|
|
@ -229,7 +229,7 @@ export function MembersDrawer() {
|
|||
() => members.filter(membershipFilter.filterFn).sort(memberSort.sortFn).sort(memberPowerSort),
|
||||
[members, membershipFilter, memberSort, memberPowerSort]
|
||||
);
|
||||
const joinedMemberCount = filteredMembers.length ?? 0;
|
||||
const memberCount = filteredMembers.length ?? 0;
|
||||
|
||||
const [result, search, resetSearch] = useAsyncSearch(
|
||||
filteredMembers,
|
||||
|
|
@ -276,7 +276,7 @@ export function MembersDrawer() {
|
|||
shrink="No"
|
||||
direction="Column"
|
||||
>
|
||||
<MemberDrawerHeader joinedMemberCount={joinedMemberCount} />
|
||||
<MemberDrawerHeader memberCount={memberCount} />
|
||||
<Box className={css.MemberDrawerContentBase} grow="Yes">
|
||||
<Scroll ref={scrollRef} variant="Background" size="300" visibility="Hover" hideTrack>
|
||||
<Box className={css.MemberDrawerContent} direction="Column" gap="200">
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@ export type RoomMembersAPI = {
|
|||
memberEventsResult: PendingObservableResult<JoinRoomMemberObject[]>;
|
||||
};
|
||||
|
||||
// FIXME: remove after usage over
|
||||
export const useRoomMembers = () => undefined;
|
||||
|
||||
export const useCreateRoomMembersAPI = (roomId: string): RoomMembersAPI => {
|
||||
const ct = useClient();
|
||||
const memberEventsPromise = useMemo(
|
||||
|
|
|
|||
Loading…
Reference in a new issue