fix: add .dockerignore and Ctrl+X keybinding for delete

Author: tusharchawre

.dockerignore

@@ -0,0 +1,44 @@
+# Dependencies
+node_modules
+**/node_modules
+
+# Build outputs
+.next
+.turbo
+dist
+build
+*.tsbuildinfo
+
+# Environment files
+.env
+.env.local
+.env.*.local
+
+# Git
+.git
+.gitignore
+
+# IDE
+.vscode
+.idea
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Testing
+coverage
+.nyc_output
+
+# Misc
+*.md
+!README.md
+

apps/web/src/stores/keybindings-store.ts

@@ -28,6 +28,7 @@ export const defaultKeybindings: KeybindingConfig = {
   "ctrl+z": "undo",
   "ctrl+shift+z": "redo",
   "ctrl+y": "redo",
+  "ctrl+x": "delete-selected",
   delete: "delete-selected",
   backspace: "delete-selected",
 };
@@ -164,7 +165,18 @@ export const useKeybindingsStore = create<KeybindingsState>()(
     }),
     {
       name: "opencut-keybindings",
-      version: 2,
+      version: 3,
+      merge: (persistedState: any, currentState: any) => {
+        // Merge defaults with persisted state to ensure new keybindings are included
+        return {
+          ...currentState,
+          ...persistedState,
+          keybindings: {
+            ...defaultKeybindings,
+            ...persistedState?.keybindings,
+          },
+        };
+      },
     }
   )
 );