@bobfrankston/rmfmail 1.2.95 → 1.2.96

package/client/app.bundle.js

@@ -6434,6 +6434,14 @@ var refreshDebounceTimer = null;
 var DRAG_HOVER_EXPAND_MS = 600;
 var dragAutoExpanded = /* @__PURE__ */ new Set();
 var dragInFlight = false;
+function collapseDragExpanded() {
+  if (dragAutoExpanded.size === 0)
+    return false;
+  for (const key of dragAutoExpanded)
+    delete expandState[key];
+  dragAutoExpanded.clear();
+  return true;
+}
 var expandState = JSON.parse(localStorage.getItem("mailx-folders-expanded") || "{}");
 function saveExpandState() {
   localStorage.setItem("mailx-folders-expanded", JSON.stringify(expandState));
@@ -6812,6 +6820,14 @@ function renderNode(node, container, depth) {
         clearTimeout(dragExpandTimer);
         dragExpandTimer = null;
       }
+      const springCollapsed = collapseDragExpanded();
+      const rerenderTree = () => {
+        const tc = document.getElementById("folder-tree");
+        if (tc)
+          loadFolderTree(tc);
+      };
+      if (springCollapsed)
+        rerenderTree();
       const folderData = e.dataTransfer.getData("application/x-mailx-folder");
       if (folderData) {
         let src;
@@ -6920,11 +6936,8 @@ document.addEventListener("dragend", () => {
   if (!dragInFlight)
     return;
   dragInFlight = false;
-  if (dragAutoExpanded.size === 0)
+  if (!collapseDragExpanded())
     return;
-  for (const key of dragAutoExpanded)
-    delete expandState[key];
-  dragAutoExpanded.clear();
   const treeContainer = document.getElementById("folder-tree");
   if (treeContainer)
     loadFolderTree(treeContainer);