Skip to content

High performance self-hosted photo and video management solution.

fix: longpress triggers contextmenu (#17602)

Min Idzelis5e68f8c51940
diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index 93a4e3c6cc..c21acd8f86 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -130,18 +130,30 @@
};
let timer: ReturnType<typeof setTimeout>;
- const clearLongPressTimer = () => clearTimeout(timer);
+
+ const preventContextMenu = (evt: Event) => evt.preventDefault();
+ let disposeables: (() => void)[] = [];
+
+ const clearLongPressTimer = () => {
+ clearTimeout(timer);
+ for (const dispose of disposeables) {
+ dispose();
+ }
+ disposeables = [];
+ };
let startX: number = 0;
let startY: number = 0;
function longPress(element: HTMLElement, { onLongPress }: { onLongPress: () => void }) {
let didPress = false;
- const start = (evt: TouchEvent) => {
- startX = evt.changedTouches[0].clientX;
- startY = evt.changedTouches[0].clientY;
+ const start = (evt: PointerEvent) => {
+ startX = evt.clientX;
+ startY = evt.clientY;
didPress = false;
timer = setTimeout(() => {
onLongPress();
+ element.addEventListener('contextmenu', preventContextMenu, { once: true });
+ disposeables.push(() => element.removeEventListener('contextmenu', preventContextMenu));
didPress = true;
}, 350);
};
@@ -153,13 +165,13 @@
e.preventDefault();
};
element.addEventListener('click', click);
- element.addEventListener('touchstart', start, true);
- element.addEventListener('touchend', clearLongPressTimer, true);
+ element.addEventListener('pointerdown', start, true);
+ element.addEventListener('pointerup', clearLongPressTimer, true);
return {
destroy: () => {
element.removeEventListener('click', click);
- element.removeEventListener('touchstart', start, true);
- element.removeEventListener('touchend', clearLongPressTimer, true);
+ element.removeEventListener('pointerdown', start, true);
+ element.removeEventListener('pointerup', clearLongPressTimer, true);
},
};
}