fix more rect selection bugs

This commit is contained in:
2025-09-04 21:03:19 +02:00
parent afcbadee8b
commit 13e91fdfbf
5 changed files with 30 additions and 35 deletions

View File

@@ -20,6 +20,7 @@ body,
#__layout { #__layout {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden;
} }
* { * {

View File

@@ -8,6 +8,10 @@ const width = computed(() => Math.abs(rect.a.x - rect.b.x));
const height = computed(() => Math.abs(rect.a.y - rect.b.y)); const height = computed(() => Math.abs(rect.a.y - rect.b.y));
function onDocumentPointerDown(e: MouseEvent) { function onDocumentPointerDown(e: MouseEvent) {
if (e.button !== 0) {
return;
}
const point = { x: e.x, y: e.y }; const point = { x: e.x, y: e.y };
rect.set( rect.set(
point, point,
@@ -17,12 +21,16 @@ function onDocumentPointerDown(e: MouseEvent) {
} }
function onDocumentPointerMove(e: MouseEvent) { function onDocumentPointerMove(e: MouseEvent) {
if (!rect.enabled) {
return;
}
rect.updateB(e.x, e.y); rect.updateB(e.x, e.y);
if ( if (
rect.mode !== 'set' || rect.mode !== 'set' ||
!rect.enabled || warrenStore.selection.size === 0 ||
warrenStore.selection.size === 0 !rect.isMinSize()
) { ) {
return; return;
} }
@@ -30,22 +38,24 @@ function onDocumentPointerMove(e: MouseEvent) {
warrenStore.clearSelection(); warrenStore.clearSelection();
} }
function onDocumentPointerUp() { function onDocumentPointerUp(e: MouseEvent) {
if (e.button !== 0 || !rect.enabled) {
return;
}
rect.disable(); rect.disable();
if (warrenStore.current == null || warrenStore.current.dir == null) { if (warrenStore.current == null || warrenStore.current.dir == null) {
return; return;
} }
const start = rect.a; const left = Math.min(rect.a.x, rect.b.x);
const end = rect.b; const top = Math.min(rect.a.y, rect.b.y);
const width = Math.abs(rect.a.x - rect.b.x);
const left = Math.min(start.x, end.x); const height = Math.abs(rect.a.y - rect.b.y);
const top = Math.min(start.y, end.y);
const width = Math.abs(start.x - end.x);
const height = Math.abs(start.y - end.y);
if (!rect.isMinSize()) { if (!rect.isMinSize()) {
warrenStore.clearSelection();
return; return;
} }
@@ -72,8 +82,6 @@ function onDocumentPointerUp() {
} }
} }
rect.dirty = true;
if (rect.mode === 'set') { if (rect.mode === 'set') {
warrenStore.setSelection(targetEntries); warrenStore.setSelection(targetEntries);
} else if (rect.mode === 'add') { } else if (rect.mode === 'add') {

View File

@@ -184,22 +184,12 @@ function onEntryDownload(entry: DirectoryEntry) {
downloadFile(downloadName, downloadApiUrl); downloadFile(downloadName, downloadApiUrl);
} }
function onParentClick() {
if (selectionRect.dirty) {
selectionRect.dirty = false;
return;
}
warrenStore.clearSelection();
}
</script> </script>
<template> <template>
<div <div
v-if="share != null" v-if="share != null"
class="flex h-full w-full items-center justify-center px-2" class="flex h-full w-full items-center justify-center px-2"
@click="onParentClick"
> >
<div <div
:class="[ :class="[

View File

@@ -22,8 +22,6 @@ const dropZone = useDropZone(dropZoneRef, {
multiple: true, multiple: true,
}); });
const selectionRect = useSelectionRect();
if (warrenStore.current == null) { if (warrenStore.current == null) {
await navigateTo({ await navigateTo({
path: '/warrens', path: '/warrens',
@@ -159,19 +157,10 @@ async function onEntryDelete(entry: DirectoryEntry, force: boolean) {
function onBack() { function onBack() {
warrenStore.backCurrentPath(); warrenStore.backCurrentPath();
} }
function onParentClick(_e: MouseEvent) {
if (selectionRect.dirty) {
selectionRect.dirty = false;
return;
}
warrenStore.clearSelection();
}
</script> </script>
<template> <template>
<div ref="dropZoneRef" class="grow" @click="onParentClick"> <div ref="dropZoneRef" class="grow">
<DirectoryListContextMenu class="w-full grow"> <DirectoryListContextMenu class="w-full grow">
<DirectoryList <DirectoryList
v-if=" v-if="

View File

@@ -3,7 +3,6 @@ import type { SelectionMode } from '~/shared/types/selection';
export const useSelectionRect = defineStore('selection-rect', { export const useSelectionRect = defineStore('selection-rect', {
state: () => ({ state: () => ({
enabled: false as boolean, enabled: false as boolean,
dirty: false as boolean,
a: { a: {
x: 0 as number, x: 0 as number,
y: 0 as number, y: 0 as number,
@@ -35,6 +34,14 @@ export const useSelectionRect = defineStore('selection-rect', {
}, },
disable() { disable() {
this.enabled = false; this.enabled = false;
this.a = {
x: 0,
y: 0,
};
this.b = {
x: 0,
y: 0,
};
}, },
isMinSize(minPixels: number = 10) { isMinSize(minPixels: number = 10) {
return ( return (