fixup! fixup! adds f2 shortcut using a fakenode since it's outside the treeview struct

Author: Ovgodd

src/frontend/apps/impress/src/features/docs/doc-tree/components/DocSubPageItem.tsx

@@ -100,14 +100,24 @@ export const DocSubPageItem = (props: TreeViewNodeProps<Doc>) => {
 
   const handleKeyDown = (e: React.KeyboardEvent) => {
     // F2: focus first action button
-    const shoulOpenActions = !menuOpen && node.isFocused;
-    if (e.key === 'F2' && shoulOpenActions) {
+    const shouldOpenActions = !menuOpen && node.isFocused;
+    if (e.key === 'F2' && shouldOpenActions) {
       buttonOptionRef.current?.focus();
       e.stopPropagation();
       return;
     }
   };
 
+  const handleActionsOpenChange = (isOpen: boolean) => {
+    setMenuOpen(isOpen);
+
+    // When the menu closes (via Escape or activating an option),
+    // return focus to the tree item so focus is not lost.
+    if (!isOpen) {
+      node.focus();
+    }
+  };
+
   return (
     <Box
       className="--docs-sub-page-item"
@@ -181,7 +191,7 @@ export const DocSubPageItem = (props: TreeViewNodeProps<Doc>) => {
           <DocTreeItemActions
             doc={doc}
             isOpen={menuOpen}
-            onOpenChange={setMenuOpen}
+            onOpenChange={handleActionsOpenChange}
             parentId={node.data.parentKey}
             onCreateSuccess={afterCreate}
             actionsRef={actionsRef}

src/frontend/apps/impress/src/features/docs/doc-tree/components/DocTree.tsx

@@ -116,6 +116,20 @@ export const DocTree = ({ currentDoc }: DocTreeProps) => {
     [selectRoot, navigateToRoot, rootActionsOpen],
   );
 
+  // Handle menu open/close for root item - mirrors DocSubPageItem behavior
+  const handleRootActionsOpenChange = useCallback((isOpen: boolean) => {
+    setRootActionsOpen(isOpen);
+
+    // When the menu closes, return focus to the root tree item
+    // (same behavior as DocSubPageItem for consistency)
+    // Use requestAnimationFrame for smoother focus transition without flickering
+    if (!isOpen) {
+      requestAnimationFrame(() => {
+        rootItemRef.current?.focus();
+      });
+    }
+  }, []);
+
   /**
    * This effect is used to reset the tree when a new document
    * that is not part of the current tree is loaded.
@@ -310,7 +324,7 @@ export const DocTree = ({ currentDoc }: DocTreeProps) => {
                 }}
                 isOpen={rootActionsOpen}
                 isRoot={true}
-                onOpenChange={setRootActionsOpen}
+                onOpenChange={handleRootActionsOpenChange}
                 actionsRef={rootActionsRef}
                 buttonOptionRef={rootButtonOptionRef}
               />