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

fix: archived/trashed items getting unselected when changed (#1932)

Browse Source
This commit is contained in:
Aman Harwara
2022-11-03 21:04:55 +05:30
committed by GitHub
parent eab3dc99ed
commit 2dd0586bb1
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
View File

@@ -393,15 +393,38 @@ export class ItemListController extends AbstractViewController implements Intern
} }
private shouldSelectNextItemOrCreateNewNote = (activeItem: SNNote | FileItem | undefined) => { private shouldSelectNextItemOrCreateNewNote = (activeItem: SNNote | FileItem | undefined) => {
const shouldShowTrashedNotes = const selectedView = this.navigationController.selected
this.navigationController.isInSystemView(SystemViewId.TrashedNotes) || this.searchOptionsController.includeTrashed
const shouldShowArchivedNotes = const isActiveItemTrashed = activeItem?.trashed
this.navigationController.isInSystemView(SystemViewId.ArchivedNotes) || const isActiveItemArchived = activeItem?.archived
this.searchOptionsController.includeArchived ||
this.application.getPreference(PrefKey.NotesShowArchived, PrefDefaults[PrefKey.NotesShowArchived])
return (activeItem?.trashed && !shouldShowTrashedNotes) || (activeItem?.archived && !shouldShowArchivedNotes) if (isActiveItemTrashed) {
const selectedSmartViewShowsTrashed =
selectedView instanceof SmartView && selectedView.predicate.keypathIncludesString('trashed')
const shouldShowTrashedNotes =
this.navigationController.isInSystemView(SystemViewId.TrashedNotes) ||
this.searchOptionsController.includeTrashed ||
selectedSmartViewShowsTrashed ||
this.displayOptions.includeTrashed
return !shouldShowTrashedNotes
}
if (isActiveItemArchived) {
const selectedSmartViewShowsArchived =
selectedView instanceof SmartView && selectedView.predicate.keypathIncludesString('archived')
const shouldShowArchivedNotes =
this.navigationController.isInSystemView(SystemViewId.ArchivedNotes) ||
this.searchOptionsController.includeArchived ||
selectedSmartViewShowsArchived ||
this.displayOptions.includeArchived
return !shouldShowArchivedNotes
}
return false
} }
private shouldSelectActiveItem = (activeItem: SNNote | FileItem | undefined) => { private shouldSelectActiveItem = (activeItem: SNNote | FileItem | undefined) => {