Skip to content

Fix an infinite fetch loop in FormTable #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Fix an infinite fetch loop in FormTable #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6405479
Fix an infinite fetch loop in FormTable
maxpatiiuk Oct 10, 2022
5dc92ad
Merge remote-tracking branch 'origin/production' into issue-2309
maxpatiiuk Oct 11, 2022
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
8 changes: 4 additions & 4 deletions specifyweb/frontend/js_src/lib/components/formtable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ export function FormTable<SCHEMA extends AnySchema>({
const headerIsVisible =
resources.length !== 1 || !isExpanded[resources[0].cid];

const scrollerRef = React.useRef<HTMLDivElement | null>(null);
const [scroller, setScroller] = React.useState<HTMLDivElement | null>(null);
const { isFetching, handleScroll } = useInfiniteScroll(
handleFetchMore,
scrollerRef
scroller
);

// FEATURE: add <FormPreferences /> for formTable records when expanded
Expand Down Expand Up @@ -176,7 +176,7 @@ export function FormTable<SCHEMA extends AnySchema>({
}`,
maxHeight: `${maxHeight}px`,
}}
forwardRef={scrollerRef}
forwardRef={setScroller}
onScroll={handleScroll}
>
<div className={headerIsVisible ? 'contents' : 'sr-only'} role="row">
Expand Down Expand Up @@ -474,7 +474,7 @@ export function FormTableCollection({
setRecords(Array.from(collection.models));
handleDelete?.(resource);
}}
onFetchMore={handleFetchMore}
onFetchMore={collection.isComplete() ? undefined : handleFetchMore}
{...props}
/>
);
Expand Down
6 changes: 3 additions & 3 deletions specifyweb/frontend/js_src/lib/components/queryresultstable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,10 @@ export function QueryResultsTable({
treeRanksLoaded === true;
const canFetchMore = !Array.isArray(results) || results.length !== totalCount;

const scrollRef = React.useRef<HTMLDivElement | null>(null);
const [scroller, setScroller] = React.useState<HTMLDivElement | null>(null);
const { isFetching, handleScroll } = useInfiniteScroll(
canFetchMore ? handleFetchMore : undefined,
scrollRef
scroller
);

return (
Expand Down Expand Up @@ -433,7 +433,7 @@ export function QueryResultsTable({
'--columns': fieldSpecs.length,
} as React.CSSProperties
}
ref={scrollRef}
ref={setScroller}
onScroll={
showResults && (isFetching || !canFetchMore)
? undefined
Expand Down
14 changes: 7 additions & 7 deletions specifyweb/frontend/js_src/lib/components/useInfiniteScroll.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useBooleanState } from './hooks';
*/
export function useInfiniteScroll(
handleFetch: (() => Promise<void>) | undefined,
scrollerRef: React.RefObject<HTMLElement | null>
scroller: HTMLElement | null
): {
readonly isFetching: boolean;
readonly handleScroll: (event: React.UIEvent<HTMLElement>) => void;
Expand All @@ -23,15 +23,15 @@ export function useInfiniteScroll(
isFetchingRef.current = false;
await new Promise((resolve) => setTimeout(resolve, 0));
// Fetch until there is a scroll bar
if (
scrollerRef.current !== null &&
scrollerRef.current.scrollHeight === scrollerRef.current.clientHeight
)
if (scroller !== null && scroller.scrollHeight === scroller.clientHeight)
doFetch().catch(crash);
handleFetched();
}, [handleFetch, scrollerRef, handleFetching, handleFetched]);
}, [handleFetch, scroller, handleFetching, handleFetched]);

React.useEffect(() => void doFetch(), []);
React.useEffect(
() => (typeof scroller === 'object' ? void doFetch() : undefined),
[scroller]
);

return {
isFetching,
Expand Down