@bobfrankston/rmfmail 1.1.249 → 1.1.250

package/client/app.bundle.js

@@ -746,25 +746,32 @@ function getMessages2() {
   return messages;
 }
 function removeMessages(uids, currentlyFocused) {
-  const removeSet = new Set(uids.map((u) => `${u.accountId}:${u.uid}`));
-  const focusedKey = currentlyFocused ? `${currentlyFocused.accountId}:${currentlyFocused.uid}` : null;
-  const focusedWasRemoved = focusedKey !== null && removeSet.has(focusedKey);
+  const fullSet = /* @__PURE__ */ new Set();
+  const looseSet = /* @__PURE__ */ new Set();
+  for (const u of uids) {
+    if (u.folderId != null)
+      fullSet.add(`${u.accountId}:${u.folderId}:${u.uid}`);
+    else
+      looseSet.add(`${u.accountId}:${u.uid}`);
+  }
+  const isRemoved = (m) => m.folderId != null && fullSet.has(`${m.accountId}:${m.folderId}:${m.uid}`) || looseSet.has(`${m.accountId}:${m.uid}`);
+  const focusedWasRemoved = currentlyFocused !== null && isRemoved(currentlyFocused);
   let nextSurvivor = null;
   if (focusedWasRemoved) {
     let lastRemovedIdx = -1;
     for (let i = 0; i < messages.length; i++) {
-      if (removeSet.has(`${messages[i].accountId}:${messages[i].uid}`))
+      if (isRemoved(messages[i]))
         lastRemovedIdx = i;
     }
     for (let i = lastRemovedIdx + 1; i < messages.length; i++) {
-      if (!removeSet.has(`${messages[i].accountId}:${messages[i].uid}`)) {
+      if (!isRemoved(messages[i])) {
         nextSurvivor = messages[i];
         break;
       }
     }
     if (!nextSurvivor) {
       for (let i = lastRemovedIdx - 1; i >= 0; i--) {
-        if (!removeSet.has(`${messages[i].accountId}:${messages[i].uid}`)) {
+        if (!isRemoved(messages[i])) {
           nextSurvivor = messages[i];
           break;
         }
@@ -773,11 +780,11 @@ function removeMessages(uids, currentlyFocused) {
   }
   const removedIds = /* @__PURE__ */ new Set();
   for (const m of messages) {
-    if (removeSet.has(`${m.accountId}:${m.uid}`) && m.messageId) {
+    if (isRemoved(m) && m.messageId) {
       removedIds.add(m.messageId);
     }
   }
-  messages = messages.filter((m) => !removeSet.has(`${m.accountId}:${m.uid}`));
+  messages = messages.filter((m) => !isRemoved(m));
   if (removedIds.size > 0) {
     for (const m of messages) {
       if (m.messageId && removedIds.has(m.messageId) && typeof m.dupeCount === "number") {
@@ -3161,18 +3168,18 @@ function updateSortIndicators() {
   });
 }
 function removeMessagesAndReconcile(uids) {
-  const focusedIdent = focusedRow ? { accountId: focusedRow.accountId, uid: focusedRow.msg.uid } : null;
+  const focusedIdent = focusedRow ? { accountId: focusedRow.accountId, uid: focusedRow.msg.uid, folderId: focusedRow.msg.folderId } : null;
   const outcome = removeMessages(uids, focusedIdent);
   listCache.clear();
   const body = document.getElementById("ml-body");
   if (body) {
-    const stateUids = new Set(getMessages2().map((m) => `${m.accountId}:${m.uid}`));
+    const stateUids = new Set(getMessages2().map((m) => `${m.accountId}:${m.folderId}:${m.uid}`));
     for (const row of Array.from(body.querySelectorAll(".ml-row"))) {
       const el = row;
-      const key = `${el.dataset.accountId}:${el.dataset.uid}`;
+      const key = `${el.dataset.accountId}:${el.dataset.folderId}:${el.dataset.uid}`;
       if (!stateUids.has(key)) {
-        const dead = rowByKey.get(key);
-        if (dead)
+        const dead = rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)));
+        if (dead && dead.el === el)
           dead.detach();
         else
           el.remove();