Skip to content

Commit 72ba987

Browse files
authored
fix(desktop): stabilize members dialog scrolling (#6670)
## Summary - Keep virtualized member rows measurable by removing `content-visibility: auto` from the measured row subtree. - Use the member card's 60px baseline as the virtualizer estimate while retaining deferred rendering for eager search and archived-member lists. - Cover large rosters with a regression test that checks stable scroll extent across the list and verifies the final member remains reachable. ### Related issue None found. ### Testing - `just ci` - `pnpm -C desktop build:e2e` - `pnpm -C desktop exec playwright test tests/e2e/channels.spec.ts --grep 'members sidebar virtualizes large channel rosters' --repeat-each=5` #### Before https://github.com/user-attachments/assets/a5fcc040-6872-4200-bcc3-7b4197a4dd23 #### After https://github.com/user-attachments/assets/f2c97f2f-3719-4c2a-b17a-2450c6c70a55 Signed-off-by: Matt Toohey <[email protected]>
1 parent 17af15e commit 72ba987

3 files changed

Lines changed: 102 additions & 53 deletions

File tree

‎desktop/src/features/channels/ui/MembersSidebar.tsx‎

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ import { useMembersSidebarActions } from "./useMembersSidebarActions";
7070
import { useMembersSidebarModeration } from "./useMembersSidebarModeration";
7171
const MEMBER_ADD_RESULT_LIMIT = 50;
7272
const MEMBER_SEARCH_MIN_QUERY_LENGTH = 2;
73+
const MEMBER_ROW_ESTIMATE_PX = 60;
7374
type AddMemberSearchCandidate = UserSearchResult & {
7475
isManagedAgent?: boolean;
7576
isMember?: boolean;
@@ -645,57 +646,62 @@ export function MembersSidebar({
645646
? managedAgentPairAction(managedAgentRuntime)
646647
: undefined;
647648
return (
648-
<div className="content-visibility-auto" key={member.pubkey}>
649-
<MembersSidebarMemberCard
650-
canChangeRole={canManageMembers && member.pubkey !== currentPubkey}
651-
canModerate={canModerate && member.pubkey !== currentPubkey}
652-
canRemoveMember={canRemoveMember(member)}
653-
isActionPending={
654-
isActionPending ||
655-
changeRoleMutation.isPending ||
656-
isModerationPending
657-
}
658-
isArchived={isArchived}
659-
managedAgent={managedAgent}
660-
managedAgentRuntime={managedAgentRuntime}
661-
member={member}
662-
memberIsBot={memberIsBot}
663-
memberAvatarLabel={
664-
member.displayName ?? truncatePubkey(member.pubkey)
665-
}
666-
memberLabel={formatMemberName(member, currentPubkey)}
667-
moderationState={moderationStateByPubkey.get(
668-
normalizePubkey(member.pubkey),
669-
)}
670-
onBan={onBan}
671-
onChangeRole={(m, role) => {
672-
void changeRoleMutation.mutateAsync({ pubkey: m.pubkey, role });
673-
}}
674-
onEditRespondTo={memberIsBot ? setEditRespondToAgent : undefined}
675-
onManagedAgentAction={(agent) => {
676-
void handleAgentLifecycleAction(agent, managedAgentRuntime);
677-
}}
678-
onOpenProfile={handleOpenProfile}
679-
onRemoveMember={handleRemoveMember}
680-
onTimeout={onTimeout}
681-
onUnban={onUnban}
682-
onUntimeout={onUntimeout}
683-
onViewActivity={
684-
onViewActivity
685-
? (pubkey: string) => {
686-
onOpenChange(false);
687-
onViewActivity(pubkey);
688-
}
689-
: undefined
690-
}
691-
pairAction={pairAction}
692-
presenceStatus={
693-
memberPresenceQuery.data?.[member.pubkey.toLowerCase()] ?? null
694-
}
695-
profileAvatarUrl={memberProfile?.avatarUrl ?? null}
696-
showOtherSetupMarker={showOtherSetupMarker}
697-
viewerIsOwner={viewerIsOwner}
698-
/>
649+
<MembersSidebarMemberCard
650+
canChangeRole={canManageMembers && member.pubkey !== currentPubkey}
651+
canModerate={canModerate && member.pubkey !== currentPubkey}
652+
canRemoveMember={canRemoveMember(member)}
653+
isActionPending={
654+
isActionPending || changeRoleMutation.isPending || isModerationPending
655+
}
656+
isArchived={isArchived}
657+
managedAgent={managedAgent}
658+
managedAgentRuntime={managedAgentRuntime}
659+
member={member}
660+
memberIsBot={memberIsBot}
661+
memberAvatarLabel={member.displayName ?? truncatePubkey(member.pubkey)}
662+
memberLabel={formatMemberName(member, currentPubkey)}
663+
moderationState={moderationStateByPubkey.get(
664+
normalizePubkey(member.pubkey),
665+
)}
666+
onBan={onBan}
667+
onChangeRole={(m, role) => {
668+
void changeRoleMutation.mutateAsync({ pubkey: m.pubkey, role });
669+
}}
670+
onEditRespondTo={memberIsBot ? setEditRespondToAgent : undefined}
671+
onManagedAgentAction={(agent) => {
672+
void handleAgentLifecycleAction(agent, managedAgentRuntime);
673+
}}
674+
onOpenProfile={handleOpenProfile}
675+
onRemoveMember={handleRemoveMember}
676+
onTimeout={onTimeout}
677+
onUnban={onUnban}
678+
onUntimeout={onUntimeout}
679+
onViewActivity={
680+
onViewActivity
681+
? (pubkey: string) => {
682+
onOpenChange(false);
683+
onViewActivity(pubkey);
684+
}
685+
: undefined
686+
}
687+
pairAction={pairAction}
688+
presenceStatus={
689+
memberPresenceQuery.data?.[member.pubkey.toLowerCase()] ?? null
690+
}
691+
profileAvatarUrl={memberProfile?.avatarUrl ?? null}
692+
showOtherSetupMarker={showOtherSetupMarker}
693+
viewerIsOwner={viewerIsOwner}
694+
/>
695+
);
696+
}
697+
698+
function renderDeferredMemberCard(
699+
member: ChannelMember,
700+
memberIsBot: boolean,
701+
) {
702+
return (
703+
<div className="content-visibility-auto-member-row" key={member.pubkey}>
704+
{renderMemberCard(member, memberIsBot)}
699705
</div>
700706
);
701707
}
@@ -780,7 +786,7 @@ export function MembersSidebar({
780786
{normalizedSearchQuery ? (
781787
<div>
782788
{filteredActiveMembers.map((member) =>
783-
renderMemberCard(member, isBot(member)),
789+
renderDeferredMemberCard(member, isBot(member)),
784790
)}
785791
{canAddMembers ? (
786792
<>
@@ -824,6 +830,7 @@ export function MembersSidebar({
824830
) : filteredActiveMembers.length > 0 ? (
825831
<VirtualizedList
826832
className="h-[calc(100%_-_2.25rem)]"
833+
estimateSize={MEMBER_ROW_ESTIMATE_PX}
827834
getItemKey={(member) => member.pubkey}
828835
items={filteredActiveMembers}
829836
renderItem={(member) =>
@@ -867,7 +874,7 @@ export function MembersSidebar({
867874
data-testid="members-sidebar-archived-list"
868875
>
869876
{filteredArchivedMembers.map((member) =>
870-
renderMemberCard(member, isBot(member)),
877+
renderDeferredMemberCard(member, isBot(member)),
871878
)}
872879
{filteredArchivedMembers.length === 0 ? (
873880
<p className="text-sm text-muted-foreground">

‎desktop/src/shared/styles/globals/utilities.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@
3737
contain-intrinsic-size: auto 2rem;
3838
}
3939

40+
/*
41+
* Member cards rendered eagerly can skip offscreen layout and paint.
42+
* Virtualized member rows must not use this utility.
43+
*/
44+
.content-visibility-auto-member-row {
45+
content-visibility: auto;
46+
contain-intrinsic-size: auto 3.75rem;
47+
}
48+
4049
.buzz-huddle-tooltip {
4150
background: hsl(
4251
var(--huddle-tooltip-surface, var(--huddle-control-surface, 0 0% 20%))

‎desktop/tests/e2e/channels.spec.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4007,7 +4007,40 @@ test("members sidebar virtualizes large channel rosters", async ({ page }) => {
40074007
await expect(memberRows.first()).toBeVisible();
40084008
expect(await memberRows.count()).toBeLessThan(50);
40094009

4010+
const firstGeneratedRow = memberList.getByTestId(
4011+
`sidebar-member-${pubkeys[0]}`,
4012+
);
4013+
await expect
4014+
.poll(() =>
4015+
firstGeneratedRow.evaluate(
4016+
(row) =>
4017+
getComputedStyle(row.parentElement as HTMLElement).contentVisibility,
4018+
),
4019+
)
4020+
.toBe("visible");
4021+
40104022
const virtualizedList = memberList.locator(".overflow-y-auto");
4023+
await page.evaluate(() => document.fonts.ready);
4024+
4025+
const heights: number[] = [];
4026+
for (const ratio of [0, 0.1, 0.25, 0.5, 0.75, 1]) {
4027+
heights.push(
4028+
await virtualizedList.evaluate(async (element, ratio) => {
4029+
element.scrollTop =
4030+
(element.scrollHeight - element.clientHeight) * ratio;
4031+
element.dispatchEvent(new Event("scroll"));
4032+
4033+
await new Promise<void>((resolve) =>
4034+
requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
4035+
);
4036+
4037+
return element.scrollHeight;
4038+
}, ratio),
4039+
);
4040+
}
4041+
4042+
expect(Math.max(...heights) - Math.min(...heights)).toBeLessThan(120);
4043+
40114044
await virtualizedList.evaluate((element) => {
40124045
element.scrollTop = element.scrollHeight;
40134046
element.dispatchEvent(new Event("scroll"));

0 commit comments

Comments
 (0)