Merge pull request #57 from software-mansion-labs/@filip-solecki/idea…

…l-nav-merge-issues-3 Fix active workspace state (212,211)
Expensify · Jan 31, 2024 · 8401a04 · 8401a04
2 parents acd6fa9 + 6ee3a1d
commit 8401a04
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/pages/WorkspaceSwitcherPage.js b/src/pages/WorkspaceSwitcherPage.js
@@ -258,8 +258,8 @@ function WorkspaceSwitcherPage({policies}) {
                         showTitleTooltip={false}
                         contentContainerStyles={[styles.pt0, styles.mt0]}
                         textIconLeft={MagnifyingGlass}
-                        // It has to be set to null or -1 to avoid focus on any element at the beggining
-                        initiallyFocusedOptionKey={null}
+                        // Null is to avoid selecting unfocused option when Global selected, undefined is to focus selected workspace
+                        initiallyFocusedOptionKey={!activeWorkspaceID ? null : undefined}
                     />
                 ) : (
                     <WorkspaceCardCreateAWorkspace />