Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"height": 900,
"minWidth": 1440,
"minHeight": 900,
"backgroundColor": "#050b10"
"backgroundColor": "#050b10",
"dragDropEnabled": false
}
],
"security": {
Expand Down
8 changes: 8 additions & 0 deletions static/css/widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@
.catalog {
display: grid !important;
grid-template-columns: 72px minmax(0, 1fr);
grid-template-rows: 1fr;
align-items: stretch !important;
height: 100% !important;
min-height: 0 !important;
gap: 0 !important;
padding: 0 !important;
border-radius: 12px !important;
Expand All @@ -345,6 +349,8 @@
}

.catalog-rail {
grid-column: 1;
grid-row: 1;
display: flex;
flex-direction: column;
align-items: stretch;
Expand Down Expand Up @@ -428,6 +434,8 @@
}

.catalog-main {
grid-column: 2;
grid-row: 1;
display: flex;
flex-direction: column;
gap: 10px;
Expand Down
56 changes: 50 additions & 6 deletions static/js/catalog.js
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ function isTrackDragEvent(event) {
}

function getDraggedTrackId(event) {
return event?.dataTransfer?.getData(TRACK_DRAG_TYPE) || dragId;
return event?.dataTransfer?.getData(TRACK_DRAG_TYPE)
|| event?.dataTransfer?.getData("text/plain")
|| dragId;
}

function startDrag(trackId, itemEl, event) {
Expand All @@ -473,16 +475,17 @@ function endDrag(itemEl) {
document.getElementById("lanes")?.classList.remove("library-drop-target");
}

function dropOnFolder(folderId) {
if (!dragId) return;
function dropOnFolder(folderId, trackId) {
const id = trackId ?? dragId;
if (!id) return;
// Remove from current folder
for (const f of folders) {
const idx = f.items.indexOf(dragId);
const idx = f.items.indexOf(id);
if (idx !== -1) { f.items.splice(idx, 1); break; }
}
// Add to target folder
const target = folders.find((f) => f.id === folderId);
if (target && !target.items.includes(dragId)) target.items.push(dragId);
if (target && !target.items.includes(id)) target.items.push(id);
saveState();
render();
}
Expand Down Expand Up @@ -549,6 +552,46 @@ function wireRailTrashDrop() {
});
}

function restoreTrackFromTrash(trackId) {
if (!tracks[trackId]) return;
const trash = getTrashFolder();
if (!trash?.items.includes(trackId)) return;
trash.items = trash.items.filter((id) => id !== trackId);
let target = folders.find((f) => f.id !== TRASH_ID);
if (!target) {
target = makeFolder({ id: `f-${Date.now()}`, name: "Unsorted" });
folders.unshift(target);
}
if (!target.items.includes(trackId)) target.items.push(trackId);
saveState();
render();
}

function wireRailLibraryDrop() {
const btn = document.querySelector(".rail-library");
if (!btn || btn.dataset.dropReady === "1") return;
btn.dataset.dropReady = "1";

btn.addEventListener("dragover", (e) => {
if (!isTrackDragEvent(e) || catalogView !== "trash") return;
e.preventDefault();
e.dataTransfer.dropEffect = "move";
btn.classList.add("drop-target");
});
btn.addEventListener("dragleave", (e) => {
if (!btn.contains(e.relatedTarget)) btn.classList.remove("drop-target");
});
btn.addEventListener("drop", (e) => {
btn.classList.remove("drop-target");
if (catalogView !== "trash") return;
const trackId = getDraggedTrackId(e);
if (!trackId || !tracks[trackId]) return;
e.preventDefault();
restoreTrackFromTrash(trackId);
setCatalogView("library");
});
}

function isTextEditingTarget(target) {
return Boolean(target?.closest?.("input, textarea, select, [contenteditable='true'], .folder-editor"));
}
Expand Down Expand Up @@ -716,7 +759,7 @@ function renderFolder(folder) {
el.addEventListener("drop", (e) => {
e.preventDefault();
el.classList.remove("drop-target");
dropOnFolder(folder.id);
dropOnFolder(folder.id, getDraggedTrackId(e));
});

return el;
Expand Down Expand Up @@ -956,6 +999,7 @@ export function initCatalog() {
wireWidgets();
wireMainPanelDrop();
wireRailTrashDrop();
wireRailLibraryDrop();
wireLibraryDeleteKeys();
wireAboutDialog();
setDisplayedVersion(currentVersion);
Expand Down