Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Added Thunderbird count for desktop client (#3880)

testing
Anton Tuchkov 2020-10-12 14:13:41 +05:00 committed by GitHub
parent 2d099b2bed
commit 5fd0408365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ElectronClient/gui/SideBar/SideBar.tsx
View File

@ -361,6 +361,17 @@ class SideBarComponent extends React.Component<Props, State> {
renderFolderItem(folder:any, selected:boolean, hasChildren:boolean, depth:number) { renderFolderItem(folder:any, selected:boolean, hasChildren:boolean, depth:number) {
const anchorRef = this.anchorItemRef('folder', folder.id); const anchorRef = this.anchorItemRef('folder', folder.id);
const isExpanded = this.props.collapsedFolderIds.indexOf(folder.id) < 0;
let noteCount = folder.note_count;
// Thunderbird count: Subtract children note_count from parent folder if it expanded.
if (isExpanded) {
for (let i = 0; i < this.props.folders.length; i++) {
if (this.props.folders[i].parent_id === folder.id) {
noteCount -= this.props.folders[i].note_count;
}
}
}
return <FolderItem return <FolderItem
key={folder.id} key={folder.id}
@ -369,10 +380,10 @@ class SideBarComponent extends React.Component<Props, State> {
themeId={this.props.themeId} themeId={this.props.themeId}
depth={depth} depth={depth}
selected={selected} selected={selected}
isExpanded={this.props.collapsedFolderIds.indexOf(folder.id) < 0} isExpanded={isExpanded}
hasChildren={hasChildren} hasChildren={hasChildren}
anchorRef={anchorRef} anchorRef={anchorRef}
noteCount={folder.note_count} noteCount={noteCount}
onFolderDragStart_={this.onFolderDragStart_} onFolderDragStart_={this.onFolderDragStart_}
onFolderDragOver_={this.onFolderDragOver_} onFolderDragOver_={this.onFolderDragOver_}
onFolderDrop_={this.onFolderDrop_} onFolderDrop_={this.onFolderDrop_}