Skip to content

Table pagination - Fixed bug when page size is small #913

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

Open
AleksandarCila wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −8
Open

Table pagination - Fixed bug when page size is small #913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions packages/firecms_core/src/components/VirtualTable/VirtualTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
const [columns, setColumns] = useState(columnsProp);

const tableRef = useRef<HTMLDivElement>(null);
const endReachCallbackThreshold = useRef<number>(0);
const lastEndReachedDataLength = useRef<number | undefined>(undefined);

const debouncedScroll = useDebounceCallback(onScrollProp, 200);

Expand Down Expand Up @@ -242,7 +242,7 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
}, [filterInput]);

const scrollToTop = useCallback(() => {
endReachCallbackThreshold.current = 0;
lastEndReachedDataLength.current = undefined;
if (tableRef.current) {
tableRef.current.scrollTo(tableRef.current?.scrollLeft, 0);
}
Expand Down Expand Up @@ -278,13 +278,24 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(

const maxScroll = Math.max((data?.length ?? 0) * rowHeight - bounds.height, 0);

const onEndReachedInternal = useCallback((scrollOffset: number) => {
if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + endOffset) {
endReachCallbackThreshold.current = scrollOffset;
const onEndReachedInternal = useCallback(() => {
const dataLength = data?.length ?? 0;

if (onEndReached && dataLength > 0 && lastEndReachedDataLength.current !== dataLength) {
lastEndReachedDataLength.current = dataLength;
onEndReached();
}
}, [data?.length, onEndReached]);

useEffect(() => {
if (!onEndReached || loading || !data?.length || !bounds.height || !tableRef.current) {
return;
}
if (tableRef.current.scrollHeight <= tableRef.current.clientHeight) {
onEndReachedInternal();
}
}, [bounds.height, data?.length, loading, onEndReached, onEndReachedInternal]);

const onScroll = useCallback(({
scrollDirection,
scrollOffset,
Expand All @@ -302,12 +313,12 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
})
}
if (!scrollUpdateWasRequested && (scrollOffset >= maxScroll - endOffset))
onEndReachedInternal(scrollOffset);
}, [maxScroll, onEndReachedInternal]);
onEndReachedInternal();
}, [endOffset, maxScroll, onEndReachedInternal]);

const onFilterUpdateInternal = useCallback((column: VirtualTableColumn, filterForProperty?: [VirtualTableWhereFilterOp, any]) => {

endReachCallbackThreshold.current = 0;
lastEndReachedDataLength.current = undefined;
const filter = filterRef.current;
let newFilterValue: VirtualTableFilterValues<any> = filter ? { ...filter } : {};

Expand Down
Loading