Add drag and drop to file manager
This commit is contained in:
1 parent
9a7ed0a347
commit
f5b9f543c6
14 files changed
+432
-466
No files matched your search
@@ -5,7 +5,7 @@ const scroll_positions = new Map<string, number>()
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import { fs_rename, fs_trash, FSNode } from "lib/FilesystemAPI.svelte"
|
||||
import { fs_trash } from "lib/FilesystemAPI.svelte"
|
||||
import CreateDirectory from "./CreateDirectory.svelte"
|
||||
import ListView from "./ListView.svelte"
|
||||
import GalleryView from "./GalleryView.svelte"
|
||||
@@ -13,14 +13,13 @@ import CompactView from "./CompactView.svelte"
|
||||
import Button from "layout/Button.svelte";
|
||||
import { formatDate } from "util/Formatting";
|
||||
import { drop_target } from "lib/DropTarget"
|
||||
import type { FSNavigator } from "filesystem/FSNavigator";
|
||||
import { drag_click, move_target, type FSNavigator } from "filesystem/FSNavigator";
|
||||
import FsUploadWidget from "filesystem/upload_widget/FSUploadWidget.svelte";
|
||||
import EditWindow from "filesystem/edit_window/EditWindow.svelte";
|
||||
import { FileAction, type FileActionHandler } from "./FileManagerLib";
|
||||
import FileMenu from "./FileMenu.svelte";
|
||||
import { loading_finish, loading_start } from "lib/Loading";
|
||||
import SearchBar from "../SearchBar.svelte";
|
||||
import type { GenericResponse } from "lib/NovaAPI";
|
||||
import { onMount } from "svelte";
|
||||
import { toolbar_store } from "wrap/HeaderStore";
|
||||
|
||||
@@ -42,7 +41,9 @@ let {
|
||||
|
||||
let large_icons = $state(localStorage.getItem("large_icons") === "true")
|
||||
let uploader!: FsUploadWidget
|
||||
let mode = $state("viewing")
|
||||
// In selection mode a click selects. Moving is the part of selection mode where
|
||||
// the user browses to the directory which the selection has to go to
|
||||
let moving = $state(false)
|
||||
let creating_dir = $state(false)
|
||||
let show_hidden = $state(false)
|
||||
let file_menu!: FileMenu
|
||||
@@ -56,6 +57,15 @@ export const upload = (files: File[]) => {
|
||||
|
||||
// Navigation functions
|
||||
const file_event: FileActionHandler = (action: FileAction, index: number, orig: Event) => {
|
||||
const node = nav.children[index]
|
||||
if (action === FileAction.Drag) {
|
||||
// Without write access it stays a normal drag of the link
|
||||
if (nav.permissions.write) {
|
||||
nav.drag_start(orig as DragEvent, node)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
orig.preventDefault()
|
||||
orig.stopPropagation()
|
||||
|
||||
@@ -63,42 +73,34 @@ const file_event: FileActionHandler = (action: FileAction, index: number, orig:
|
||||
case FileAction.Click:
|
||||
creating_dir = false
|
||||
|
||||
if (mode === "viewing") {
|
||||
nav.navigate(nav.children[index].path, true)
|
||||
} else if (mode === "moving") {
|
||||
if (!nav.selecting) {
|
||||
nav.navigate(node.path, true)
|
||||
} else if (!moving) {
|
||||
nav.select(node, (orig as MouseEvent).shiftKey, show_hidden)
|
||||
} else if (node.type === "dir" && !nav.selection.has(node.path)) {
|
||||
// If we are moving files we can only enter directories, and only if
|
||||
// they're not selected. That last requirement prevents people from
|
||||
// moving a directory into itself
|
||||
if (nav.children[index].type === "dir" && !nav.children[index].fm_selected) {
|
||||
nav.navigate(nav.children[index].path, true)
|
||||
}
|
||||
} else if (mode === "selecting") {
|
||||
select_node(index)
|
||||
nav.navigate(node.path, true)
|
||||
}
|
||||
break
|
||||
case FileAction.Context:
|
||||
// If this is a touch event we will select the item
|
||||
if (navigator.maxTouchPoints && navigator.maxTouchPoints > 0) {
|
||||
select_node(index)
|
||||
nav.select(node)
|
||||
} else {
|
||||
file_menu.open(nav.children[index], orig.target, orig)
|
||||
file_menu.open(node, orig.target, orig)
|
||||
}
|
||||
break
|
||||
case FileAction.Edit:
|
||||
edit_window.edit(nav.children[index], false, "file")
|
||||
break
|
||||
case FileAction.Share:
|
||||
creating_dir = false
|
||||
edit_window.edit(nav.children[index], false, "share")
|
||||
edit_window.edit(node, false, "share")
|
||||
break
|
||||
case FileAction.Branding:
|
||||
edit_window.edit(nav.children[index], false, "branding")
|
||||
break
|
||||
case FileAction.Select:
|
||||
select_node(index)
|
||||
edit_window.edit(node, false, "branding")
|
||||
break
|
||||
case FileAction.Menu:
|
||||
file_menu.open(nav.children[index], orig.target, orig)
|
||||
file_menu.open(node, orig.target, orig)
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -114,45 +116,17 @@ const delete_selected = async () => {
|
||||
try {
|
||||
loading_start()
|
||||
|
||||
// Save all promises with deletion requests in an array
|
||||
let promises: Promise<GenericResponse>[] = []
|
||||
nav.children.forEach(child => {
|
||||
if (!child.fm_selected) {
|
||||
return
|
||||
}
|
||||
promises.push(fs_trash(child.path))
|
||||
})
|
||||
|
||||
// Wait for all the promises to finish
|
||||
await Promise.all(promises)
|
||||
await Promise.all([...nav.selection.values()].map(node => fs_trash(node.path)))
|
||||
} catch (err) {
|
||||
console.log(err)
|
||||
alert("Delete failed: " + err.message + " ("+err.value+")")
|
||||
} finally {
|
||||
viewing_mode()
|
||||
nav.set_selecting(false)
|
||||
loading_finish()
|
||||
await nav.reload()
|
||||
}
|
||||
}
|
||||
|
||||
// Mode switches
|
||||
|
||||
const selecting_mode = () => {
|
||||
mode = "selecting"
|
||||
}
|
||||
const viewing_mode = () => {
|
||||
// Remove any items which we were moving
|
||||
moving_items = []
|
||||
|
||||
// Unmark all the selected files and return to viewing mode
|
||||
nav.children.forEach((child, i) => {
|
||||
if (child.fm_selected) {
|
||||
nav.children[i].fm_selected = false
|
||||
}
|
||||
})
|
||||
mode = "viewing"
|
||||
}
|
||||
|
||||
const toggle_view = () => {
|
||||
if (directory_view === "list") {
|
||||
directory_view = "gallery"
|
||||
@@ -169,14 +143,7 @@ const toggle_large_icons = () => {
|
||||
localStorage.setItem("large_icons", JSON.stringify(large_icons))
|
||||
}
|
||||
|
||||
// Moving functions
|
||||
|
||||
let moving_items: FSNode[] = []
|
||||
|
||||
// We need to detect if shift is pressed so we can select multiple items
|
||||
let shift_pressed = false
|
||||
let last_selected_node = -1
|
||||
const keypress = (e: KeyboardEvent) => {
|
||||
const keydown = (e: KeyboardEvent) => {
|
||||
if (
|
||||
(document.activeElement as any).type !== undefined &&
|
||||
(document.activeElement as any).type === "text"
|
||||
@@ -184,102 +151,32 @@ const keypress = (e: KeyboardEvent) => {
|
||||
return // Prevent shortcuts from interfering with input fields
|
||||
}
|
||||
|
||||
if (e.key === "Shift") {
|
||||
shift_pressed = e.type === "keydown"
|
||||
} else if (e.type === "keydown" && e.key === "a" && e.ctrlKey) {
|
||||
// CTRL + A selects all files
|
||||
selecting_mode()
|
||||
for (let i = 0; i < nav.children.length; i++) {
|
||||
nav.children[i].fm_selected = true
|
||||
if (e.key === "a" && e.ctrlKey) {
|
||||
// CTRL + A selects all files which are visible
|
||||
for (const child of nav.children) {
|
||||
if (show_hidden || !child.is_hidden()) {
|
||||
nav.selection.set(child.path, child)
|
||||
}
|
||||
}
|
||||
nav.set_selecting(true)
|
||||
e.preventDefault()
|
||||
} else if (e.type === "keydown" && e.key === "Escape" && (mode !== "viewing" || creating_dir)) {
|
||||
} else if (e.key === "Escape" && (nav.selecting || creating_dir)) {
|
||||
// When escape is pressed we return to viewing mode
|
||||
viewing_mode()
|
||||
nav.set_selecting(false)
|
||||
creating_dir = false
|
||||
e.preventDefault()
|
||||
e.stopPropagation()
|
||||
}
|
||||
}
|
||||
|
||||
const select_node = (index: number) => {
|
||||
mode = "selecting"
|
||||
if (shift_pressed) {
|
||||
// If shift is pressed we do a range select. We select all files between
|
||||
// the last selected file and the file that is being selected now
|
||||
let id_low = Math.min(last_selected_node, index)
|
||||
let id_high = Math.max(last_selected_node, index)
|
||||
|
||||
for (let i = id_low; i <= id_high; i++) {
|
||||
if (i != last_selected_node) {
|
||||
nav.children[i].fm_selected = !nav.children[i].fm_selected
|
||||
}
|
||||
}
|
||||
} else {
|
||||
nav.children[index].fm_selected = !nav.children[index].fm_selected
|
||||
}
|
||||
|
||||
last_selected_node = index
|
||||
}
|
||||
|
||||
// When the directory is reloaded we want to keep our selection, so this
|
||||
// function watches the children array for changes and updates the selection
|
||||
// when it changes
|
||||
// Runs every time the navigator changes
|
||||
$effect.pre(() => {
|
||||
if (!$nav.selecting) {
|
||||
moving = false
|
||||
}
|
||||
creating_dir = false
|
||||
|
||||
// Highlight the files which were previously selected
|
||||
for (let i = 0; i < $nav.children.length; i++) {
|
||||
for (let j = 0; j < moving_items.length; j++) {
|
||||
if (moving_items[j].path === $nav.children[i].path) {
|
||||
$nav.children[i].fm_selected = true
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
let moving_files = $state(0)
|
||||
let moving_directories = $state(0)
|
||||
const move_start = () => {
|
||||
moving_files = 0
|
||||
moving_directories = 0
|
||||
moving_items = nav.children.reduce((acc, child) => {
|
||||
if (child.fm_selected) {
|
||||
if (child.type === "file") {
|
||||
moving_files++
|
||||
} else if (child.type === "dir") {
|
||||
moving_directories++
|
||||
}
|
||||
acc.push(child)
|
||||
}
|
||||
return acc
|
||||
}, [])
|
||||
mode = "moving"
|
||||
}
|
||||
|
||||
const move_here = async () => {
|
||||
const target_dir = nav.base.path + "/"
|
||||
try {
|
||||
loading_start()
|
||||
|
||||
let promises = []
|
||||
moving_items.forEach(item => {
|
||||
console.log("moving", item.path, "to", target_dir + item.name)
|
||||
promises.push(fs_rename(item.path, target_dir + item.name))
|
||||
})
|
||||
|
||||
// Wait for all the promises to finish
|
||||
await Promise.all(promises)
|
||||
} catch (err) {
|
||||
console.log(err)
|
||||
alert("Move failed: " + err.message + " ("+err.value+")")
|
||||
} finally {
|
||||
viewing_mode()
|
||||
nav.reload()
|
||||
loading_finish()
|
||||
}
|
||||
}
|
||||
|
||||
// The toolbar is shown in the bar at the top of the page, under the breadcrumbs.
|
||||
// Other pages don't have it
|
||||
onMount(() => {
|
||||
@@ -289,27 +186,30 @@ onMount(() => {
|
||||
</script>
|
||||
|
||||
<svelte:window
|
||||
onkeydown={keypress}
|
||||
onkeyup={keypress}
|
||||
onkeydown={keydown}
|
||||
onscroll={() => scroll_positions.set(nav.base.path, window.scrollY)}
|
||||
/>
|
||||
|
||||
{#snippet nav_buttons()}
|
||||
<button onclick={navigate_back} use:drag_click title="Back">
|
||||
<i class="icon">arrow_back</i>
|
||||
</button>
|
||||
<button onclick={() => nav.navigate_up()} use:drag_click disabled={$nav.path.length <= 1} title="Up">
|
||||
<i class="icon">north</i>
|
||||
</button>
|
||||
<button onclick={() => nav.reload()} use:drag_click title="Refresh directory listing">
|
||||
<i class="icon">refresh</i>
|
||||
</button>
|
||||
{/snippet}
|
||||
|
||||
{#snippet toolbar()}
|
||||
{#if mode === "viewing"}
|
||||
{#if !$nav.selecting}
|
||||
<div class="toolbar">
|
||||
<div class="toolbar_left">
|
||||
<button onclick={() => {search_bar.open()}} title="Press / to search">
|
||||
<i class="icon">search</i>
|
||||
</button>
|
||||
<button onclick={navigate_back} title="Back">
|
||||
<i class="icon">arrow_back</i>
|
||||
</button>
|
||||
<button onclick={() => nav.navigate_up()} disabled={$nav.path.length <= 1} title="Up">
|
||||
<i class="icon">north</i>
|
||||
</button>
|
||||
<button onclick={() => nav.reload()} title="Refresh directory listing">
|
||||
<i class="icon">refresh</i>
|
||||
</button>
|
||||
{@render nav_buttons()}
|
||||
{#if $nav.children.some(c => c.name === ".Trash" && c.type === "dir")}
|
||||
<button
|
||||
onclick={() => nav.navigate($nav.children.find(c => c.name === ".Trash").path, true)}
|
||||
@@ -352,32 +252,40 @@ onMount(() => {
|
||||
|
||||
<Button click={() => {creating_dir = !creating_dir}} highlight={creating_dir} icon="create_new_folder" title="Make folder"/>
|
||||
|
||||
<button onclick={selecting_mode} title="Select and delete files">
|
||||
<button onclick={() => nav.set_selecting(true)} title="Select and delete files">
|
||||
<i class="icon">select_all</i>
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{:else if mode === "selecting"}
|
||||
{:else}
|
||||
<div class="toolbar toolbar_edit">
|
||||
<Button click={viewing_mode} icon="close"/>
|
||||
<div class="toolbar_spacer">Selecting files</div>
|
||||
<Button click={move_start} icon="drive_file_move" label="Move"/>
|
||||
<button onclick={delete_selected} class="button_red">
|
||||
<i class="icon">delete</i>
|
||||
Delete
|
||||
</button>
|
||||
</div>
|
||||
{:else if mode === "moving"}
|
||||
<div class="toolbar toolbar_edit">
|
||||
<Button click={viewing_mode} icon="close"/>
|
||||
<Button click={() => nav.navigate_up()} disabled={$nav.path.length <= 1} icon="north"/>
|
||||
<div class="toolbar_spacer">
|
||||
Moving {moving_files} files and {moving_directories} directories
|
||||
<div>
|
||||
<Button click={() => nav.set_selecting(false)} icon="close"/>
|
||||
{@render nav_buttons()}
|
||||
</div>
|
||||
<div class="toolbar_spacer">
|
||||
{moving ? "Moving" : "Selected"} {$nav.selection.size} items
|
||||
</div>
|
||||
<div>
|
||||
{#if moving}
|
||||
<Button click={() => {creating_dir = !creating_dir}} highlight={creating_dir} icon="create_new_folder" title="Make folder"/>
|
||||
<Button
|
||||
click={() => nav.move_selection(nav.base.path)}
|
||||
disabled={!$nav.can_move($nav.base.path)}
|
||||
highlight
|
||||
icon="done"
|
||||
label="Move here"
|
||||
/>
|
||||
{:else}
|
||||
<Button click={() => {moving = true}} icon="drive_file_move" label="Move"/>
|
||||
<button onclick={delete_selected} class="button_red">
|
||||
<i class="icon">delete</i>
|
||||
Delete
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
<Button click={() => {creating_dir = !creating_dir}} highlight={creating_dir} icon="create_new_folder" title="Make folder"/>
|
||||
<Button click={move_here} highlight icon="done" label="Move here"/>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@@ -388,6 +296,7 @@ onMount(() => {
|
||||
|
||||
<div
|
||||
class="container"
|
||||
use:move_target={{nav, node: () => nav.base}}
|
||||
use:drop_target={{
|
||||
upload: (files) => upload_widget.upload_files(files),
|
||||
shadow: "var(--accent_color) 0 0 10px 2px inset",
|
||||
|
||||
Reference in new issue
Block a user