Skip to content

Commit 9967b97

Browse files
wesbillmanPinkyBrain
authored
fix(desktop): classify timeline prepends so history loads don't bump unread (#1416)
Signed-off-by: Wes <[email protected]> Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co> Co-authored-by: Brain <21994759fc7a6fa6b965551d35cfd7897d262f2495467f2d78694ddcfa6a5c7e@sprout-oss.stage.blox.sqprod.co>
1 parent b779a3e commit 9967b97

3 files changed

Lines changed: 76 additions & 6 deletions

File tree

‎desktop/src/features/messages/lib/timelineSnapshot.test.mjs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
22
import test from "node:test";
33

44
import {
5+
classifyTimelineMessageDelta,
56
BOTTOM_THRESHOLD_PX,
67
buildDayGroupBoundaries,
78
isDeferredTimelineSnapshotStale,
@@ -339,6 +340,29 @@ test("no-tearing: stale snapshot keeps all three decisions internally consistent
339340
assert.equal(latestKey, "b");
340341
});
341342

343+
test("classifyTimelineMessageDelta: detects older-history prepends", () => {
344+
const previous = [message({ id: "a" }), message({ id: "b" })];
345+
const current = [message({ id: "older" }), ...previous];
346+
347+
assert.equal(classifyTimelineMessageDelta({ current, previous }), "prepend");
348+
});
349+
350+
test("classifyTimelineMessageDelta: detects latest-message appends", () => {
351+
const previous = [message({ id: "a" }), message({ id: "b" })];
352+
const current = [...previous, message({ id: "c" })];
353+
354+
assert.equal(classifyTimelineMessageDelta({ current, previous }), "append");
355+
});
356+
357+
test("classifyTimelineMessageDelta: unchanged snapshots do not count as arrivals", () => {
358+
const previous = [message({ id: "a" }), message({ id: "b" })];
359+
360+
assert.equal(
361+
classifyTimelineMessageDelta({ current: previous, previous }),
362+
"none",
363+
);
364+
});
365+
342366
// --- deferred reply-list render state (thread side pane) --------------------
343367
//
344368
// When MessageThreadPanel gates its reply render behind useDeferredValue, the

‎desktop/src/features/messages/lib/timelineSnapshot.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,46 @@ export function selectTimelineBodySurface({
203203
return renderState;
204204
}
205205

206+
export type TimelineMessageDelta = "prepend" | "append" | "replace" | "none";
207+
208+
export function classifyTimelineMessageDelta({
209+
current,
210+
previous,
211+
}: {
212+
current: readonly Pick<TimelineMessage, "id">[];
213+
previous: readonly Pick<TimelineMessage, "id">[];
214+
}): TimelineMessageDelta {
215+
if (previous.length === 0 || current.length === 0) {
216+
return previous.length === current.length ? "none" : "replace";
217+
}
218+
219+
const previousFirstId = previous[0]?.id;
220+
const previousLastId = previous[previous.length - 1]?.id;
221+
const currentFirstId = current[0]?.id;
222+
const currentLastId = current[current.length - 1]?.id;
223+
224+
if (previousFirstId === currentFirstId && previousLastId === currentLastId) {
225+
if (previous.length === current.length) {
226+
return "none";
227+
}
228+
return current.length > previous.length ? "append" : "replace";
229+
}
230+
231+
if (
232+
previousFirstId !== undefined &&
233+
currentFirstId !== previousFirstId &&
234+
current.some((message) => message.id === previousFirstId)
235+
) {
236+
return "prepend";
237+
}
238+
239+
if (previousLastId !== undefined && currentLastId !== previousLastId) {
240+
return "append";
241+
}
242+
243+
return "replace";
244+
}
245+
206246
export type TimelineSnapshotIdentity = {
207247
channelId: string | null;
208248
};

‎desktop/src/features/messages/ui/useAnchoredScroll.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as React from "react";
22

3+
import { classifyTimelineMessageDelta } from "@/features/messages/lib/timelineSnapshot";
34
import type { TimelineMessage } from "@/features/messages/types";
45

56
/**
@@ -165,6 +166,7 @@ export function useAnchoredScroll({
165166
const prevLastMessageIdRef = React.useRef<string | undefined>(undefined);
166167
const prevFirstMessageIdRef = React.useRef<string | undefined>(undefined);
167168
const prevMessageCountRef = React.useRef(0);
169+
const prevMessagesRef = React.useRef<TimelineMessage[]>([]);
168170
const handledTargetIdRef = React.useRef<string | null>(null);
169171
const highlightTimeoutRef = React.useRef<number | null>(null);
170172
// Tracks a pending rAF queued by pinToBottomOnMount so it can be cancelled
@@ -194,6 +196,7 @@ export function useAnchoredScroll({
194196
prevLastMessageIdRef.current = undefined;
195197
prevFirstMessageIdRef.current = undefined;
196198
prevMessageCountRef.current = 0;
199+
prevMessagesRef.current = [];
197200
handledTargetIdRef.current = null;
198201
forceBottomOnNextAppendRef.current = false;
199202
settlingRef.current = false;
@@ -363,27 +366,28 @@ export function useAnchoredScroll({
363366
prevLastMessageIdRef.current = messages[messages.length - 1]?.id;
364367
prevFirstMessageIdRef.current = messages[0]?.id;
365368
prevMessageCountRef.current = messages.length;
369+
prevMessagesRef.current = messages;
366370
return;
367371
}
368372

369373
const anchor = anchorRef.current;
370374
const lastMessage = messages[messages.length - 1];
371375
const firstMessage = messages[0];
372376
const prevLastId = prevLastMessageIdRef.current;
373-
const prevFirstId = prevFirstMessageIdRef.current;
374377
const prevCount = prevMessageCountRef.current;
375378
const newLatestArrived =
376379
lastMessage !== undefined && lastMessage.id !== prevLastId;
377380
// Count growth, not tail-id change, is the reliable "messages arrived"
378381
// signal. The relay can deliver a message that sorts ahead of an existing
379382
// same-second row, so the list grows without the *last* id changing —
380383
// `newLatestArrived` misses that case and the unread counter never bumps.
384+
const prevMessages = prevMessagesRef.current;
381385
const messagesArrived = messages.length - prevCount;
382-
const frontChanged =
383-
firstMessage !== undefined &&
384-
prevFirstId !== undefined &&
385-
firstMessage.id !== prevFirstId;
386-
const isPrepend = frontChanged && !newLatestArrived;
386+
const isPrepend =
387+
classifyTimelineMessageDelta({
388+
current: messages,
389+
previous: prevMessages,
390+
}) === "prepend";
387391

388392
// One-shot: an outbound send armed `scrollToBottomOnNextUpdate`. When the
389393
// resulting append lands, snap to bottom regardless of the current anchor,
@@ -399,6 +403,7 @@ export function useAnchoredScroll({
399403
prevLastMessageIdRef.current = lastMessage?.id;
400404
prevFirstMessageIdRef.current = firstMessage?.id;
401405
prevMessageCountRef.current = messages.length;
406+
prevMessagesRef.current = messages;
402407
return;
403408
}
404409

@@ -436,6 +441,7 @@ export function useAnchoredScroll({
436441
prevLastMessageIdRef.current = lastMessage?.id;
437442
prevFirstMessageIdRef.current = firstMessage?.id;
438443
prevMessageCountRef.current = messages.length;
444+
prevMessagesRef.current = messages;
439445
}, [
440446
isLoading,
441447
messages,

0 commit comments

Comments
 (0)