From 2244ad95ddbbf1704c6e6c9dada8481d0ecbb411 Mon Sep 17 00:00:00 2001
From: poanse <50020771+poanse@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:16:07 +0300
Subject: [PATCH] fixed deleting task on text del

---
 src/components/Task.svelte     | 1 +
 src/components/TaskText.svelte | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Task.svelte b/src/components/Task.svelte
index 6af910d..556daf2 100644
--- a/src/components/Task.svelte
+++ b/src/components/Task.svelte
@@ -148,6 +148,7 @@
 				onpointerup={onPointerUp}
 				onblur={() => finishEditing()}
 				role="presentation"
+				tabindex="-1"
 			>
 				<TaskText {taskId} {isUnselected} {context}/>
 			</div>
diff --git a/src/components/TaskText.svelte b/src/components/TaskText.svelte
index 0e547d9..426f912 100644
--- a/src/components/TaskText.svelte
+++ b/src/components/TaskText.svelte
@@ -125,11 +125,17 @@
 		if (e.key === "Enter") {
 			e.preventDefault();
 			textEditEl.blur(); // Triggers handleBlur
-			// TODO: body gets focused instead of viewport
 		} else if (e.key === "Tab" && suggest !== null) {
 			// another hack to select suggest on tab
 			e.preventDefault();
 			textEditEl.dispatchEvent(new KeyboardEvent('keydown', {key: 'Enter'}));
+		} else if (e.key == "Escape" && isEditing) {
+			e.stopPropagation();
+			textEditEl.blur();
+		} else if (e.key == "Escape") {
+			textEditEl.blur();
+		} else {
+			e.stopPropagation();
 		}
 	}
 
@@ -137,6 +143,7 @@
 		// TODO: throws error because text preview doesn't exit when blur on textedit happens
 		context.editingTaskId = NoTaskId;
 		handleInput();
+		textEditEl?.parentElement?.parentElement?.focus();
 		await tick(); // Wait for DOM to render preview element
 		await renderMarkdown();
 	}