mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-21 09:38:01 +02:00
This commit is contained in:
parent
612d72d765
commit
ddd18551eb
@ -167,6 +167,8 @@ class NotesScreenComponent extends BaseScreenComponent<Props, State> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (source === props.notesSource) return;
|
if (source === props.notesSource) return;
|
||||||
|
// For now, search refresh is handled by the search screen.
|
||||||
|
if (props.notesParentType === 'Search') return;
|
||||||
|
|
||||||
let notes: NoteEntity[] = [];
|
let notes: NoteEntity[] = [];
|
||||||
if (props.notesParentType === 'Folder') {
|
if (props.notesParentType === 'Folder') {
|
||||||
|
@ -308,6 +308,10 @@ const appReducer = (state = appDefaultState, action: any) => {
|
|||||||
|
|
||||||
newState.selectedNoteHash = '';
|
newState.selectedNoteHash = '';
|
||||||
|
|
||||||
|
if (action.routeName === 'Search') {
|
||||||
|
newState.notesParentType = 'Search';
|
||||||
|
}
|
||||||
|
|
||||||
if ('noteId' in action) {
|
if ('noteId' in action) {
|
||||||
newState.selectedNoteIds = action.noteId ? [action.noteId] : [];
|
newState.selectedNoteIds = action.noteId ? [action.noteId] : [];
|
||||||
}
|
}
|
||||||
@ -344,6 +348,8 @@ const appReducer = (state = appDefaultState, action: any) => {
|
|||||||
|
|
||||||
newState.route = action;
|
newState.route = action;
|
||||||
newState.historyCanGoBack = !!navHistory.length;
|
newState.historyCanGoBack = !!navHistory.length;
|
||||||
|
|
||||||
|
logger.debug('Navigated to route:', newState.route?.routeName, 'with notesParentType:', newState.notesParentType);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user