refactor: __internal_jump_to_message params

Follow-up to the previous commit.
deltachat · Oct 29, 2024 · ef328ca · ef328ca
1 parent 00bdab0
commit ef328ca
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/packages/frontend/src/components/RuntimeAdapter.tsx b/packages/frontend/src/components/RuntimeAdapter.tsx
@@ -55,7 +55,7 @@ export default function RuntimeAdapter({
           clearNotificationsForChat(notificationAccountId, chatId)
         }
         if (msgId) {
-          window.__internal_jump_to_message?.(msgId)
+          window.__internal_jump_to_message?.({ msgId })
         }
       }
     )

diff --git a/packages/frontend/src/components/message/MessageList.tsx b/packages/frontend/src/components/message/MessageList.tsx
@@ -796,11 +796,11 @@ function JumpDownButton({
   jumpToMessageStack,
 }: {
   countUnreadMessages: number
-  jumpToMessage: (
-    msgId: number | undefined,
-    highlight?: boolean,
+  jumpToMessage: (params: {
+    msgId: number | undefined
+    highlight?: boolean
     addMessageIdToStack?: undefined | number
-  ) => Promise<void>
+  }) => Promise<void>
   jumpToMessageStack: number[]
 }) {
   let countToShow: string = countUnreadMessages.toString()
@@ -823,7 +823,7 @@ function JumpDownButton({
         <div
           className='button'
           onClick={() => {
-            jumpToMessage(undefined, true)
+            jumpToMessage({ msgId: undefined, highlight: true })
           }}
         >
           <div

diff --git a/packages/frontend/src/contexts/ChatContext.tsx b/packages/frontend/src/contexts/ChatContext.tsx
@@ -75,7 +75,11 @@ export const ChatProvider = ({
       // Jump to last message if user clicked chat twice
       // @TODO: We probably want this to be part of the UI logic instead
       if (nextChatId === chatId) {
-        window.__internal_jump_to_message?.(undefined, false, undefined)
+        window.__internal_jump_to_message?.({
+          msgId: undefined,
+          highlight: false,
+          addMessageIdToStack: undefined,
+        })
       }
 
       // Already set known state

diff --git a/packages/frontend/src/global.d.ts b/packages/frontend/src/global.d.ts
@@ -23,11 +23,11 @@ declare global {
     __refetchChatlist: undefined | (() => void)
     __internal_jump_to_message:
       | undefined
-      | ((
-          msgId: number | undefined,
-          highlight?: boolean,
+      | ((params: {
+          msgId: number | undefined
+          highlight?: boolean
           addMessageIdToStack?: undefined | number
-        ) => Promise<void>)
+        }) => Promise<void>)
     __updateAccountListSidebar: (() => void) | undefined
   }
 }
diff --git a/packages/frontend/src/hooks/chat/useMessage.ts b/packages/frontend/src/hooks/chat/useMessage.ts
@@ -70,7 +70,11 @@ export default function useMessage() {
 
       // Workaround to actual jump to message in regarding mounted component view
       setTimeout(() => {
-        window.__internal_jump_to_message?.(msgId, highlight, msgParentId)
+        window.__internal_jump_to_message?.({
+          msgId,
+          highlight,
+          addMessageIdToStack: msgParentId,
+        })
       }, 0)
     },
     [chatId, selectChat, setChatView]

diff --git a/packages/frontend/src/stores/messagelist.ts b/packages/frontend/src/stores/messagelist.ts
@@ -346,7 +346,10 @@ class MessageListStore extends Store<MessageListState> {
         if (firstUnreadMsgId !== null) {
           setTimeout(async () => {
             const chat = await chatP
-            this.effect.jumpToMessage(firstUnreadMsgId, false)
+            this.effect.jumpToMessage({
+              msgId: firstUnreadMsgId,
+              highlight: false,
+            })
             ActionEmitter.emitAction(
               chat.archived
                 ? KeybindAction.ChatList_SwitchToArchiveView
@@ -403,11 +406,15 @@ class MessageListStore extends Store<MessageListState> {
      */
     jumpToMessage: this.scheduler.lockedQueuedEffect(
       'scroll',
-      async (
-        jumpToMessageId: number | undefined,
+      async ({
+        msgId: jumpToMessageId,
         highlight = true,
+        addMessageIdToStack,
+      }: {
+        msgId: number | undefined
+        highlight?: boolean
         addMessageIdToStack?: undefined | number
-      ) => {
+      }) => {
         const startTime = performance.now()
 
         this.log.debug('jumpToMessage with messageId: ', jumpToMessageId)