fix: Retain selection when switching modes

src/popup/baseItemList.js

@@ -507,6 +507,9 @@ export default class BaseItemList extends HTMLElement {
   }
 
   repopulate() {
+    let selectedFolderId = this.selected?.itemNode.id;
+    let selectNode = null;
+
     let lowerSearchTerm = this.searchValue.toLowerCase();
     this.#clearItems();
 
@@ -526,22 +529,35 @@ export default class BaseItemList extends HTMLElement {
         let canIncludeItem = this.#navigateOnly || item.canFileMessages;
 
         if (!mismatch && canIncludeItem) {
-          this._addItem(item, BaseItemList.MODE_SEARCH);
+          let node = this._addItem(item, BaseItemList.MODE_SEARCH);
+          if (selectedFolderId && item.id == selectedFolderId) {
+            selectNode = node;
+          }
         }
       }
     } else if (this.defaultItems) {
       for (let item of this.defaultItems) {
         if (this.#navigateOnly || item.canFileMessages) {
-          this._addItem(item, BaseItemList.MODE_DEFAULT);
+          let node = this._addItem(item, BaseItemList.MODE_DEFAULT);
+          if (selectedFolderId && item.id == selectedFolderId) {
+            selectNode = node;
+          }
         }
       }
     } else {
       for (let item of this.allItems) {
         if (this.#navigateOnly || item.canFileMessages) {
-          this._addItem(item, BaseItemList.MODE_ALL);
+          let node = this._addItem(item, BaseItemList.MODE_ALL);
+          if (selectedFolderId && item.id == selectedFolderId) {
+            selectNode = node;
+          }
         }
       }
     }
+
+    if (selectNode) {
+      this.selected = selectNode;
+    }
   }
 }
 

src/popup/folderList.js

@@ -76,7 +76,7 @@ class TBFolderList extends BaseItemList {
 
   _addItem(folderNode, mode) {
     if (this.#excludeSet.has(folderNode.id)) {
-      return;
+      return null;
     }
 
     // let depth = mode == BaseItemList.MODE_ALL ? (folderNode.path.match(/\//g) || []).length - 1 : 0;
@@ -131,6 +131,7 @@ class TBFolderList extends BaseItemList {
     }
 
     body.appendChild(item);
+    return body.lastElementChild;
   }
 
   initItems(allItems, defaultItems, showFolderPath, excludeSet) {

src/popup/tagList.js

@@ -20,6 +20,7 @@ class TBTagList extends BaseItemList {
     item.querySelector(".item").itemNode = tag;
 
     body.appendChild(item);
+    return body.lastElementChild;
   }
 }