Fix sidebar Enter/o not focusing the note list on filtered views

Two issues:

1. Pressing Enter on sidebar filter buttons (Todo, Pinned, etc.)
   triggered both the keyboard nav handler (focus notes pane) and the
   button's native Enter→click (re-select filter, set focus back to
   sidebar). Fix: prevent default Enter/Space on filter buttons so
   the nav handler controls focus exclusively.

2. When the selected note wasn't in the current filtered list (e.g.
   selected from All Notes, then switched to Todo), the notes pane
   handler tried to focus a non-existent row and fell back to focusing
   the scroll container. Fix: detect the mismatch and fall back to
   selecting the first visible note instead. Also removed the scroll
   container focus fallback entirely — if no note row exists to focus,
   do nothing since focusedPane store state handles keyboard routing.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ChristianChiarulli

app/src/features/notes/ui/notes-pane-utils.ts

@@ -152,10 +152,7 @@ export function focusNotesPaneTarget(scrollContainer: HTMLDivElement | null) {
       if (selectedRow) {
         selectedRow.scrollIntoView({ block: "nearest" });
         selectedRow.focus({ preventScroll: true });
-        return;
       }
-
-      scrollContainer?.focus({ preventScroll: true });
     });
   });
 }

app/src/features/notes/ui/notes-pane.tsx

@@ -260,7 +260,18 @@ export function NotesPane({
   useEffect(() => {
     const handleFocusNotesPane = (event: Event) => {
       const customEvent = event as CustomEvent<FocusNotesPaneDetail>;
-      const selection = customEvent.detail?.selection ?? "selected";
+      let selection = customEvent.detail?.selection ?? "selected";
+
+      // If the selected note isn't in the current filtered list, fall back
+      // to selecting the first visible note instead of focusing an empty
+      // scroll container.
+      if (
+        selection === "selected" &&
+        selectedNoteId &&
+        !filteredNotes.some((n) => n.id === selectedNoteId)
+      ) {
+        selection = "first";
+      }
 
       if (selection === "first") {
         if (isNotesPlaceholderData) {
@@ -269,7 +280,9 @@ export function NotesPane({
         }
 
         setIsSearchFocused(false);
+        setFocusedPane("notes");
         selectFirstVisibleNote();
+        focusNotesPaneTarget(scrollContainerRef.current);
         return;
       }
 
@@ -283,7 +296,13 @@ export function NotesPane({
     return () => {
       window.removeEventListener(FOCUS_NOTES_PANE_EVENT, handleFocusNotesPane);
     };
-  }, [isNotesPlaceholderData, selectFirstVisibleNote, setFocusedPane]);
+  }, [
+    filteredNotes,
+    isNotesPlaceholderData,
+    selectFirstVisibleNote,
+    selectedNoteId,
+    setFocusedPane,
+  ]);
 
   useEffect(() => {
     setShowHeaderBorder((scrollContainerRef.current?.scrollTop ?? 0) > 0);

app/src/features/shell/ui/sidebar-notes-section.tsx

@@ -1,4 +1,4 @@
-import { type MouseEvent } from "react";
+import { type KeyboardEvent, type MouseEvent } from "react";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import { Menu } from "@tauri-apps/api/menu";
 import {
@@ -50,6 +50,19 @@ async function showTrashContextMenu(
   }
 }
 
+/**
+ * Prevent the native button Enter/Space → click behavior so that the
+ * parent `<nav>` keyboard handler controls focus transitions exclusively.
+ * Without this, pressing Enter on a filter button fires both the nav
+ * handler (which focuses the notes pane) and the button's synthetic
+ * click (which re-selects the filter and sets focus back to sidebar).
+ */
+function preventButtonKeyboardClick(event: KeyboardEvent<HTMLButtonElement>) {
+  if (event.key === "Enter" || event.key === " ") {
+    event.preventDefault();
+  }
+}
+
 export function NotesSection({
   archivedCount,
   isFocused,
@@ -169,6 +182,7 @@ export function NotesSection({
               className={sidebarItemClasses(isTodayActive, isFocused)}
               onClick={onSelectToday}
               onFocus={onSidebarRowFocus}
+              onKeyDown={preventButtonKeyboardClick}
               ref={(element) => onRowRef("filter:today", element)}
               data-comet-sidebar-active={isTodayActive ? "true" : undefined}
               type="button"
@@ -186,6 +200,7 @@ export function NotesSection({
               className={sidebarItemClasses(isTodoActive, isFocused)}
               onClick={onSelectTodo}
               onFocus={onSidebarRowFocus}
+              onKeyDown={preventButtonKeyboardClick}
               ref={(element) => onRowRef("filter:todo", element)}
               data-comet-sidebar-active={isTodoActive ? "true" : undefined}
               type="button"
@@ -207,6 +222,7 @@ export function NotesSection({
               className={sidebarItemClasses(isPinnedActive, isFocused)}
               onClick={onSelectPinned}
               onFocus={onSidebarRowFocus}
+              onKeyDown={preventButtonKeyboardClick}
               ref={(element) => onRowRef("filter:pinned", element)}
               data-comet-sidebar-active={isPinnedActive ? "true" : undefined}
               type="button"
@@ -222,6 +238,7 @@ export function NotesSection({
               className={sidebarItemClasses(isUntaggedActive, isFocused)}
               onClick={onSelectUntagged}
               onFocus={onSidebarRowFocus}
+              onKeyDown={preventButtonKeyboardClick}
               ref={(element) => onRowRef("filter:untagged", element)}
               data-comet-sidebar-active={isUntaggedActive ? "true" : undefined}
               type="button"
@@ -241,6 +258,7 @@ export function NotesSection({
           className={sidebarItemClasses(isArchiveActive, isFocused)}
           onClick={onSelectArchive}
           onFocus={onSidebarRowFocus}
+          onKeyDown={preventButtonKeyboardClick}
           ref={(element) => onRowRef("filter:archive", element)}
           data-comet-sidebar-active={isArchiveActive ? "true" : undefined}
           type="button"
@@ -257,6 +275,7 @@ export function NotesSection({
           onClick={onSelectTrash}
           onContextMenu={(event) => handleTrashContextMenu(event)}
           onFocus={onSidebarRowFocus}
+          onKeyDown={preventButtonKeyboardClick}
           ref={(element) => onRowRef("filter:trash", element)}
           data-comet-sidebar-active={isTrashActive ? "true" : undefined}
           type="button"