The VS Code of video editing, built for agents.
TypeScript
Refactor keyboard shortcuts and input handling for improved usability
konstantin-paulus137091a45849
diff --git a/apps/web/src/components/engine/systems/keyboard.ts b/apps/web/src/components/engine/systems/keyboard.tsindex a2712163..7ecf3688 100644--- a/apps/web/src/components/engine/systems/keyboard.ts+++ b/apps/web/src/components/engine/systems/keyboard.ts@@ -2,7 +2,7 @@* License, v. 2.0. If a copy of the MPL was not distributed with this* file, You can obtain one at http://mozilla.org/MPL/2.0/. */-import { ToolType, FontStyle, ChildOf } from '../components';+import { ToolType, ChildOf } from '../components';import {copySelection,pasteClipboard,@@ -22,8 +22,6 @@ import {reorderSelection,getParentEntity,isSequence,- loadAsset,- getCurrentFolderId,} from '../api';import {selectStageEntities,@@ -31,7 +29,7 @@ import {selectChildEntities,} from '../selection';import { SPACE_HOLD_DELAY_MS } from '../constants';-import { isInputTarget, showFileDialog } from '@/utils';+import { isInputTarget } from '@/utils';import { query, None, hasComponent, Or, Not } from 'bitecs';import { addComponent, clearComponent, removeComponent, setComponent } from '../api/events';@@ -196,22 +194,6 @@ export function createKeyboardSystem(world: EngineWorld, camera: Camera) {}};- const modImport: KeyboardHandler = async (e) => {- if (isInputTarget(e)) return;- e.preventDefault();- const files = await showFileDialog();- const folderId = getCurrentFolderId(world);- await Promise.all(files.map((file) => loadAsset(world, file, { folderId })));- };-- const modNewFolder: KeyboardHandler = (e) => {- if (!e.shiftKey) return;- if (isInputTarget(e)) return;- e.preventDefault();- e.stopPropagation();- window.dispatchEvent(new CustomEvent('engine:create-folder'));- };-const modBold: KeyboardHandler = (e) => {const eids = [...query(world, [c.Selected, c.Geometry])].filter(eid => isText(world, eid));if (eids.length === 0) {@@ -227,28 +209,6 @@ export function createKeyboardSystem(world: EngineWorld, camera: Camera) {});};- const modItalic: KeyboardHandler = (e) => {- const eids = [...query(world, [c.Selected, c.Geometry])].filter(eid => isText(world, eid));- if (eids.length === 0) {- modImport(e);- return;- }- e.preventDefault();- const allItalic = eids.every((eid) => (c.TextStyle.fontStyle[eid] ?? FontStyle.NORMAL) === FontStyle.ITALIC);- world.history.transaction('Toggle italic', () => {- eids.forEach(eid => setComponent(world, eid, c.TextStyle, {- fontStyle: allItalic ? FontStyle.NORMAL : FontStyle.ITALIC- }));- });- };-- const modExport: KeyboardHandler = (e) => {- if (isInputTarget(e)) return;- e.preventDefault();- const eventName = e.shiftKey ? 'engine:export-frame' : 'engine:export-scene';- window.dispatchEvent(new CustomEvent(eventName));- };-const modHide: KeyboardHandler = (e) => {if (!e.shiftKey || isInputTarget(e)) return;e.preventDefault();@@ -379,10 +339,7 @@ export function createKeyboardSystem(world: EngineWorld, camera: Camera) {'x': modCut,'d': modDuplicate,'b': modBold,- 'i': modItalic,- 'e': modExport,'h': modHide,- 'n': modNewFolder,'g': modGroup,'s': modSequential,'a': modSelectAll,diff --git a/apps/web/src/components/sidebar-left/assets.tsx b/apps/web/src/components/sidebar-left/assets.tsxindex f62a2fb4..5210c789 100644--- a/apps/web/src/components/sidebar-left/assets.tsx+++ b/apps/web/src/components/sidebar-left/assets.tsx@@ -31,6 +31,7 @@ import { FolderItem, handleFolderDrop, isAssetOrFolderDrag, ASSET_DRAG_TYPE, FOLimport { useLibrary } from "@/engine/library";import { useAssetSelection } from "@/engine/hooks";import { droppedFiles, importFiles, pickAndImport } from "@/engine/asset-actions";+import { isInputTarget } from "@/utils";import type { AssetLibrary } from "@diffusionstudio/assets";@@ -269,10 +270,31 @@ export function Assets() {setRenamingFolder(folder);});+ /**+ * The panel's own keys, the ones its menu advertises. These commands are the+ * library's rather than the stage's, so they are bound here and not in the+ * engine's shortcut table, and they act on the folder the panel is showing —+ * the same folder the buttons import into.+ */+ const handleShortcut = (event: KeyboardEvent) => {+ if (!(event.metaKey || event.ctrlKey) || isInputTarget(event)) return;+ const key = event.key.toLowerCase();++ if (key === "i" && !event.shiftKey) {+ event.preventDefault();+ void handleImportAssets();+ return;+ }++ if (key === "n" && event.shiftKey) {+ event.preventDefault();+ handleCreateFolder();+ }+ };+onMount(() => {- const onCreateFolder = () => handleCreateFolder();- window.addEventListener("engine:create-folder", onCreateFolder);- onCleanup(() => window.removeEventListener("engine:create-folder", onCreateFolder));+ window.addEventListener("keydown", handleShortcut);+ onCleanup(() => window.removeEventListener("keydown", handleShortcut));});return (diff --git a/apps/web/src/context/export.tsx b/apps/web/src/context/export.tsxindex 383d7e25..bb31c191 100644--- a/apps/web/src/context/export.tsx+++ b/apps/web/src/context/export.tsx@@ -4,8 +4,9 @@import { createContext, useContext, onCleanup, onMount } from "solid-js";import { toast } from "somoto";-import { assert, downloadObject } from "@/utils";+import { assert, downloadObject, isInputTarget } from "@/utils";import { useEngine } from "@/context/engine";+import { useEngineContext } from "@/engine";import { useProject } from "@/context/project";import { track } from "@/lib/analytics";import { ExportProgress, type ExportConfig } from "@/components/sidebar-right/inspector/export-progress";@@ -28,6 +29,7 @@ const ExportContext = createContext<ExportContextValue>();export function ExportProvider(props: { children: JSX.Element }) {const engine = useEngine();const { world } = engine;+ const stage = useEngineContext();const project = useProject();const exporting = () => !!renderOverlay();@@ -113,15 +115,9 @@ export function ExportProvider(props: { children: JSX.Element }) {};const exportCurrentFrame: ExportContextValue["exportCurrentFrame"] = async () => {- const canvas = engine.world.canvas;- if (!(canvas instanceof HTMLCanvasElement)) {- toast("Canvas is not ready");- return;- }-- const blob = await new Promise<Blob | null>((resolve) => {- canvas.toBlob((b) => resolve(b), "image/png");- });+ // Taken from the engine that draws the stage, not from the deprecated+ // canvas this provider still renders scenes through.+ const blob = await stage.snapshot();if (!blob) {toast.error("Failed to capture frame");@@ -132,7 +128,7 @@ export function ExportProvider(props: { children: JSX.Element }) {await downloadObject(blob, `${projectName}-frame.png`);};- const handleExportSceneEvent = () => {+ const exportActiveScene = () => {const sid = world.selection.scene;if (sid === null) {return toast("No active scene to export");@@ -140,18 +136,22 @@ export function ExportProvider(props: { children: JSX.Element }) {exportScene(sid, getDefaultExportTemplate());};- const handleExportFrameEvent = () => exportCurrentFrame();-- onMount(() => {- // TODO: Event bus would be better here- window.addEventListener("engine:export-scene", handleExportSceneEvent);- window.addEventListener("engine:export-frame", handleExportFrameEvent);- });+ /**+ * Export is the provider's command, so its keys are bound here rather than+ * in the engine's shortcut table: ⌘E writes the active scene, ⇧⌘E the frame+ * on screen — the same two the File menu lists.+ */+ const handleShortcut = (event: KeyboardEvent) => {+ if (!(event.metaKey || event.ctrlKey) || event.key.toLowerCase() !== "e") return;+ if (isInputTarget(event)) return;++ event.preventDefault();+ if (event.shiftKey) void exportCurrentFrame();+ else exportActiveScene();+ };- onCleanup(() => {- window.removeEventListener("engine:export-scene", handleExportSceneEvent);- window.removeEventListener("engine:export-frame", handleExportFrameEvent);- });+ onMount(() => window.addEventListener("keydown", handleShortcut));+ onCleanup(() => window.removeEventListener("keydown", handleShortcut));return (<ExportContext.Provider value={{ exportScene, exportCurrentFrame, exporting }}>