From a219509bd7349757b6dcf2e03ab162996d590769 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 7 Oct 2022 13:04:51 +0200
Subject: [PATCH] Finally drop the FolderModel.hidden() because
 FolderModel.visible() works better

---
 dev/Model/FolderCollection.js                               | 2 --
 dev/Styles/User/FolderList.less                             | 4 ----
 dev/View/User/MailBox/FolderList.js                         | 6 +++---
 .../0.0.0/app/templates/Views/User/MailFolderListItem.html  | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 850d41383..62015d42f 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -393,8 +393,6 @@ export class FolderModel extends AbstractModel {
 					return folder.hasVisibleSubfolders() | visible;
 				},
 
-				hidden: () => !folder.selectable() && (folder.isSystemFolder() | !folder.hasVisibleSubfolders()),
-
 				printableUnreadCount: () => {
 					const count = folder.totalEmails(),
 						unread = folder.unreadEmails(),
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 97d8372bf..0a7c5b22e 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -123,10 +123,6 @@
 				font-weight: bold;
 			}
 
-			&.hidden {
-				display: none;
-			}
-
 			.e-collapsed-sign {
 				cursor: pointer;
 				font-size: 150%;
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index e63dc4e79..ac10ada46 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -124,7 +124,7 @@ export class MailFolderList extends AbstractViewLeft {
 
 		addShortcut('arrowup,arrowdown', '', Scope.FolderList, event => {
 			let items = [], index = 0;
-			dom.querySelectorAll('li a:not(.hidden)').forEach(node => {
+			dom.querySelectorAll('li a').forEach(node => {
 				if (node.offsetHeight || node.getClientRects().length) {
 					items.push(node);
 					if (node.matches('.focused')) {
@@ -147,7 +147,7 @@ export class MailFolderList extends AbstractViewLeft {
 		});
 
 		addShortcut('enter,open', '', Scope.FolderList, () => {
-			const item = qs('li a:not(.hidden).focused');
+			const item = qs('li a.focused');
 			if (item) {
 				AppUserStore.focusedState(Scope.MessageList);
 				item.click();
@@ -157,7 +157,7 @@ export class MailFolderList extends AbstractViewLeft {
 		});
 
 		addShortcut('space', '', Scope.FolderList, () => {
-			const item = qs('li a:not(.hidden).focused'),
+			const item = qs('li a.focused'),
 				folder = item && ko.dataFor(item);
 			if (folder) {
 				const collapsed = folder.collapsed();
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
index 3bf8984dd..67512a0ee 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
@@ -1,7 +1,7 @@
 <!-- ko if: visible -->
 <li>
 	<a data-bind="dropmessages: $data,
-	   css: { 'selected': selected() && !isSystemFolder(), 'system': isSystemFolder, 'selectable': canBeSelected, 'hidden' : hidden, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'anim-action-class': actionBlink },
+	   css: { 'selected': selected() && !isSystemFolder(), 'system': isSystemFolder, 'selectable': canBeSelected, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'anim-action-class': actionBlink },
 	   attr: { 'data-unread': printableUnreadCount }">
 		<i data-bind="css: collapsedCss()"></i>
 		<!-- ko text: name --><!-- /ko -->