self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-17 11:26:26 +02:00
Code Issues Releases Activity

Desktop: Fixes #5584: Clicking on folder button was no longer jumping to the right folder

Browse Source 
Regression introduced by https://github.com/laurent22/joplin/issues/4697
This commit is contained in:
Laurent Cozic 2022-03-03 13:33:52 +00:00
parent 299a14755a
commit 32de63fad3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/lib/reducer.ts
View File

@ -754,15 +754,9 @@ const reducer = produce((draft: Draft<State> = defaultState, action: any) => {
case 'FOLDER_AND_NOTE_SELECT': case 'FOLDER_AND_NOTE_SELECT':
{ {
changeSelectedFolder(draft, action);
const noteSelectAction = Object.assign({}, action, { type: 'NOTE_SELECT' }); const noteSelectAction = Object.assign({}, action, { type: 'NOTE_SELECT' });
changeSelectedNotes(draft, noteSelectAction);
if (draft.notesParentType === 'SmartFilter' && draft.selectedSmartFilterId === ALL_NOTES_FILTER_ID) {
// we don't want to change folder when 'All Notes' filter is on
changeSelectedNotes(draft, noteSelectAction);
} else {
changeSelectedFolder(draft, action);
changeSelectedNotes(draft, noteSelectAction);
}
} }
break; break;