rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: avoid changing selected note when editing archived or trashed note from search results

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-07-19 12:15:35 -03:00
parent ffc84a7ab6
commit 0b8cd1b7b4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/ui_models/app_state/app_state.ts
View File

@@ -246,11 +246,16 @@ export class AppState {
} }
if (note.deleted) { if (note.deleted) {
this.closeEditor(editor); this.closeEditor(editor);
} else if (note.trashed && !this.selectedTag?.isTrashTag) { } else if (
note.trashed &&
!this.selectedTag?.isTrashTag &&
!this.searchOptions.includeTrashed
) {
this.closeEditor(editor); this.closeEditor(editor);
} else if ( } else if (
note.archived && note.archived &&
!this.selectedTag?.isArchiveTag && !this.selectedTag?.isArchiveTag &&
!this.searchOptions.includeArchived &&
!this.application.getPreference(PrefKey.NotesShowArchived, false) !this.application.getPreference(PrefKey.NotesShowArchived, false)
) { ) {
this.closeEditor(editor); this.closeEditor(editor);

6
app/assets/javascripts/views/notes/notes_view.ts
View File

@@ -277,7 +277,11 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
if (this.application.getAppState().notes.selectedNotesCount < 2) { if (this.application.getAppState().notes.selectedNotesCount < 2) {
if (activeNote) { if (activeNote) {
const discarded = activeNote.deleted || activeNote.trashed; const discarded = activeNote.deleted || activeNote.trashed;
if (discarded && !this.appState?.selectedTag?.isTrashTag) { if (
discarded &&
!this.appState?.selectedTag?.isTrashTag &&
!this.appState?.searchOptions.includeTrashed
) {
this.selectNextOrCreateNew(); this.selectNextOrCreateNew();
} else if (!this.state.selectedNotes[activeNote.uuid]) { } else if (!this.state.selectedNotes[activeNote.uuid]) {
this.selectNote(activeNote); this.selectNote(activeNote);