Skip to content

improvement (DataTable): Optimize IntersectionObserver recreation #685

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
paanSinghCoder merged 6 commits into from
Mar 12, 2026
+26 −23
Merged

improvement (DataTable): Optimize IntersectionObserver recreation #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4084f3a
style (dataTable): reduce left padding for group title and right left…
paanSinghCoder Mar 10, 2026
3879374
improvement (data-table): type casting
paanSinghCoder Mar 10, 2026
64115bf
fix: intersection Observer recreation on each render
paanSinghCoder Mar 10, 2026
a9bbd27
docs(datatable): add performance note for stable columns reference
paanSinghCoder Mar 10, 2026
3659ff6
revert: typecasting
paanSinghCoder Mar 10, 2026
33cd22b
revert: css as present in other PR
paanSinghCoder Mar 10, 2026
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
39 changes: 21 additions & 18 deletions packages/raystack/components/data-table/components/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function Rows<TData>({
>
{cells.map(cell => {
const columnDef = cell.column.columnDef as DataTableColumnDef<
unknown,
TData,
unknown
>;
return (
Expand Down Expand Up @@ -184,36 +184,39 @@ export function Content({
const lastRowRef = useRef<HTMLTableRowElement | null>(null);
const observerRef = useRef<IntersectionObserver | null>(null);

const handleObserver = useCallback(
(entries: IntersectionObserverEntry[]) => {
const target = entries[0];
if (target.isIntersecting && !isLoading) {
loadMoreData();
}
},
[loadMoreData, isLoading]
);
/* Refs keep callback stable so observer is only recreated when mode/rows.length change; */
const loadMoreDataRef = useRef(loadMoreData);
const isLoadingRef = useRef(isLoading);
loadMoreDataRef.current = loadMoreData;
isLoadingRef.current = isLoading;

const handleObserver = useCallback((entries: IntersectionObserverEntry[]) => {
const target = entries[0];
if (!target?.isIntersecting) return;
if (isLoadingRef.current) return;
const loadMore = loadMoreDataRef.current;
if (loadMore) loadMore();
}, []);

useEffect(() => {
if (mode !== 'server') return;

if (observerRef.current) {
observerRef.current.disconnect();
observerRef.current = null;
}

const lastRow = lastRowRef.current;
if (!lastRow) return;

observerRef.current = new IntersectionObserver(handleObserver, {
threshold: 0.1
});
const lastRow = lastRowRef.current;
if (lastRow) {
observerRef.current.observe(lastRow);
}
observerRef.current.observe(lastRow);

return () => {
if (observerRef.current && lastRow) {
observerRef.current.unobserve(lastRow);
observerRef.current.disconnect();
}
observerRef.current?.disconnect();
observerRef.current = null;
};
}, [mode, rows.length, handleObserver]);

Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/data-table/components/virtualized-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function VirtualRows<TData>({
>
{cells.map(cell => {
const columnDef = cell.column.columnDef as DataTableColumnDef<
unknown,
TData,
unknown
>;
return (
Expand Down
8 changes: 4 additions & 4 deletions packages/raystack/components/data-table/data-table.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.toolbar {
padding: var(--rs-space-3) var(--rs-space-7) var(--rs-space-3)
var(--rs-space-5);
padding: var(--rs-space-3) var(--rs-space-7) var(--rs-space-3) var(--rs-space-5);
align-self: stretch;

border-bottom: 0.5px solid var(--rs-color-border-base-primary);
Expand All @@ -21,12 +20,13 @@
.display-popover-properties-select {
width: var(--select-width);
}

.display-popover-properties-select[with-icon-button] {
/* Reduce Icon button with "--rs-space-7" and flex gap "--rs-space-2" */
width: calc(var(--select-width) - var(--rs-space-7) - var(--rs-space-2));
}

.display-popover-properties-select > span {
.display-popover-properties-select>span {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
Expand Down Expand Up @@ -154,4 +154,4 @@

.loaderRow {
position: relative;
}
}