Formatting and list hook fix

This commit is contained in:
Infinite
2020-03-01 21:30:40 +01:00
parent 85936edb9c
commit 2fac50ba3e
3 changed files with 25 additions and 14 deletions

View File

@@ -342,6 +342,25 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
})
: undefined;
function maybeRenderContent() {
if (!result.loading && !result.error) {
return options.renderContent(result, filter, selectedIds, zoomIndex);
}
}
function maybeRenderPagination() {
if (!result.loading && !result.error) {
return (
<Pagination
itemsPerPage={filter.itemsPerPage}
currentPage={filter.currentPage}
totalItems={totalCount}
onChangePage={onChangePage}
/>
);
}
}
const template = (
<div>
<ListFilter
@@ -362,15 +381,10 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
{options.renderSelectedOptions && selectedIds.size > 0
? options.renderSelectedOptions(result, selectedIds)
: undefined}
{options.renderContent(result, filter, selectedIds, zoomIndex)}
{ (result.loading || !forageInitialised) && <LoadingIndicator /> }
{ result.error && <h1>{result.error.message}</h1> }
<Pagination
itemsPerPage={filter.itemsPerPage}
currentPage={filter.currentPage}
totalItems={totalCount}
onChangePage={onChangePage}
/>
{(result.loading || !forageInitialised) && <LoadingIndicator />}
{result.error && <h1>{result.error.message}</h1>}
{maybeRenderContent()}
{maybeRenderPagination()}
</div>
);