cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(ui): fix list view column spacing, rubber-band selection, and clippy warnings

Browse Source 
Add column-gap to list header/items, prevent rubber-band selection from
swallowing clicks on list headers and file items, preserve rubber-band
selection after mouseup, and extract type aliases to resolve clippy
type_complexity warnings.
This commit is contained in:
Jared Wolff
2026-03-05 21:07:19 -05:00
parent d8eecbd9ca
commit 4617c1c1df
7 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/app/main.js
+2
View File
@@ -517,6 +517,8 @@ function setupEventListeners() {
// Deselect all cards when clicking empty area (not on a card, menu, or modal)
// Note: multiSelect._hookGlobalDeselect() handles clearing the internal
// selection state; this handler only covers the legacy CSS class removal.
// Skip if a rubber-band selection just finished — the click is a side-effect.
if (window.__rubberBandJustFinished) return;
if (!e.target.closest('.file-card') && !e.target.closest('.file-item') && !e.target.closest('.context-menu') && !e.target.closest('.about-modal') && !e.target.closest('.batch-action-bar') && !e.target.closest('.list-header.selection-mode')) {
document.querySelectorAll('.file-card.selected').forEach(c => c.classList.remove('selected'));
document.querySelectorAll('.file-item.selected').forEach(c => c.classList.remove('selected'));
static/js/app/ui.js
+11 -2
View File
@@ -1350,9 +1350,11 @@ function initRubberBandSelection() {
container.addEventListener('mousedown', (e) => {
// Only start if clicking empty area (not on a card, button, menu, input…)
if (e.button !== 0) return; // left click only
if (e.target.closest('.file-card') || e.target.closest('.context-menu') ||
if (e.target.closest('.file-card') || e.target.closest('.file-item') ||
e.target.closest('.context-menu') ||
e.target.closest('.upload-dropdown') || e.target.closest('button') ||
e.target.closest('input') || e.target.closest('.breadcrumb')) return;
e.target.closest('input') || e.target.closest('.breadcrumb') ||
e.target.closest('.list-header')) return;
active = true;
startX = e.clientX;
@@ -1420,9 +1422,16 @@ function initRubberBandSelection() {
document.addEventListener('mouseup', () => {
if (!active) return;
active = false;
const hadSelection = selRect.style.display === 'block';
selRect.style.display = 'none';
// Update the batch bar after rubber band selection completes
if (window.multiSelect) window.multiSelect._syncUI();
// Suppress the click event that follows mouseup so the global
// deselect handler doesn't immediately clear the selection.
if (hadSelection) {
window.__rubberBandJustFinished = true;
requestAnimationFrame(() => { window.__rubberBandJustFinished = false; });
}
});
}