feat: Enhance space hierarchy management by implementing asynchronous room fetching and improving room handling logic
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import React, { MouseEventHandler, useCallback, useMemo, useRef, useState } from 'react';
|
||||
import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Box, Chip, IconButton, Line, Scroll, Spinner, Text, config } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { useVirtualizer } from '@tanstack/react-virtual';
|
||||
@@ -13,6 +13,8 @@ import { Page, PageContent, PageContentCenter, PageHeroSection } from '../../com
|
||||
import {
|
||||
HierarchyItem,
|
||||
HierarchyItemSpace,
|
||||
fetchAllHierarchyRooms,
|
||||
isHierarchySpaceRoom,
|
||||
useSpaceHierarchy,
|
||||
} from '../../hooks/useSpaceHierarchy';
|
||||
import { VirtualTile } from '../../components/virtualizer';
|
||||
@@ -41,7 +43,7 @@ import { getSpaceRoomPath } from '../../pages/pathUtils';
|
||||
import { StateEvent } from '../../../types/matrix/room';
|
||||
import { CanDropCallback, useDnDMonitor } from './DnD';
|
||||
import { ASCIILexicalTable, orderKeys } from '../../utils/ASCIILexicalTable';
|
||||
import { getStateEvent } from '../../utils/room';
|
||||
import { getStateEvent, shouldShowForumLobby } from '../../utils/room';
|
||||
import { useClosedLobbyCategoriesAtom } from '../../state/hooks/closedLobbyCategories';
|
||||
import {
|
||||
makeCinnySpacesContent,
|
||||
@@ -161,6 +163,7 @@ function SpaceCardLobby() {
|
||||
const allRooms = useAtomValue(allRoomsAtom);
|
||||
const allJoinedRooms = useMemo(() => new Set(allRooms), [allRooms]);
|
||||
const space = useSpace();
|
||||
const isForum = shouldShowForumLobby(space);
|
||||
const spacePowerLevels = usePowerLevels(space);
|
||||
const lex = useMemo(() => new ASCIILexicalTable(' '.charCodeAt(0), '~'.charCodeAt(0), 6), []);
|
||||
const members = useRoomMembers(mx, space.roomId);
|
||||
@@ -189,6 +192,30 @@ function SpaceCardLobby() {
|
||||
|
||||
const [spacesItems, setSpacesItem] = useState<Map<string, IHierarchyRoom>>(() => new Map());
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
void (async () => {
|
||||
try {
|
||||
const all = await fetchAllHierarchyRooms(mx, space.roomId, 3);
|
||||
if (cancelled) return;
|
||||
setSpaceRooms({
|
||||
type: 'PUT',
|
||||
roomIds: all.filter(isHierarchySpaceRoom).map((r) => r.room_id),
|
||||
});
|
||||
setSpacesItem((current) =>
|
||||
produce(current, (draft) => {
|
||||
all.forEach((r) => draft.set(r.room_id, r));
|
||||
})
|
||||
);
|
||||
} catch {
|
||||
// hierarchy may be unavailable for some memberships
|
||||
}
|
||||
})();
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [mx, space.roomId, setSpaceRooms]);
|
||||
|
||||
useElementSizeObserver(
|
||||
useCallback(() => heroSectionRef.current, []),
|
||||
useCallback((w, height) => setHeroSectionHeight(height), [])
|
||||
@@ -206,7 +233,8 @@ function SpaceCardLobby() {
|
||||
closedCategories.has(makeLobbyCategoryId(space.roomId, childId)) ||
|
||||
(draggingItem ? 'space' in draggingItem : false),
|
||||
[closedCategories, space.roomId, draggingItem]
|
||||
)
|
||||
),
|
||||
spacesItems
|
||||
);
|
||||
|
||||
const virtualizer = useVirtualizer({
|
||||
@@ -400,14 +428,16 @@ function SpaceCardLobby() {
|
||||
);
|
||||
|
||||
const handleSpacesFound = useCallback(
|
||||
(sItems: IHierarchyRoom[]) => {
|
||||
setSpaceRooms({ type: 'PUT', roomIds: sItems.map((i) => i.room_id) });
|
||||
setSpacesItem((current) => {
|
||||
const newItems = produce(current, (draft) => {
|
||||
sItems.forEach((item) => draft.set(item.room_id, item));
|
||||
});
|
||||
return current.size === newItems.size ? current : newItems;
|
||||
(items: IHierarchyRoom[]) => {
|
||||
setSpaceRooms({
|
||||
type: 'PUT',
|
||||
roomIds: items.filter(isHierarchySpaceRoom).map((i) => i.room_id),
|
||||
});
|
||||
setSpacesItem((current) =>
|
||||
produce(current, (draft) => {
|
||||
items.forEach((item) => draft.set(item.room_id, item));
|
||||
})
|
||||
);
|
||||
},
|
||||
[setSpaceRooms]
|
||||
);
|
||||
@@ -491,6 +521,7 @@ function SpaceCardLobby() {
|
||||
<SpaceHierarchy
|
||||
spaceItem={item.space}
|
||||
summary={spacesItems.get(item.space.roomId)}
|
||||
hierarchySummaries={spacesItems}
|
||||
roomItems={item.rooms}
|
||||
allJoinedRooms={allJoinedRooms}
|
||||
mDirects={mDirects}
|
||||
@@ -510,7 +541,7 @@ function SpaceCardLobby() {
|
||||
pinned={sidebarSpaces.has(item.space.roomId)}
|
||||
togglePinToSidebar={togglePinToSidebar}
|
||||
onSpacesFound={handleSpacesFound}
|
||||
onOpenRoom={handleOpenRoom}
|
||||
onOpenRoom={isForum ? undefined : handleOpenRoom}
|
||||
/>
|
||||
</VirtualTile>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user