Skip to content

fix(desktop): remount timeline scroll node per channel #1147

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
tlongwell-block merged 1 commit into from
Jun 19, 2026
Merged

fix(desktop): remount timeline scroll node per channel #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion desktop/src/features/channels/ui/ChannelPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ export const ChannelPane = React.memo(function ChannelPane({
useComposerHeightPadding(
timelineScrollRef,
composerWrapperRef,
`${isSinglePanelView}:${hasMainComposerOverlay}`,
`${activeChannelId}:${isSinglePanelView}:${hasMainComposerOverlay}`,
);

const clearWelcomeComposerDismissTimer = React.useCallback(() => {
Expand Down
7 changes: 7 additions & 0 deletions desktop/src/features/messages/ui/MessageTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ const MessageTimelineBase = React.forwardRef<
const scrollRestorationId = targetMessageId
? `message-timeline:${channelId ?? "none"}:target:${targetMessageId}`
: `message-timeline:${channelId ?? "none"}`;
// Keep the scroll node's DOM lifetime scoped to a channel. TanStack Router's
// scroll-restoration listener runs outside React and may write a saved
// scrollTop into the current scroll element during navigation; reusing the
// same node across channel routes can leave the newly-loaded message list
// painted at a stale offset until the user's next scroll event forces layout.
const scrollContainerDomKey = channelId ?? "none";

const timelineBodySurface = selectTimelineBodySurface({
deferredCount: deferredMessages.length,
Expand Down Expand Up @@ -339,6 +345,7 @@ const MessageTimelineBase = React.forwardRef<
)}
data-scroll-restoration-id={scrollRestorationId}
data-testid="message-timeline"
key={scrollContainerDomKey}
onScroll={onScroll}
ref={scrollContainerRef}
>
Expand Down