Fix fold button of folder nav items

Author: Rokt33r

src/components/molecules/FolderNavigatorItem.tsx

@@ -16,6 +16,7 @@ interface FolderNavigatorItemProps {
   storageId: string
   folderName: string
   depth: number
+  noteCount?: number
   folderPathname: string
   folderSetWithSubFolders: Set<string>
   createNoteInFolderAndRedirect: (folderPathname: string) => void
@@ -30,6 +31,7 @@ const FolderNavigatorItem = ({
   storageId,
   folderPathname,
   folderSetWithSubFolders,
+  noteCount = 0,
   createNoteInFolderAndRedirect,
   showPromptToCreateFolder,
   showPromptToRenameFolder,
@@ -50,10 +52,16 @@ const FolderNavigatorItem = ({
   }, [storageId, folderPathname])
 
   const folded = useMemo(() => {
-    return folderSetWithSubFolders.has(folderPathname)
+    return folderSetWithSubFolders.has(folderPathname) || noteCount > 0
       ? !sideNavOpenedItemSet.has(itemId)
       : undefined
-  }, [folderPathname, itemId, folderSetWithSubFolders, sideNavOpenedItemSet])
+  }, [
+    folderPathname,
+    itemId,
+    folderSetWithSubFolders,
+    sideNavOpenedItemSet,
+    noteCount,
+  ])
 
   const toggleFolded = useCallback(() => {
     toggleSideNavOpenedItem(itemId)

src/components/molecules/FolderNoteNavigatorFragment.tsx

@@ -123,6 +123,7 @@ const FolderNoteNavigatorFragment = ({
               depth={item.depth}
               storageId={storage.id}
               folderPathname={item.pathname}
+              noteCount={item.noteCount}
               folderSetWithSubFolders={folderSetWithSubFolders}
               createNoteInFolderAndRedirect={createNoteInFolderAndRedirect}
               showPromptToCreateFolder={showPromptToCreateFolder}
@@ -171,6 +172,7 @@ interface FolderNavItem {
   type: 'folder'
   name: string
   pathname: string
+  noteCount: number
   depth: number
 }
 
@@ -201,13 +203,16 @@ function getOpenedFolderPathnameList(
     if (pathname === '/') {
       continue
     }
+    const folderDoc = folderMap[pathname]
+    const noteCount = folderDoc?.noteIdSet.size || 0
     const nameElements = pathname.split('/').slice(1)
     const depth = nameElements.length
     itemList.push({
       type: 'folder',
       pathname,
       name,
       depth,
+      noteCount,
     })
 
     const folderIsOpened = openItemIdSet.has(
@@ -225,7 +230,6 @@ function getOpenedFolderPathnameList(
         )
       )
 
-      const folderDoc = folderMap[pathname]
       if (folderIsOpened && folderDoc != null) {
         const noteIds = [...folderDoc.noteIdSet]
         const folderNotes = noteIds.reduce((list, noteId) => {