Skip to content
Merged
Show file tree
Hide file tree
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
35 changes: 35 additions & 0 deletions packages/web-shell/client/components/MessageList.dom.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { act, createRef, type RefObject } from 'react';
import { createRoot, type Root } from 'react-dom/client';
import type { Message } from '../adapters/types';
import { I18nProvider } from '../i18n';
import styles from './MessageList.module.css';

// Mock the App context and the heavy row children so this test exercises only
// MessageList's own collapse + deferred-scroll logic, not the whole render tree.
Expand Down Expand Up @@ -41,6 +42,31 @@ vi.mock('./messages/tools/ParallelAgentsGroup', () => ({
}));
vi.mock('./messages/ToolApproval', () => ({ ToolApproval: () => null }));
vi.mock('./messages/AskUserQuestion', () => ({ AskUserQuestion: () => null }));
vi.mock('@tanstack/react-virtual', () => ({
useVirtualizer: ({
count,
enabled,
getItemKey,
}: {
count: number;
enabled: boolean;
getItemKey: (index: number) => string | number;
}) => {
const virtualItems = enabled
? Array.from({ length: Math.min(count, 5) }, (_, index) => ({
key: getItemKey(index),
index,
start: index * 80,
}))
: [];
return {
getVirtualItems: () => virtualItems,
getTotalSize: () => (enabled ? count * 80 : 0),
measureElement: () => {},
scrollToIndex: () => {},
};
},
}));

const { MessageList } = await import('./MessageList');
type MessageListHandle = import('./MessageList').MessageListHandle;
Expand Down Expand Up @@ -312,6 +338,15 @@ describe('MessageList — turn collapse (DOM)', () => {
expect(isCollapsed(c, 'g1')).toBe(true);
});

it('renders virtual scroll rows with sizer and row width classes', () => {
const c = mount(simpleTurns(110));

expect(c.querySelector(`.${styles.virtualSizer}`)).not.toBeNull();
expect(c.querySelectorAll(`.${styles.virtualRow}`).length).toBeGreaterThan(
0,
);
});

it('renders the session timeline in the left gutter without expanding turns', async () => {
const rectSpy = mockMessageListWidth(1200);
const c = mount([
Expand Down
19 changes: 19 additions & 0 deletions packages/web-shell/client/components/MessageList.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@
transition: width 320ms ease;
}

.virtualSizer {
position: relative;
width: 100%;
max-width: none;
margin-right: 0;
margin-left: 0;
transition: none;
}

.virtualRow {
width: min(
100%,
var(--chat-content-width, var(--chat-regular-content-width, 1000px))
);
margin-right: auto;
margin-left: auto;
transition: width 320ms ease;
}

.loadingSkeleton {
display: flex;
flex-direction: column;
Expand Down
14 changes: 8 additions & 6 deletions packages/web-shell/client/components/MessageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2741,26 +2741,28 @@ export const MessageList = memo(
/>
{useVirtualScroll ? (
<div
className={styles.virtualSizer}
style={{
height: totalVirtualSize,
width: '100%',
position: 'relative',
}}
>
{virtualItems.map((virtualRow) => (
<div
key={virtualRow.key}
data-index={virtualRow.index}
ref={virtualizer.measureElement}
className={getRowClassName(
String(virtualRow.key),
visibleItems[virtualRow.index - headerOffset],
className={joinClassNames(
styles.virtualRow,
getRowClassName(
String(virtualRow.key),
visibleItems[virtualRow.index - headerOffset],
),
)}
style={{
position: 'absolute',
top: 0,
left: 0,
width: '100%',
right: 0,
transform: `translateY(${virtualRow.start}px)`,
}}
>
Expand Down
Loading