@axium/storage 0.4.1 → 0.4.3

package/dist/server.js

@@ -139,13 +139,7 @@ addRoute({
             .catch(withError('Could not delete item'));
         if (item.type == 'inode/directory')
             return item;
-        const { count } = await database
-            .selectFrom('storage')
-            .where('hash', '=', Uint8Array.fromHex(item.hash))
-            .select(eb => eb.fn.countAll().as('count'))
-            .executeTakeFirstOrThrow();
-        if (!Number(count))
-            unlinkSync(join(config.storage.data, item.hash));
+        unlinkSync(join(config.storage.data, item.id));
         return item;
     },
 });

package/lib/StorageSidebarItem.svelte

@@ -3,8 +3,8 @@
 	import { ClipboardCopy, FormDialog, Icon } from '@axium/server/components';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
-	import StorageSidebarItem from './StorageSidebarItem.svelte';
 	import { debug, getDirectory, selection, toggle, toggleRange } from '@axium/storage/sidebar';
+	import StorageSidebarItem from './StorageSidebarItem.svelte';
 
 	let {
 		item = $bindable(),
@@ -21,7 +21,8 @@
 	function oncontextmenu(e: MouseEvent) {
 		e.preventDefault();
 		e.stopPropagation();
-		popover?.togglePopover();
+		popover!.togglePopover();
+		_forcePopover = true;
 	}
 
 	function onclick(e: MouseEvent) {
@@ -29,10 +30,24 @@
 		else if (e.ctrlKey) toggle(item.id);
 		else {
 			selection.clear();
-			selection.add(item.id);
+			toggle(item.id);
 		}
 	}
 
+	let _forcePopover = false;
+
+	/**
+	 * Workaround for https://github.com/whatwg/html/issues/10905
+	 * @todo Remove when the problem is fixed.
+	 */
+	function onpointerup(e: PointerEvent) {
+		if (!_forcePopover) return;
+		e.stopPropagation();
+		e.preventDefault();
+		popover!.togglePopover();
+		_forcePopover = false;
+	}
+
 	let children = $state<StorageItemMetadata[]>([]);
 </script>
 
@@ -43,6 +58,7 @@
 			e.preventDefault();
 			dialogs[name].showModal();
 		}}
+		class="action"
 	>
 		<Icon {i} --size="14px" />
 		{text}
@@ -59,7 +75,7 @@
 
 {#if item.type == 'inode/directory'}
 	<details>
-		<summary class={['StorageSidebarItem', selection.has(item.id) && 'selected']} {onclick} {oncontextmenu}>
+		<summary class={['StorageSidebarItem', selection.has(item.id) && 'selected']} {onclick} {oncontextmenu} {onpointerup}>
 			<Icon i={icon.forMime(item.type)} />
 			<span class="name">{item.name}</span>
 		</summary>
@@ -76,7 +92,7 @@
 		</div>
 	</details>
 {:else}
-	<div class={['StorageSidebarItem', selection.has(item.id) && 'selected']} {onclick} {oncontextmenu}>
+	<div class={['StorageSidebarItem', selection.has(item.id) && 'selected']} {onclick} {oncontextmenu} {onpointerup}>
 		<Icon i={icon.forMime(item.type)} />
 		<span class="name">{item.name}</span>
 	</div>
@@ -163,4 +179,10 @@
 	details > div {
 		padding-left: 0.5em;
 	}
+
+	div.action:hover {
+		cursor: pointer;
+		background-color: #223;
+		border-radius: 0.25em;
+	}
 </style>

package/lib/sidebar.svelte.ts

@@ -8,7 +8,7 @@ export const items = $state<StorageItemMetadata[]>([]);
 
 let lastSelected = $state<string>();
 
-export function getLastedSelected() {
+export function getLastSelected() {
 	return lastSelected;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.4.1",
+	"version": "0.4.3",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"description": "User file storage for Axium",
 	"funding": {