self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Desktop: Record last selected note IDs and restore it when opening notebook

Browse Source
This commit is contained in:
Laurent Cozic
2019-01-29 18:32:52 +00:00
parent 4d08b49578
commit a33f602f3b
3 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ReactNativeClient/lib/reducer.js
View File

@@ -16,6 +16,11 @@ const defaultState = {
selectedTagId: null,
selectedSearchId: null,
selectedItemType: 'note',
lastSelectedNotesIds: {
Folder: {},
Tag: {},
Search: {},
},
showSideMenu: false,
screens: {},
historyCanGoBack: false,
@@ -53,6 +58,23 @@ stateUtils.notesOrder = function(stateSettings) {
}];
}
stateUtils.parentItem = function(state) {
const t = state.notesParentType;
let id = null;
if (t === 'Folder') id = state.selectedFolderId;
if (t === 'Tag') id = state.selectedTagId;
if (t === 'Search') id = state.selectedSearchId;
if (!t || !id) return null;
return { type: t, id: id };
}
stateUtils.lastSelectedNoteIds = function(state) {
const parent = stateUtils.parentItem(state);
if (!parent) return [];
const output = state.lastSelectedNotesIds[parent.type][parent.id];
return output ? output : [];
}
function arrayHasEncryptedItems(array) {
for (let i = 0; i < array.length; i++) {
if (!!array[i].encryption_applied) return true;
@@ -183,6 +205,18 @@ function changeSelectedFolder(state, action) {
return newState;
}
function recordLastSelectedNoteIds(state, noteIds) {
const newOnes = Object.assign({}, state.lastSelectedNotesIds);
const parent = stateUtils.parentItem(state);
if (!parent) return state;
newOnes[parent.type][parent.id] = noteIds.slice();
return Object.assign({}, state, {
lastSelectedNotesIds: newOnes,
});
}
function changeSelectedNotes(state, action) {
let noteIds = [];
if (action.id) noteIds = [action.id];
@@ -196,17 +230,11 @@ function changeSelectedNotes(state, action) {
if (action.type === 'NOTE_SELECT') {
newState.selectedNoteIds = noteIds;
newState.newNote = null;
return newState;
}
if (action.type === 'NOTE_SELECT_ADD') {
} else if (action.type === 'NOTE_SELECT_ADD') {
if (!noteIds.length) return state;
newState.selectedNoteIds = ArrayUtils.unique(newState.selectedNoteIds.concat(noteIds));
newState.newNote = null;
return newState;
}
if (action.type === 'NOTE_SELECT_REMOVE') {
} else if (action.type === 'NOTE_SELECT_REMOVE') {
if (!noteIds.length) return state; // Nothing to unselect
if (state.selectedNoteIds.length <= 1) return state; // Cannot unselect the last note
@@ -218,11 +246,7 @@ function changeSelectedNotes(state, action) {
}
newState.selectedNoteIds = newSelectedNoteIds;
newState.newNote = null;
return newState;
}
if (action.type === 'NOTE_SELECT_TOGGLE') {
} else if (action.type === 'NOTE_SELECT_TOGGLE') {
if (!noteIds.length) return state;
if (newState.selectedNoteIds.indexOf(noteIds[0]) >= 0) {
@@ -232,11 +256,13 @@ function changeSelectedNotes(state, action) {
}
newState.newNote = null;
return newState;
} else {
throw new Error('Unreachable');
}
throw new Error('Unreachable');
newState = recordLastSelectedNoteIds(newState, newState.selectedNoteIds);
return newState;
}
function removeItemFromArray(array, property, value) {