Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(frontend:files): prevent stale touch activation

johavenfb0dac15f861
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index 17faf798..330dc3c9 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -290,7 +290,7 @@
@for (f of scrollView?.viewPortItems; track f.id) {
<div (click)="onSelect($event, f)"
(contextmenu)="onTargetContextMenu($event, f)"
- (appTap)="onFileActivate(f, $event.sourceEvent)"
+ (appTap)="onFileActivate(f)"
[singleTapOnTouch]="true"
[class.disabled]="f.isDisabled"
[class.deleted]="f.isBeingDeleted"
@@ -463,7 +463,7 @@
@for (f of scrollView?.viewPortItems; track f.id) {
<tr (click)="onSelect($event, f)"
(contextmenu)="onTargetContextMenu($event, f)"
- (appTap)="onFileActivate(f, $event.sourceEvent)"
+ (appTap)="onFileActivate(f)"
[singleTapOnTouch]="true"
[class.disabled]="f.isDisabled"
[class.deleted]="f.isBeingDeleted"
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 4f8da285..8f655f5d 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -436,17 +436,15 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
this.layout.openContextMenu(ev, this.fileContextMenu)
}
- onFileActivate(file: FileModel, sourceEvent?: PointerEvent) {
+ onFileActivate(file: FileModel) {
const multiSelectionWasActive = this.showSelectionChecks
const selectOnly = this.closeOpenContextMenu() || multiSelectionWasActive
+ if (this.loading || !this.files.includes(file)) return
+
if (multiSelectionWasActive || this.selection[0] !== file) {
this.setSelection([file], file, file)
}
if (selectOnly) return
- if (sourceEvent?.pointerType === 'touch') {
- setTimeout(() => this.browse(file), 100)
- return
- }
this.browse(file)
}