snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,216 @@
|
||||
import type { UseInfiniteQueryResult } from '@tanstack/react-query';
|
||||
import { act, fireEvent, render, screen } from '@testing-library/react';
|
||||
import { axe } from 'jest-axe';
|
||||
import type { CSSProperties, HTMLAttributes, ReactNode } from 'react';
|
||||
import * as React from 'react';
|
||||
import { Children, forwardRef, isValidElement } from 'react';
|
||||
|
||||
import PaginatedVirtualList from './PaginatedVirtualList';
|
||||
|
||||
const mockVirtualizerHandle = {
|
||||
scrollToIndex: jest.fn(),
|
||||
scrollTo: jest.fn(),
|
||||
findItemIndex: jest.fn((offset: number) => offset),
|
||||
scrollOffset: 0,
|
||||
scrollSize: 1000,
|
||||
viewportSize: 300,
|
||||
};
|
||||
|
||||
type MockVListProps = {
|
||||
children: ReactNode;
|
||||
bufferSize?: number;
|
||||
onScroll?: (offset: number) => void;
|
||||
as?: React.ElementType;
|
||||
item?: React.ElementType;
|
||||
style?: CSSProperties;
|
||||
className?: string;
|
||||
};
|
||||
|
||||
jest.mock('virtua', () => {
|
||||
return {
|
||||
Virtualizer: React.forwardRef(
|
||||
(
|
||||
{ children, bufferSize, onScroll, as: asRoot = 'div', item: asItem = 'div', style, className }: MockVListProps,
|
||||
ref: React.Ref<unknown>,
|
||||
) => {
|
||||
React.useImperativeHandle(ref, () => mockVirtualizerHandle);
|
||||
const Root = asRoot;
|
||||
const Item = asItem;
|
||||
const wrapped = Children.map(children, (child, index) => {
|
||||
const key = isValidElement(child) && child.key != null ? String(child.key) : `row-${index}`;
|
||||
return <Item key={key}>{child}</Item>;
|
||||
});
|
||||
|
||||
return (
|
||||
<Root
|
||||
className={className}
|
||||
data-buffer-size={bufferSize}
|
||||
data-testid='virtual-list'
|
||||
style={style ?? { height: '100%' }}
|
||||
onScroll={() => onScroll?.(mockVirtualizerHandle.scrollOffset)}
|
||||
>
|
||||
{wrapped}
|
||||
</Root>
|
||||
);
|
||||
},
|
||||
),
|
||||
};
|
||||
});
|
||||
|
||||
jest.mock('@rocket.chat/ui-client', () => ({
|
||||
...jest.requireActual('@rocket.chat/ui-client'),
|
||||
CustomVirtuaScrollbars: forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(function CustomVirtuaScrollbars(
|
||||
{ children, ...props },
|
||||
ref,
|
||||
) {
|
||||
// eslint-disable-next-line testing-library/no-node-access
|
||||
const content = isValidElement<{ children?: ReactNode }>(children) && children.type === 'div' ? children.props.children : children;
|
||||
|
||||
return (
|
||||
<div ref={ref} {...props}>
|
||||
{content}
|
||||
</div>
|
||||
);
|
||||
}),
|
||||
}));
|
||||
|
||||
const items = Array.from({ length: 10 }, (_, index) => ({ _id: `${index}` }));
|
||||
|
||||
type VirtualListTestItem = (typeof items)[number];
|
||||
|
||||
const renderVirtualList = (
|
||||
props: Partial<{
|
||||
items: VirtualListTestItem[];
|
||||
totalCount: number;
|
||||
renderItem: (item: VirtualListTestItem, index: number) => ReactNode;
|
||||
overscan?: number;
|
||||
onEndReached?: UseInfiniteQueryResult['fetchNextPage'];
|
||||
}> = {},
|
||||
) => render(<PaginatedVirtualList items={items} totalCount={20} renderItem={(item) => <div>{item._id}</div>} {...props} />);
|
||||
|
||||
const advanceDebouncedScroll = async () => {
|
||||
await act(async () => {
|
||||
await jest.advanceTimersByTimeAsync(300);
|
||||
});
|
||||
};
|
||||
|
||||
describe('PaginatedVirtualList', () => {
|
||||
beforeEach(() => {
|
||||
mockVirtualizerHandle.scrollOffset = 0;
|
||||
mockVirtualizerHandle.scrollSize = 1000;
|
||||
mockVirtualizerHandle.viewportSize = 300;
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
it('has no accessibility violations', async () => {
|
||||
const { container } = renderVirtualList();
|
||||
expect(await axe(container)).toHaveNoViolations();
|
||||
});
|
||||
|
||||
it('calls onEndReached when scrolled near the bottom', async () => {
|
||||
jest.useFakeTimers();
|
||||
const onEndReached = jest.fn().mockResolvedValue(undefined);
|
||||
|
||||
renderVirtualList({ onEndReached });
|
||||
expect(onEndReached).not.toHaveBeenCalled();
|
||||
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('does not call onEndReached when all items are loaded', () => {
|
||||
const onEndReached = jest.fn().mockResolvedValue(undefined);
|
||||
|
||||
renderVirtualList({ onEndReached, totalCount: items.length });
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
|
||||
expect(onEndReached).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('does not call onEndReached repeatedly for the same item count', async () => {
|
||||
jest.useFakeTimers();
|
||||
const onEndReached = jest.fn().mockResolvedValue(undefined);
|
||||
|
||||
renderVirtualList({ onEndReached });
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('calls onEndReached after a same-size dataset reset', async () => {
|
||||
jest.useFakeTimers();
|
||||
const onEndReached = jest.fn().mockResolvedValue(undefined);
|
||||
const { rerender } = renderVirtualList({ onEndReached });
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
const resetItems = Array.from({ length: 10 }, (_, index) => ({ _id: `reset-${index}` }));
|
||||
rerender(
|
||||
<PaginatedVirtualList items={resetItems} totalCount={20} renderItem={(item) => <div>{item._id}</div>} onEndReached={onEndReached} />,
|
||||
);
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it('passes overscan through to virtua buffer size', () => {
|
||||
renderVirtualList({ overscan: 25 });
|
||||
|
||||
expect(screen.getByTestId('virtual-list')).toHaveAttribute('data-buffer-size', '25');
|
||||
});
|
||||
|
||||
it('allows onEndReached to retry after a failed load', async () => {
|
||||
jest.useFakeTimers();
|
||||
const onEndReached = jest.fn().mockRejectedValue(new Error('failed to load more items'));
|
||||
|
||||
renderVirtualList({ onEndReached });
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it('allows onEndReached to retry after a synchronous throw', async () => {
|
||||
jest.useFakeTimers();
|
||||
const onEndReached = jest
|
||||
.fn()
|
||||
.mockImplementationOnce(() => {
|
||||
throw new Error('failed to load more items');
|
||||
})
|
||||
.mockImplementation(() => undefined);
|
||||
|
||||
renderVirtualList({ onEndReached });
|
||||
mockVirtualizerHandle.scrollOffset = 700;
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
fireEvent.scroll(screen.getByTestId('virtual-list'));
|
||||
await advanceDebouncedScroll();
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it('calls onEndReached when the viewport is underfilled', () => {
|
||||
const onEndReached = jest.fn().mockResolvedValue(undefined);
|
||||
mockVirtualizerHandle.scrollSize = 200;
|
||||
|
||||
renderVirtualList({ onEndReached });
|
||||
|
||||
expect(onEndReached).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,103 @@
|
||||
import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
|
||||
import { CustomVirtuaScrollbars } from '@rocket.chat/ui-client';
|
||||
import type { UseInfiniteQueryResult } from '@tanstack/react-query';
|
||||
import type { ReactNode } from 'react';
|
||||
import { useCallback, useLayoutEffect, useRef } from 'react';
|
||||
import type { VirtualizerHandle } from 'virtua';
|
||||
import { Virtualizer } from 'virtua';
|
||||
|
||||
import { VirtuaListContainer } from './VirtuaListContainer';
|
||||
|
||||
const NEAR_BOTTOM_THRESHOLD = -20;
|
||||
|
||||
const scrollViewportStyle = {
|
||||
height: '100%',
|
||||
width: '100%',
|
||||
overflow: 'auto',
|
||||
} as const;
|
||||
|
||||
type PaginatedVirtualListProps<T extends { _id: string }> = {
|
||||
items: T[];
|
||||
totalCount: number;
|
||||
renderItem: (item: T, index: number) => ReactNode;
|
||||
overscan?: number;
|
||||
onEndReached?: UseInfiniteQueryResult['fetchNextPage'];
|
||||
};
|
||||
|
||||
function PaginatedVirtualList<T extends { _id: string }>({
|
||||
items,
|
||||
totalCount,
|
||||
renderItem,
|
||||
overscan,
|
||||
onEndReached,
|
||||
}: PaginatedVirtualListProps<T>) {
|
||||
const virtualizerRef = useRef<VirtualizerHandle | null>(null);
|
||||
const isEndReachedLockedRef = useRef(false);
|
||||
const firstItemId = items[0]?._id ?? '';
|
||||
const lastItemId = items[items.length - 1]?._id ?? '';
|
||||
|
||||
const checkEndReached = useCallback(
|
||||
async (offset: number) => {
|
||||
if (isEndReachedLockedRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
const handle = virtualizerRef.current;
|
||||
|
||||
if (!handle || !onEndReached) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { scrollSize, viewportSize } = handle;
|
||||
if (viewportSize <= 0 || items.length >= totalCount) {
|
||||
return;
|
||||
}
|
||||
|
||||
const nearBottom = offset - scrollSize + viewportSize >= NEAR_BOTTOM_THRESHOLD;
|
||||
if (!nearBottom) {
|
||||
return;
|
||||
}
|
||||
|
||||
isEndReachedLockedRef.current = true;
|
||||
|
||||
try {
|
||||
await onEndReached();
|
||||
} catch {
|
||||
isEndReachedLockedRef.current = false;
|
||||
}
|
||||
},
|
||||
[items.length, onEndReached, totalCount],
|
||||
);
|
||||
|
||||
const handleScroll = useDebouncedCallback(
|
||||
(offset: number) => {
|
||||
checkEndReached(offset);
|
||||
},
|
||||
300,
|
||||
[checkEndReached],
|
||||
);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
isEndReachedLockedRef.current = false;
|
||||
|
||||
const handle = virtualizerRef.current;
|
||||
if (!handle) {
|
||||
return;
|
||||
}
|
||||
checkEndReached(handle.scrollOffset);
|
||||
}, [checkEndReached, firstItemId, items.length, lastItemId, totalCount]);
|
||||
|
||||
return (
|
||||
<CustomVirtuaScrollbars>
|
||||
<div style={scrollViewportStyle}>
|
||||
<Virtualizer ref={virtualizerRef} as={VirtuaListContainer} item='li' bufferSize={overscan} onScroll={handleScroll}>
|
||||
{items.map((item, index) => (
|
||||
<div key={item._id}>{renderItem(item, index)}</div>
|
||||
))}
|
||||
</Virtualizer>
|
||||
</div>
|
||||
</CustomVirtuaScrollbars>
|
||||
);
|
||||
}
|
||||
|
||||
export default PaginatedVirtualList;
|
||||
@@ -0,0 +1,24 @@
|
||||
import type { CSSProperties, HTMLAttributes, ReactNode } from 'react';
|
||||
import { forwardRef } from 'react';
|
||||
|
||||
const listResetStyle = {
|
||||
margin: 0,
|
||||
padding: 0,
|
||||
listStyle: 'none',
|
||||
} as const;
|
||||
|
||||
export type VirtuaListContainerProps = {
|
||||
children: ReactNode;
|
||||
style: CSSProperties;
|
||||
} & Omit<HTMLAttributes<HTMLUListElement>, 'children' | 'style'>;
|
||||
|
||||
export const VirtuaListContainer = forwardRef<HTMLUListElement, VirtuaListContainerProps>(function VirtuaListContainer(
|
||||
{ children, style, ...props },
|
||||
ref,
|
||||
) {
|
||||
return (
|
||||
<ul {...props} ref={ref} style={{ ...listResetStyle, ...style }}>
|
||||
{children}
|
||||
</ul>
|
||||
);
|
||||
});
|
||||
@@ -0,0 +1 @@
|
||||
export { default as PaginatedVirtualList } from './PaginatedVirtualList';
|
||||
Reference in New Issue
Block a user