Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(dashboard): hold a reader when a page lands after a chat switch
Yudhi Armyndharis4e7df3eadcb3
diff --git a/dashboard/src/hooks/useChatScrollPosition.render.test.ts b/dashboard/src/hooks/useChatScrollPosition.render.test.tsindex 315227a53..ecefb5bfc 100644--- a/dashboard/src/hooks/useChatScrollPosition.render.test.ts+++ b/dashboard/src/hooks/useChatScrollPosition.render.test.ts@@ -1153,3 +1153,72 @@ test('a message announced before the reader went back for history does not pin trestore();}});++// The thread is reused across chats, and a page asked for in one chat is not cancelled when the reader leaves it: it+// lands after they come back, above the message the restore put them on.+for (const scenario of [+ { name: 'from a chat with no page out', otherFetching: false },+ { name: 'from a chat whose own page is out', otherFetching: true },+]) {+ test(`an older page that lands after the reader came back ${scenario.name} holds them on their message`, async () => {+ const { render, screen, fireEvent, cleanup } = rtl;+ cleanup();+ const t: Thread = { rows: textRows('a', 46), top: 0 };+ const restore = installRows(t);+ try {+ const { rerender } = render(createElement(RowsProbe, { chatId: 'A', rows: t.rows }));+ const el = screen.getByTestId('thread');+ fireEvent.scroll(el);+ readerScrollsTo(el, 50); // near the top: an older page is asked for+ hook().onOlderMessagesRequested();+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: true }));++ const rowsOfA = t.rows;+ t.rows = textRows('b', 30); // the reader opens B before the page lands+ rerender(createElement(RowsProbe, { chatId: 'B', rows: t.rows, fetching: scenario.otherFetching }));+ fireEvent.scroll(el);+ t.rows = rowsOfA; // and comes back to A, its page still out+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: true }));+ fireEvent.scroll(el);+ assert.equal(el.scrollTop, 50, 'A did not reopen where the reader left it');+ t.rows = [...rowsOfA, { id: 'live', h: 100 }]; // a message far below the reader while the page is out+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: true }));++ t.rows = [...textRows('p', 10), ...t.rows]; // the page lands: 1000px above the reader+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: false }));+ assert.equal(el.scrollTop, 50 + 1000, 'the reader was left on the top of the page that landed');+ } finally {+ restore();+ }+ });+}++// While a page is out, an image that decodes above the reader is left to the landing, which holds them by the message+// they were on: a commit in between (a message far below) must not take that measure again from the moved message.+test('an image that decodes above the reader while an older page is out is counted when the page lands', async () => {+ const { render, screen, fireEvent, cleanup } = rtl;+ cleanup();+ const t: Thread = { rows: textRows('a', 46), top: 0 };+ t.rows[2] = { id: 'a2', h: 100, img: 0 };+ const restore = installRows(t);+ try {+ const { rerender, container } = render(createElement(RowsProbe, { chatId: 'A', rows: t.rows }));+ const el = screen.getByTestId('thread');+ fireEvent.scroll(el);+ readerScrollsTo(el, 450); // the reader is on a4, 50px under the top edge+ hook().onOlderMessagesRequested();+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: true }));++ t.rows[2] = { id: 'a2', h: 100, img: 300 }; // the image in a2 decodes+ hook().onMediaLoad({ currentTarget: container.querySelector('img[data-img="a2"]') });+ await nextFrame();+ t.rows = [...t.rows, { id: 'live', h: 100 }]; // a message far below commits while the page is out+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: true }));++ t.rows = [...textRows('p', 10), ...t.rows]; // the page lands: 1000px above+ rerender(createElement(RowsProbe, { chatId: 'A', rows: t.rows, fetching: false }));+ assert.equal(el.scrollTop, 450 + 300 + 1000, 'the reader was not held on the message they were on');+ } finally {+ restore();+ }+});diff --git a/dashboard/src/hooks/useChatScrollPosition.ts b/dashboard/src/hooks/useChatScrollPosition.tsindex d2698a468..81cd1c4e6 100644--- a/dashboard/src/hooks/useChatScrollPosition.ts+++ b/dashboard/src/hooks/useChatScrollPosition.ts@@ -289,6 +289,14 @@ export function useChatScrollPosition(loadedRef.current = isLoaded;}, [activeChatId, isLoaded, followBottom, pinToBottom, writeScrollTop]);+ const onOlderMessagesRequested = useCallback(() => {+ const el = containerRef.current;+ if (!el) return;+ prevScrollHeightRef.current = el.scrollHeight;+ olderAnchorRef.current = firstVisibleAnchor(el);+ awaitingOlderPageRef.current = true;+ }, []);+// Older messages are prepended ABOVE the viewport, so the thread grows upward and what the user// was reading is pushed down by however much taller it just got. Left alone the view jumps// backwards at the exact moment they asked for more.@@ -304,6 +312,9 @@ export function useChatScrollPosition(const el = containerRef.current;const wasFetching = wasFetchingOlderRef.current;wasFetchingOlderRef.current = isFetchingOlderMessages;+ // A chat shown again with its older page still out (leaving does not cancel it): the switch dropped what the+ // request recorded, so the page is held against where the restore has just put the reader instead.+ if (isFetchingOlderMessages && !awaitingOlderPageRef.current) onOlderMessagesRequested();// The FALLING edge, not merely "not fetching": the request is made in a scroll handler and the// query only reports itself in flight a turn later, so any commit in between — a live message,// a media decode, another query resolving — would otherwise consume the pending correction.@@ -372,14 +383,6 @@ export function useChatScrollPosition(if (el.scrollHeight - el.clientHeight - el.scrollTop <= 1) programmaticTopRef.current = el.scrollTop;});- const onOlderMessagesRequested = useCallback(() => {- const el = containerRef.current;- if (!el) return;- prevScrollHeightRef.current = el.scrollHeight;- olderAnchorRef.current = firstVisibleAnchor(el);- awaitingOlderPageRef.current = true;- }, []);-const onMessageAppended = useCallback((direction: ScrollDirection) => {const el = containerRef.current;// A chat that has not rendered its thread has nothing to follow: the restore decides where it opens. Nor has one