Fix selection list scrolling after closing context menu

src/components/SelectionList/BaseSelectionListItemRenderer.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import type useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import type useSingleExecution from '@hooks/useSingleExecution';
+import * as Browser from '@libs/Browser';
 import * as SearchUIUtils from '@libs/SearchUIUtils';
 import type {BaseListItemProps, BaseSelectionListProps, ListItem} from './types';
 
@@ -72,11 +73,15 @@ function BaseSelectionListItemRenderer<TItem extends ListItem>({
                 isMultilineSupported={isMultilineSupported}
                 isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
                 alternateTextNumberOfLines={alternateTextNumberOfLines}
-                onFocus={() => {
+                onFocus={(event) => {
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     if (shouldIgnoreFocus || isDisabled) {
                         return;
                     }
+                    // Prevent unexpected scrolling on mobile Chrome after the context menu closes by ignoring programmatic focus not triggered by direct user interaction.
+                    if (Browser.isMobileChrome() && event?.nativeEvent && !event.nativeEvent.sourceCapabilities) {
+                        return;
+                    }
                     setFocusedIndex(normalizedIndex);
                 }}
                 shouldSyncFocus={shouldSyncFocus}

src/components/SelectionList/Search/SearchQueryListItem.tsx

@@ -3,7 +3,7 @@ import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
 import Icon from '@components/Icon';
 import BaseListItem from '@components/SelectionList/BaseListItem';
-import type {ListItem} from '@components/SelectionList/types';
+import type {ListItem, ListItemFocusEventHandler} from '@components/SelectionList/types';
 import TextWithTooltip from '@components/TextWithTooltip';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -23,7 +23,7 @@ type SearchQueryListItemProps = {
     isFocused?: boolean;
     showTooltip: boolean;
     onSelectRow: (item: SearchQueryItem) => void;
-    onFocus?: () => void;
+    onFocus?: ListItemFocusEventHandler;
     shouldSyncFocus?: boolean;
 };
 

src/components/SelectionList/types.ts

@@ -7,6 +7,7 @@ import type {
     NativeSyntheticEvent,
     SectionListData,
     StyleProp,
+    TargetedEvent,
     TextInput,
     TextStyle,
     ViewStyle,
@@ -84,12 +85,19 @@ type CommonListItemProps<TItem extends ListItem> = {
     alternateTextNumberOfLines?: number;
 
     /** Handles what to do when the item is focused */
-    onFocus?: () => void;
+    onFocus?: ListItemFocusEventHandler;
 
     /** Callback to fire when the item is long pressed */
     onLongPressRow?: (item: TItem) => void;
 } & TRightHandSideComponent<TItem>;
 
+type ListItemFocusEventHandler = (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void;
+
+type ExtendedTargetedEvent = TargetedEvent & {
+    /** Provides information about the input device responsible for the event, or null if triggered programmatically, available in some browsers */
+    sourceCapabilities?: unknown;
+};
+
 type ListItem = {
     /** Text to display */
     text?: string;
@@ -653,6 +661,7 @@ export type {
     InviteMemberListItemProps,
     ItemLayout,
     ListItem,
+    ListItemFocusEventHandler,
     ListItemProps,
     RadioListItemProps,
     ReportListItemProps,

src/pages/workspace/categories/WorkspaceCategoriesPage.tsx

@@ -368,6 +368,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                         Navigation.goBack(backTo);
                     }}
                     shouldShowThreeDotsButton
+                    style={styles.headerBarDesktopHeight}
                     threeDotsMenuItems={threeDotsMenuItems}
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
                 >