From 9cc0fe1f38f0bd7e9f11932867587a4bd1f48243 Mon Sep 17 00:00:00 2001
From: Wim Brand <wim@fornaxian.tech>
Date: Thu, 17 Apr 2025 16:16:35 +0200
Subject: [PATCH] Fix keyboard shortcut conflict in filesystem

---
 svelte/src/filesystem/filemanager/FileManager.svelte | 7 +++++++
 svelte/src/filesystem/viewers/Video.svelte           | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/svelte/src/filesystem/filemanager/FileManager.svelte b/svelte/src/filesystem/filemanager/FileManager.svelte
index d74212e..29624e0 100644
--- a/svelte/src/filesystem/filemanager/FileManager.svelte
+++ b/svelte/src/filesystem/filemanager/FileManager.svelte
@@ -169,6 +169,13 @@ let moving_items = []
 let shift_pressed = false
 let last_selected_node = -1
 const keypress = (e: KeyboardEvent) => {
+	if (
+		(document.activeElement as any).type !== undefined &&
+		(document.activeElement as any).type === "text"
+	) {
+		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) {
diff --git a/svelte/src/filesystem/viewers/Video.svelte b/svelte/src/filesystem/viewers/Video.svelte
index 6d01bc4..2c717aa 100644
--- a/svelte/src/filesystem/viewers/Video.svelte
+++ b/svelte/src/filesystem/viewers/Video.svelte
@@ -106,7 +106,6 @@ const video_keydown = (e: KeyboardEvent) => {
 					class="video"
 					on:pause={() => playing = false }
 					on:play={() => playing = true }
-					on:ended={() => dispatch("open_sibling", 1)}
 					on:keydown={video_keydown}
 					use:video_position={() => $nav.base.sha256_sum.substring(0, 8)}
 				>