Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix pagination when filtering space hierarchy #6876

Merged
merged 2 commits into from
Oct 1, 2021
Merged

Fix pagination when filtering space hierarchy #6876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce0f16d
Fix pagination when filtering space hierarchy
t3chguy Sep 28, 2021
7f63f49
delint
t3chguy Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/components/structures/SpaceHierarchy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,13 @@ export const useSpaceSummary = (space: Room): {
}));

const loadMore = useCallback(async (pageSize?: number) => {
if (!hierarchy.canLoadMore || hierarchy.noSupport) return;
if (loading || !hierarchy.canLoadMore || hierarchy.noSupport) return;

setLoading(true);
await hierarchy.load(pageSize);
setRooms(hierarchy.rooms);
setLoading(false);
}, [hierarchy]);
}, [loading, hierarchy]);

return { loading, rooms, hierarchy, loadMore };
};
Expand Down Expand Up @@ -648,8 +648,6 @@ const SpaceHierarchy = ({
return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
{ ({ onKeyDownHandler }) => {
let content: JSX.Element;
let loader: JSX.Element;

if (loading && !rooms.length) {
content = <Spinner />;
} else {
Expand All @@ -671,19 +669,20 @@ const SpaceHierarchy = ({
}}
/>
</>;

if (hierarchy.canLoadMore) {
loader = <div ref={loaderRef}>
<Spinner />
</div>;
}
} else {
} else if (!hierarchy.canLoadMore) {
results = <div className="mx_SpaceHierarchy_noResults">
<h3>{ _t("No results found") }</h3>
<div>{ _t("You may want to try a different search or check for typos.") }</div>
</div>;
}

let loader: JSX.Element;
if (hierarchy.canLoadMore) {
loader = <div ref={loaderRef}>
<Spinner />
</div>;
}

content = <>
<div className="mx_SpaceHierarchy_listHeader">
<h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
Expand Down