From d6280f4397d81265c24a67fdc2f06f1ef07a0540 Mon Sep 17 00:00:00 2001 From: asmsuechan Date: Sat, 5 Aug 2017 17:16:57 +0900 Subject: [PATCH 1/2] Fix noteCount on a note trased --- browser/main/SideNav/StorageItem.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js index cc44d912..67990d8b 100644 --- a/browser/main/SideNav/StorageItem.js +++ b/browser/main/SideNav/StorageItem.js @@ -180,14 +180,20 @@ class StorageItem extends React.Component { render () { let { storage, location, isFolded, data, dispatch } = this.props - let { folderNoteMap } = data + let { folderNoteMap, trashedSet } = data let folderList = storage.folders.map((folder) => { let isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key))) let noteSet = folderNoteMap.get(storage.key + '-' + folder.key) - let noteCount = noteSet != null - ? noteSet.size - : 0 + let noteCount = 0 + if (noteSet) { + let trashedNoteCount = 0 + const noteKeys = noteSet.map(noteKey => { return noteKey }) + noteKeys.forEach(noteKey => { + if (trashedSet.toJS().some(trashedKey => { return noteKey === trashedKey })) trashedNoteCount++ + }) + noteCount = noteSet.size - trashedNoteCount + } return ( Date: Sat, 5 Aug 2017 22:00:12 +0900 Subject: [PATCH 2/2] Change iterate variable --- browser/main/SideNav/StorageItem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js index 67990d8b..fefc5a60 100644 --- a/browser/main/SideNav/StorageItem.js +++ b/browser/main/SideNav/StorageItem.js @@ -189,8 +189,8 @@ class StorageItem extends React.Component { if (noteSet) { let trashedNoteCount = 0 const noteKeys = noteSet.map(noteKey => { return noteKey }) - noteKeys.forEach(noteKey => { - if (trashedSet.toJS().some(trashedKey => { return noteKey === trashedKey })) trashedNoteCount++ + trashedSet.toJS().forEach(trashedKey => { + if (noteKeys.some(noteKey => { return noteKey === trashedKey })) trashedNoteCount++ }) noteCount = noteSet.size - trashedNoteCount }