From 52634e4dec56de31c790d3e718cebffef147f27e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 14 Jul 2025 08:55:13 -0700
Subject: [PATCH] fix: Focus the first element in flyouts. (#9228)

* fix: Focus the first element in flyouts.

* refactor: Adjust retrieval of flyout elements.
---
 core/workspace_svg.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 4180c1099..b666dc97a 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -2727,6 +2727,19 @@ export class WorkspaceSvg
     previousNode: IFocusableNode | null,
   ): IFocusableNode | null {
     if (!previousNode) {
+      const flyout = this.targetWorkspace?.getFlyout();
+      if (this.isFlyout && flyout) {
+        // Return the first focusable item of the flyout.
+        return (
+          flyout
+            .getContents()
+            .find((flyoutItem) => {
+              const element = flyoutItem.getElement();
+              return isFocusableNode(element) && element.canBeFocused();
+            })
+            ?.getElement() ?? null
+        );
+      }
       return this.getTopBlocks(true)[0] ?? null;
     } else return null;
   }