@bobfrankston/rmfmail 1.1.169 → 1.1.174

package/client/app.bundle.js

@@ -2531,6 +2531,31 @@ function currentViewKey() {
   const flaggedOnly = document.getElementById("ml-body")?.classList.contains("flagged-only") || false;
   return cacheKey("folder", currentAccountId2, currentFolderId, flaggedOnly);
 }
+function withScrollAnchor(body, doRender) {
+  const scrollTop = body.scrollTop;
+  if (scrollTop < 4) {
+    doRender();
+    return;
+  }
+  const rowsBefore = Array.from(body.querySelectorAll(".ml-row"));
+  let anchorUuid = "";
+  let anchorOffsetWithinViewport = 0;
+  for (const r of rowsBefore) {
+    const visualTop = r.offsetTop - scrollTop;
+    if (visualTop >= 0) {
+      anchorUuid = r.dataset.uuid || "";
+      anchorOffsetWithinViewport = visualTop;
+      break;
+    }
+  }
+  doRender();
+  if (!anchorUuid)
+    return;
+  const after = body.querySelector(`.ml-row[data-uuid="${CSS.escape(anchorUuid)}"]`);
+  if (after) {
+    body.scrollTop = after.offsetTop - anchorOffsetWithinViewport;
+  }
+}
 function rememberPosition() {
   const key = currentViewKey();
   if (!key)
@@ -2644,8 +2669,30 @@ function setRowSeen(accountId, uid, yes) {
     row.setUnreadClass(!yes);
 }
 function scrollFocusedIntoView() {
-  if (focusedRow)
-    focusedRow.el.scrollIntoView({ block: "center" });
+  if (!focusedRow)
+    return;
+  let el = focusedRow.el;
+  if (!document.body.contains(el)) {
+    const body = document.getElementById("ml-body");
+    const uid = focusedRow.msg?.uid;
+    if (body && uid != null) {
+      el = body.querySelector(`.ml-row[data-uid="${uid}"][data-account-id="${CSS.escape(focusedRow.accountId)}"]`) || body.querySelector(`.ml-row[data-uid="${uid}"]`);
+    }
+    if (!el) {
+      const status = document.getElementById("status-sync");
+      if (status) {
+        status.textContent = "Selected message isn't in the loaded list \u2014 scroll down to load more, or open the folder it lives in.";
+        setTimeout(() => {
+          if (status?.textContent?.startsWith("Selected message"))
+            status.textContent = "";
+        }, 4e3);
+      }
+      return;
+    }
+    focusedRow.el = el;
+    el.classList.add("selected");
+  }
+  el.scrollIntoView({ block: "center" });
 }
 function releaseFocus() {
   focusedRow = null;
@@ -2953,10 +3000,11 @@ async function loadUnifiedInbox(autoSelect = true) {
       return;
     }
     setMessages(result.items);
-    renderMessages(body, "", result.items);
+    withScrollAnchor(body, () => renderMessages(body, "", result.items));
     const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
     if (targetUuid) {
-      body.scrollTop = savedScroll;
+      if (!cached)
+        body.scrollTop = savedScroll;
       restoreSelection(body, targetUuid);
     } else if (autoSelect) {
       selectFirst(body);
@@ -3101,7 +3149,7 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
       return;
     }
     setMessages(result.items);
-    renderMessages(body, accountId, result.items);
+    withScrollAnchor(body, () => renderMessages(body, accountId, result.items));
     if (focusedRow) {
       const stillThere = result.items.some((m) => m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
       if (!stillThere) {
@@ -3114,7 +3162,8 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
       requestAnimationFrame(() => {
         if (myGen !== loadGen)
           return;
-        body.scrollTop = savedScroll;
+        if (!cached)
+          body.scrollTop = savedScroll;
         restoreSelection(body, targetUuid);
       });
     } else if (autoSelect) {