Skip to content

The VS Code of video editing, built for agents.

TypeScript

feat: enhance asset import functionality with selection management

konstantin-paulus2609b28820dc
diff --git a/apps/web/src/components/sidebar-left/assets.tsx b/apps/web/src/components/sidebar-left/assets.tsx
index 39e4769d..9813b845 100644
--- a/apps/web/src/components/sidebar-left/assets.tsx
+++ b/apps/web/src/components/sidebar-left/assets.tsx
@@ -44,7 +44,7 @@ import { droppedFiles, importFiles, insertAssetsAtPlayhead, insertAssetsAtStart,
import { isInputTarget } from "@/utils";
import { useCommand } from "@/context/commands";
-import type { AssetLibrary } from "@diffusionstudio/assets";
+import type { Asset, AssetLibrary } from "@diffusionstudio/assets";
/** The ancestors of a folder path, root excluded, nearest last. */
/**
@@ -172,6 +172,17 @@ export function Assets() {
base = new Set();
};
+ /** Selects what an import brought in; a dismissed picker or a refused drop keeps the selection. */
+ const selectImported = (assets: ReadonlyArray<Asset>) => {
+ if (!assets.length) return;
+ const keys = assets.map((asset) => assetKey(asset.id));
+ setSelection(keys);
+ anchor = keys[0];
+ lead = keys.at(-1)!;
+ base = new Set();
+ root?.focus();
+ };
+
// Items that leave the grid (another folder opened, filtered out, moved or
// deleted) leave the selection, so keys never act on what is not in view.
createEffect(() => {
@@ -317,7 +328,7 @@ export function Assets() {
return run(lib);
};
- const handleImportAssets = () => withLibrary((lib) => pickAndImport(lib, currentFolder()).then(() => { }));
+ const handleImportAssets = () => withLibrary(async (lib) => selectImported(await pickAndImport(lib, currentFolder())));
const handleDrop = async (event: DragEvent) => {
event.preventDefault();
@@ -330,7 +341,7 @@ export function Assets() {
const lib = library();
if (!lib) return;
if (handleFolderDrop(lib, event, currentFolder())) return;
- await importFiles(lib, droppedFiles(event), currentFolder());
+ selectImported(await importFiles(lib, droppedFiles(event), currentFolder()));
};
const handleDragOver = (event: DragEvent) => {
diff --git a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
index 5269d3b7..836fe46a 100644
--- a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
+++ b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
@@ -32,6 +32,7 @@ import { AssetId, ChildOf, Name, Root, Scene, getAssetFile, getActiveEntity, sor
import { assetName } from "@diffusionstudio/assets";
import { useQuery, useWorld } from "@diffusionstudio/koota-solid";
import { useLibrary } from "@/engine/library";
+import { useAssetSelection } from "@/engine/hooks";
import { pickAndImport } from "@/engine/asset-actions";
import { projectRoute } from "@/hooks/use-project-route";
import { useProject } from "@/context/project";
@@ -94,6 +95,7 @@ export function FileMenu() {
const navigate = useNavigate();
const project = useProject();
const library = useLibrary();
+ const assetSelection = useAssetSelection();
const commands = useFileCommands();
const [editors] = createResource(listEditors, { initialValue: [] });
@@ -145,7 +147,14 @@ export function FileMenu() {
toast("No project open");
return;
}
- await pickAndImport(lib, "");
+ const imported = await pickAndImport(lib, "");
+
+ if (imported.length) {
+ assetSelection.set({
+ ids: imported.map((asset) => asset.id),
+ folders: [],
+ });
+ }
};
return (