Fix pagination when filtering space hierarchy
parent
8e497f8c56
commit
ce0f16d58b
|
@ -446,7 +446,7 @@ export const useSpaceSummary = (space: Room): {
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const loadMore = useCallback(async (pageSize?: number) => {
|
const loadMore = useCallback(async (pageSize?: number) => {
|
||||||
if (!hierarchy.canLoadMore || hierarchy.noSupport) return;
|
if (loading || !hierarchy.canLoadMore || hierarchy.noSupport) return;
|
||||||
|
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
await hierarchy.load(pageSize);
|
await hierarchy.load(pageSize);
|
||||||
|
@ -648,8 +648,6 @@ const SpaceHierarchy = ({
|
||||||
return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
|
return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
|
||||||
{ ({ onKeyDownHandler }) => {
|
{ ({ onKeyDownHandler }) => {
|
||||||
let content: JSX.Element;
|
let content: JSX.Element;
|
||||||
let loader: JSX.Element;
|
|
||||||
|
|
||||||
if (loading && !rooms.length) {
|
if (loading && !rooms.length) {
|
||||||
content = <Spinner />;
|
content = <Spinner />;
|
||||||
} else {
|
} else {
|
||||||
|
@ -671,19 +669,20 @@ const SpaceHierarchy = ({
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</>;
|
</>;
|
||||||
|
} else if (!hierarchy.canLoadMore) {
|
||||||
if (hierarchy.canLoadMore) {
|
|
||||||
loader = <div ref={loaderRef}>
|
|
||||||
<Spinner />
|
|
||||||
</div>;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
results = <div className="mx_SpaceHierarchy_noResults">
|
results = <div className="mx_SpaceHierarchy_noResults">
|
||||||
<h3>{ _t("No results found") }</h3>
|
<h3>{ _t("No results found") }</h3>
|
||||||
<div>{ _t("You may want to try a different search or check for typos.") }</div>
|
<div>{ _t("You may want to try a different search or check for typos.") }</div>
|
||||||
</div>;
|
</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let loader: JSX.Element;
|
||||||
|
if (hierarchy.canLoadMore) {
|
||||||
|
loader = <div ref={loaderRef}>
|
||||||
|
<Spinner />
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
|
|
||||||
content = <>
|
content = <>
|
||||||
<div className="mx_SpaceHierarchy_listHeader">
|
<div className="mx_SpaceHierarchy_listHeader">
|
||||||
<h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
|
<h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
|
||||||
|
|
Loading…
Reference in New Issue