Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -909,13 +909,22 @@ export default function UnifiedTransactionList({
return flattened;
}, [processedUnifiedActivityItems]);

const [scrollMargin, setScrollMargin] = useState(0);

const listRef = useCallback((node) => {
if (node) {
setScrollMargin(node.offsetTop);
}
}, []);

const virtualizer = useVirtualizer({
count: items.length,
getScrollElement: () => scrollContainerRef?.current || null,
estimateSize: (index) =>
items[index]?.type === 'date-header' ? HEADER_HEIGHT : ITEM_HEIGHT,
overscan: 10,
initialOffset: scrollContainerRef?.current?.scrollTop,
scrollMargin,
});

return (
Expand Down Expand Up @@ -950,21 +959,24 @@ export default function UnifiedTransactionList({
<TransactionActivityEmptyState className="mx-auto mt-5 mb-6" />
) : (
<div
ref={listRef}
className="transaction-list__transactions relative w-full"
style={{
height: `${virtualizer.getTotalSize()}px`,
}}
>
{virtualizer.getVirtualItems().map((virtualItem) => {
const item = items[virtualItem.index];
const translateY =
virtualItem.start - virtualizer.options.scrollMargin;

if (item.type === 'date-header') {
return (
<div
key={`date-${item.date}`}
className="absolute top-0 left-0 w-full"
style={{
transform: `translateY(${virtualItem.start}px)`,
transform: `translateY(${translateY}px)`,
}}
>
<Text
Expand All @@ -986,7 +998,7 @@ export default function UnifiedTransactionList({
ref={virtualizer.measureElement}
className="absolute top-0 left-0 w-full"
style={{
transform: `translateY(${virtualItem.start}px)`,
transform: `translateY(${translateY}px)`,
}}
>
{renderTransaction(item.data, virtualItem.index)}
Expand Down
Loading