PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix bug with useRoomHierarchy tight-looping loadMore on error (#7893)

Browse source
This commit is contained in:
Michael Telatynski 2022-02-24 22:52:04 +00:00 committed by GitHub
parent 130bd6aa63
commit e762a6947d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/SpaceHierarchy.tsx
View file

@ -490,9 +490,10 @@ export const useRoomHierarchy = (space: Room): {
} => { } => {
const [rooms, setRooms] = useState<IHierarchyRoom[]>([]); const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
const [hierarchy, setHierarchy] = useState<RoomHierarchy>(); const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
const [error, setError] = useState<Error>(); const [error, setError] = useState<Error | undefined>();
const resetHierarchy = useCallback(() => { const resetHierarchy = useCallback(() => {
setError(undefined);
const hierarchy = new RoomHierarchy(space, INITIAL_PAGE_SIZE); const hierarchy = new RoomHierarchy(space, INITIAL_PAGE_SIZE);
hierarchy.load().then(() => { hierarchy.load().then(() => {
if (space !== hierarchy.root) return; // discard stale results if (space !== hierarchy.root) return; // discard stale results
@ -510,10 +511,10 @@ export const useRoomHierarchy = (space: Room): {
})); }));
const loadMore = useCallback(async (pageSize?: number) => { const loadMore = useCallback(async (pageSize?: number) => {
if (hierarchy.loading || !hierarchy.canLoadMore || hierarchy.noSupport) return; if (hierarchy.loading || !hierarchy.canLoadMore || hierarchy.noSupport || error) return;
await hierarchy.load(pageSize).catch(setError); await hierarchy.load(pageSize).catch(setError);
setRooms(hierarchy.rooms); setRooms(hierarchy.rooms);
}, [hierarchy]); }, [error, hierarchy]);
const loading = hierarchy?.loading ?? true; const loading = hierarchy?.loading ?? true;
return { loading, rooms, hierarchy, loadMore, error }; return { loading, rooms, hierarchy, loadMore, error };