Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(dashboard): drop a decode's frame once its chat is left
Yudhi Armyndharis1c0ef8c2feb0
diff --git a/dashboard/src/hooks/useChatScrollPosition.render.test.ts b/dashboard/src/hooks/useChatScrollPosition.render.test.tsindex 376724ae0..cfd4295a8 100644--- a/dashboard/src/hooks/useChatScrollPosition.render.test.ts+++ b/dashboard/src/hooks/useChatScrollPosition.render.test.ts@@ -687,6 +687,59 @@ test('a thread pinned to the bottom stays there as media decodes, until the read}});+// The container is reused across chats, so a decode's frame that runs after a switch must not act on the chat entered.+test('a decode in the chat being left does not put the chat entered in the same frame at the spot of the one left', async () => {+ const { render, screen, fireEvent, cleanup } = rtl;+ cleanup();+ const g: Geometry = { height: 4600, top: 0 };+ const restore = installGeometry(g);+ try {+ const { rerender } = render(createElement(Probe, { chatId: 'A' }));+ const el = screen.getByTestId('thread');+ fireEvent.scroll(el);+ readerScrollsTo(el, 3000); // the reader's spot in A+ rerender(createElement(Probe, { chatId: 'B' }));+ fireEvent.scroll(el);+ readerScrollsTo(el, 1000); // and in B+ rerender(createElement(Probe, { chatId: 'A' })); // back in A, its restore pending+ fireEvent.scroll(el);++ hook().onMediaLoad(); // an image of A decodes; its re-apply waits for the frame+ rerender(createElement(Probe, { chatId: 'B' })); // the reader opens B before that frame+ await nextFrame();+ assert.equal(el.scrollTop, 1000, 'B was put at the spot saved for A');+ } finally {+ restore();+ }+});++test('a decode in a chat pinned to its bottom does not erase the saved spot of the chat entered in the same frame', async () => {+ const { render, screen, fireEvent, cleanup } = rtl;+ cleanup();+ const g: Geometry = { height: 4600, top: 0 };+ const restore = installGeometry(g);+ try {+ const { rerender } = render(createElement(Probe, { chatId: 'A' }));+ const el = screen.getByTestId('thread');+ fireEvent.scroll(el);+ rerender(createElement(Probe, { chatId: 'B' }));+ fireEvent.scroll(el);+ readerScrollsTo(el, 1000); // the reader's spot in B+ rerender(createElement(Probe, { chatId: 'A' })); // A opens at its bottom, pinned+ fireEvent.scroll(el);++ hook().onMediaLoad(); // an image of A decodes; its re-pin waits for the frame+ g.height = CLIENT_HEIGHT; // B was dropped from the cache: a spinner while it loads+ rerender(createElement(Probe, { chatId: 'B', loaded: false }));+ await nextFrame();+ g.height = 4600;+ rerender(createElement(Probe, { chatId: 'B', loaded: true }));+ assert.equal(el.scrollTop, 1000, `B opened at ${el.scrollTop}, not at the reader's spot`);+ } finally {+ restore();+ }+});+// A chat comes back at its saved spot while its media has not decoded: the short thread clamps the write, so it reads// as at the bottom. A live message announced in that window is not the reader following the conversation.test('a live message in the decode window of a restored chat does not erase the saved spot', async () => {diff --git a/dashboard/src/hooks/useChatScrollPosition.ts b/dashboard/src/hooks/useChatScrollPosition.tsindex 47850475e..e6ecf7c35 100644--- a/dashboard/src/hooks/useChatScrollPosition.ts+++ b/dashboard/src/hooks/useChatScrollPosition.ts@@ -388,18 +388,22 @@ export function useChatScrollPosition(const onMediaLoad = useCallback((event?: { currentTarget: Element | null }) => {+ // The container is reused across chats, so a switch between the event and its frame would apply the frame's+ // write to a different thread, and save it under that thread's id. prevChatIdRef holds whichever chat is+ // actually on screen, set by the restore effect above.+ const onScreen = () => prevChatIdRef.current === activeChatId;const pending = pendingRestoreRef.current;if (pending !== null) {requestAnimationFrame(() => {const cur = containerRef.current;- if (cur && pendingRestoreRef.current !== null) writeScrollTop(cur, pending);+ if (cur && onScreen() && pendingRestoreRef.current !== null) writeScrollTop(cur, pending);});return;}if (pinnedRef.current) {requestAnimationFrame(() => {const cur = containerRef.current;- if (cur && pinnedRef.current) followBottom(cur);+ if (cur && onScreen() && pinnedRef.current) followBottom(cur);});return;}@@ -422,11 +426,7 @@ export function useChatScrollPosition(if (grew === null) return;requestAnimationFrame(() => {const cur = containerRef.current;- if (!cur) return;- // The container is reused across chats, so a switch between the event and this frame would- // apply the correction to a different thread and save it under the outgoing chat's id.- // prevChatIdRef holds whichever chat is actually on screen, set by the restore effect above.- if (prevChatIdRef.current !== activeChatId) return;+ if (!cur || !onScreen()) return;// Add to the LIVE scrollTop, not a value captured at event time: a sibling element decoding// in the same frame has its own rAF that already moved scrollTop, and this one must stack on// top of it. A captured absolute would re-assert the pre-sibling position and lose the sum.