Skip to content

Commit 20c10f3

Browse files
miczkewisch
authored andcommitted
fix: Always selecting the first line when searching for a folder
1 parent 7565983 commit 20c10f3

1 file changed

Lines changed: 5 additions & 26 deletions

File tree

src/popup/baseItemList.js

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,6 @@ export default class BaseItemList extends HTMLElement {
521521
}
522522

523523
repopulate() {
524-
let selectedFolderId = this.selected?.itemNode.id;
525-
let selectNode = null;
526-
527524
let lowerSearchTerm = this.searchValue.toLowerCase();
528525
let hasAccent = !!lowerSearchTerm.normalize("NFD").match(DIACRITICS);
529526

@@ -552,10 +549,7 @@ export default class BaseItemList extends HTMLElement {
552549
let canIncludeItem = this.#navigateOnly || item.canFileMessages;
553550

554551
if (match && canIncludeItem) {
555-
let node = this._addItem(item, BaseItemList.MODE_SEARCH);
556-
if (selectedFolderId && item.id == selectedFolderId) {
557-
selectNode = node;
558-
}
552+
this._addItem(item, BaseItemList.MODE_SEARCH);
559553
}
560554
}
561555
} else {
@@ -577,40 +571,25 @@ export default class BaseItemList extends HTMLElement {
577571
let canIncludeItem = this.#navigateOnly || item.canFileMessages;
578572

579573
if (!mismatch && canIncludeItem) {
580-
let node = this._addItem(item, BaseItemList.MODE_SEARCH);
581-
if (selectedFolderId && item.id == selectedFolderId) {
582-
selectNode = node;
583-
}
574+
this._addItem(item, BaseItemList.MODE_SEARCH);
584575
}
585576
}
586577
}
587578
} else if (this.defaultItems) {
588579
for (let item of this.defaultItems) {
589580
if (this.#navigateOnly || item.canFileMessages) {
590-
let node = this._addItem(item, BaseItemList.MODE_DEFAULT);
591-
if (selectedFolderId && item.id == selectedFolderId) {
592-
selectNode = node;
593-
}
581+
this._addItem(item, BaseItemList.MODE_DEFAULT);
594582
}
595583
}
596584
} else {
597585
for (let item of this.allItems) {
598586
if (this.#navigateOnly || item.canFileMessages) {
599-
let node = this._addItem(item, BaseItemList.MODE_ALL);
600-
if (selectedFolderId && item.id == selectedFolderId) {
601-
selectNode = node;
602-
}
587+
this._addItem(item, BaseItemList.MODE_ALL);
603588
}
604589
}
605590
}
606591

607-
if (selectNode) {
608-
this.selected = selectNode;
609-
}
610-
611-
if (!this.selected) {
612-
this.selected = this.nthItem(1);
613-
}
592+
this.selected = this.nthItem(1);
614593
}
615594
}
616595

0 commit comments

Comments
 (0)