Fix focus lost after rename cancellation

vdavid · vdavid · commit edace1893ec0 · 2026-02-23T20:32:04.000+01:00
Pane focus wasn't restored when inline rename was canceled
due to permission errors, noop results, conflict resolution
failures, or external file removal. Keyboard navigation broke
because focus stayed on &lt;body&gt; after the editor unmounted.
diff --git a/apps/desktop/src/lib/file-explorer/pane/FilePane.svelte b/apps/desktop/src/lib/file-explorer/pane/FilePane.svelte
@@ -343,6 +343,7 @@
             if (errorMsg && rename.active && rename.target?.path === entry.path) {
                 rename.cancel()
                 renameNotification = { message: errorMsg, style: 'error' }
+                onRequestFocus?.()
             }
         })
     }
@@ -403,6 +404,7 @@
         switch (result.type) {
             case 'noop':
                 rename.cancel()
+                onRequestFocus?.()
                 break
             case 'error':
                 rename.triggerShake()
@@ -476,6 +478,7 @@
 
         if (!target || !trimmedName) {
             rename.cancel()
+            onRequestFocus?.()
             return
         }
 
@@ -491,6 +494,7 @@
                         const msg = e instanceof Error ? e.message : String(e)
                         renameNotification = { message: msg, style: 'error' }
                         rename.cancel()
+                        onRequestFocus?.()
                     })
                 break
             }
@@ -1475,6 +1479,7 @@
                 const wasRemoved = diff.changes.some((c) => c.type === 'remove' && c.entry.name === targetName)
                 if (wasRemoved) {
                     rename.cancel()
+                    onRequestFocus?.()
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@`
`343`	`343`	`if (errorMsg && rename.active && rename.target?.path === entry.path) {`
`344`	`344`	`rename.cancel()`
`345`	`345`	`renameNotification = { message: errorMsg, style: 'error' }`
	`346`	`+ onRequestFocus?.()`
`346`	`347`	`}`
`347`	`348`	`})`
`348`	`349`	`}`
`@@ -403,6 +404,7 @@`
`403`	`404`	`switch (result.type) {`
`404`	`405`	`case 'noop':`
`405`	`406`	`rename.cancel()`
	`407`	`+ onRequestFocus?.()`
`406`	`408`	`break`
`407`	`409`	`case 'error':`
`408`	`410`	`rename.triggerShake()`
`@@ -476,6 +478,7 @@`
`476`	`478`
`477`	`479`	`if (!target \|\| !trimmedName) {`
`478`	`480`	`rename.cancel()`
	`481`	`+ onRequestFocus?.()`
`479`	`482`	`return`
`480`	`483`	`}`
`481`	`484`
`@@ -491,6 +494,7 @@`
`491`	`494`	`const msg = e instanceof Error ? e.message : String(e)`
`492`	`495`	`renameNotification = { message: msg, style: 'error' }`
`493`	`496`	`rename.cancel()`
	`497`	`+ onRequestFocus?.()`
`494`	`498`	`})`
`495`	`499`	`break`
`496`	`500`	`}`
`@@ -1475,6 +1479,7 @@`
`1475`	`1479`	`const wasRemoved = diff.changes.some((c) => c.type === 'remove' && c.entry.name === targetName)`
`1476`	`1480`	`if (wasRemoved) {`
`1477`	`1481`	`rename.cancel()`
	`1482`	`+ onRequestFocus?.()`
`1478`	`1483`	`}`
`1479`	`1484`	`}`
`1480`	`1485`