Keep focus state on mWeb

Expensify · Oct 9, 2023 · 063ac7a · 063ac7a
1 parent c5b5685
commit 063ac7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/components/ThreeDotsMenu/index.js b/src/components/ThreeDotsMenu/index.js
@@ -11,6 +11,7 @@ import * as Expensicons from '../Icon/Expensicons';
 import ThreeDotsMenuItemPropTypes from './ThreeDotsMenuItemPropTypes';
 import CONST from '../../CONST';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
+import * as Browser from '../../libs/Browser';
 
 const propTypes = {
     /** Tooltip for the popup icon */
@@ -95,6 +96,12 @@ function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, me
                                 onIconPress();
                             }
                         }}
+                        onMouseDown={(e) => {
+                            if (!Browser.isMobile()) {
+                                return;
+                            }
+                            e.preventDefault();
+                        }}
                         ref={buttonRef}
                         style={[styles.touchableButtonImage, ...iconStyles]}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
@@ -29,7 +29,6 @@ import * as Link from '../../libs/actions/Link';
 import * as Report from '../../libs/actions/Report';
 import * as Session from '../../libs/actions/Session';
 import * as Task from '../../libs/actions/Task';
-import ReportActionComposeFocusManager from '../../libs/ReportActionComposeFocusManager';
 import compose from '../../libs/compose';
 import styles from '../../styles/styles';
 import themeColors from '../../styles/themes/default';
@@ -275,14 +274,6 @@ function HeaderView(props) {
                                     anchorPosition={styles.threeDotsPopoverOffset(props.windowWidth)}
                                     menuItems={threeDotMenuItems}
                                     shouldSetModalVisibility={false}
-                                    onIconPress={() => {
-                                        const {composerRef, editComposerRef, isFocused, isEditFocused} = ReportActionComposeFocusManager;
-                                        if (isFocused()) {
-                                            composerRef.current.blur();
-                                        } else if (isEditFocused()) {
-                                            editComposerRef.current.blur();
-                                        }
-                                    }}
                                 />
                             )}
                         </View>