public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 02:06:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #764 from asmsuechan/fix-noteCount-by-trash

Browse Source 
Fix noteCount on a note trased
This commit is contained in:
SuenagaRyota
2017-08-05 22:03:44 +09:00
committed by GitHub
parent ff6fd62932 87ea66bb92
commit f32ac81f84
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
browser/main/SideNav/StorageItem.js
View File

@@ -180,14 +180,20 @@ class StorageItem extends React.Component {
render () { render () {
let { storage, location, isFolded, data, dispatch } = this.props let { storage, location, isFolded, data, dispatch } = this.props
let { folderNoteMap } = data let { folderNoteMap, trashedSet } = data
let folderList = storage.folders.map((folder) => { let folderList = storage.folders.map((folder) => {
let isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key))) let isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
let noteSet = folderNoteMap.get(storage.key + '-' + folder.key) let noteSet = folderNoteMap.get(storage.key + '-' + folder.key)
let noteCount = noteSet != null let noteCount = 0
? noteSet.size if (noteSet) {
: 0 let trashedNoteCount = 0
const noteKeys = noteSet.map(noteKey => { return noteKey })
trashedSet.toJS().forEach(trashedKey => {
if (noteKeys.some(noteKey => { return noteKey === trashedKey })) trashedNoteCount++
})
noteCount = noteSet.size - trashedNoteCount
}
return ( return (
<StorageItemChild <StorageItemChild
key={folder.key} key={folder.key}