From 3c4804b6d45bff4d6a4987e23081dbdd82e119c4 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 3 Mar 2026 23:46:37 +0100
Subject: [PATCH] fix(frontend): use rAF retry loop to focus quick entry input

The previous approach using nextTick and window focus events didn't
work because the Modal transition (v-if + Transition appear) and the
Electron window visibility timing both prevent immediate focus. Use
requestAnimationFrame to retry until focus actually lands on the input.
---
 .../components/quick-actions/QuickActions.vue | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/quick-actions/QuickActions.vue b/frontend/src/components/quick-actions/QuickActions.vue
index 19f80f752..fc8f4727b 100644
--- a/frontend/src/components/quick-actions/QuickActions.vue
+++ b/frontend/src/components/quick-actions/QuickActions.vue
@@ -100,7 +100,7 @@
 </template>
 
 <script setup lang="ts">
-import {type ComponentPublicInstance, computed, nextTick, ref, shallowReactive, watchEffect} from 'vue'
+import {type ComponentPublicInstance, computed, ref, shallowReactive, watchEffect} from 'vue'
 import {useQuickAddMode} from '@/composables/useQuickAddMode'
 import {useI18n} from 'vue-i18n'
 import {useRouter} from 'vue-router'
@@ -187,20 +187,18 @@ watchEffect(() => {
 	if (active.value && isQuickAddMode) {
 		selectedCmd.value = commands.value.newTask
 
-		// The Electron window may not be visible yet when Vue mounts
-		// (it's shown after did-finish-load). Try focusing now, and if
-		// the window doesn't have focus yet, wait for it.
-		nextTick(() => {
-			if (document.hasFocus()) {
-				searchInput.value?.focus()
-			} else {
-				const focusOnWindowReady = () => {
-					searchInput.value?.focus()
-					window.removeEventListener('focus', focusOnWindowReady)
-				}
-				window.addEventListener('focus', focusOnWindowReady)
+		// The input may not be focusable yet due to:
+		// 1. Modal transition (v-if + <Transition appear>) delaying DOM readiness
+		// 2. Electron window not yet visible (shown after did-finish-load)
+		// Retry with rAF until focus actually lands on the input.
+		const tryFocus = () => {
+			if (searchInput.value) {
+				searchInput.value.focus()
+				if (document.activeElement === searchInput.value) return
 			}
-		})
+			requestAnimationFrame(tryFocus)
+		}
+		requestAnimationFrame(tryFocus)
 	}
 })