Merge pull request #71 from grimmerk/fix/arrow-key-focus-on-return

fix: re-focus search input on window return

Author: grimmerk

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.46
+
+- Fix: arrow keys not changing selected item after returning from background
+- Fix: Settings panel close not returning focus to correct search input (React closure trap)
+
 ## 1.0.45
 
 - cmux: three-layer switch matching (title → TTY → cwd fallback), same as iTerm2

package.json

@@ -1,7 +1,7 @@
 {
   "name": "CodeV",
   "productName": "CodeV",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "Quick switcher for VS Code, Cursor, and Claude Code sessions",
   "main": ".webpack/main",
   "scripts": {

src/popup.tsx

@@ -131,6 +131,7 @@ const PopupDefaultExample = ({
       placement="bottom-end"
       content={(props) => (
         <div
+          data-settings-panel
           style={{
             width: 500,
             backgroundColor: '#252525',
@@ -511,6 +512,7 @@ const PopupDefaultExample = ({
       trigger={(triggerProps) => (
         <Button
           {...triggerProps}
+          data-settings-panel
           appearance="primary"
           isSelected={isOpen}
           onClick={() => {

src/switcher-ui.tsx

@@ -303,10 +303,10 @@ function SwitcherApp() {
   const ref = useRef(null);
   const sessionSearchRef = useRef<HTMLInputElement>(null);
   const forceFocusOnInput = () => {
-    if (mode === 'projects') {
-      ref.current?.focus();
-    } else {
+    if (modeRef.current === 'sessions') {
       sessionSearchRef.current?.focus();
+    } else {
+      ref.current?.focus();
     }
   };
 
@@ -451,6 +451,9 @@ function SwitcherApp() {
     document.addEventListener('keydown', handleKeyDown);
     document.addEventListener('keyup', handleKeyUp);
     document.addEventListener('click', (e) => {
+      // Don't steal focus from Settings panel interactions (dropdowns, buttons, etc.)
+      const target = e.target as HTMLElement;
+      if (target.closest('[data-settings-panel]')) return;
       forceFocusOnInput();
     });
 
@@ -464,6 +467,14 @@ function SwitcherApp() {
       (window as any).electronAPI.getSessionDisplayMode().then((mode: string) => {
         setSessionDisplayMode(mode || 'first');
       });
+      // Re-focus search input so arrow keys work (not captured by scroll container)
+      setTimeout(() => {
+        if (modeRef.current === 'sessions') {
+          sessionSearchRef.current?.focus();
+        } else {
+          ref.current?.focus();
+        }
+      }, 50);
     });
 
     (window as any).electronAPI.onWorkingFolderIterated(