paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor selection functions to two separate ones for clarity

Browse Source
This commit is contained in:
Michael Shamoon
2021-01-15 01:59:29 -08:00
parent cf3d6971a8
commit b1ecac73fe
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src-ui/src/app/components/document-list/document-list.component.ts
View File

@@ -161,7 +161,8 @@ export class DocumentListComponent implements OnInit {
} }
toggleSelected(document: PaperlessDocument, event: MouseEvent): void { toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
this.list.toggleSelected(document, event.shiftKey) if (!event.shiftKey) this.list.toggleSelected(document)
else this.list.selectRangeTo(document)
} }
clickTag(tagID: number) { clickTag(tagID: number) {

20
src-ui/src/app/services/document-list-view.service.ts
View File

@@ -253,19 +253,21 @@ export class DocumentListViewService {
return this.selected.has(d.id) return this.selected.has(d.id)
} }
toggleSelected(d: PaperlessDocument, includeRange: boolean): void { toggleSelected(d: PaperlessDocument): void {
if (!includeRange) { if (this.selected.has(d.id)) this.selected.delete(d.id)
// regular i.e. no shift key toggle else this.selected.add(d.id)
if (this.selected.has(d.id)) this.selected.delete(d.id) this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
else this.selected.add(d.id) }
} else if (includeRange && this.lastSelectedDocumentIndex !== null) {
selectRangeTo(d: PaperlessDocument) {
if (this.lastSelectedDocumentIndex !== null) {
const documentToIndex = this.documentIndexInCurrentView(d.id) const documentToIndex = this.documentIndexInCurrentView(d.id)
const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex) const fromIndex = Math.min(this.lastSelectedDocumentIndex, documentToIndex)
const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex) const toIndex = Math.max(this.lastSelectedDocumentIndex, documentToIndex)
if ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) || if ((this.lastSelectedDocumentToIndex > this.lastSelectedDocumentIndex && documentToIndex < this.lastSelectedDocumentIndex) ||
(this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex)) { (this.lastSelectedDocumentToIndex < this.lastSelectedDocumentIndex && documentToIndex > this.lastSelectedDocumentIndex)) {
// invert last selected // new click is "opposite side" of anchor so we invert the old selection
this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => { this.documents.slice(Math.min(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex), Math.max(this.lastSelectedDocumentIndex, this.lastSelectedDocumentToIndex) + 1).forEach(d => {
this.selected.delete(d.id) this.selected.delete(d.id)
}) })
@@ -275,9 +277,7 @@ export class DocumentListViewService {
this.selected.add(d.id) this.selected.add(d.id)
}) })
this.lastSelectedDocumentToIndex = documentToIndex this.lastSelectedDocumentToIndex = documentToIndex
} } else { // e.g. shift key but was first click
if (!includeRange || (includeRange && this.lastSelectedDocumentIndex == null)) { // e.g. shift key but first click
this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id) this.lastSelectedDocumentIndex = this.documentIndexInCurrentView(d.id)
} }
} }