Merge pull request #49061 from bernhardoj/fix/48451-new-line-added-wh…

…en-edit Disable context menu enter shortcut for web platform
Expensify · Sep 13, 2024 · 5fd937e · 5fd937e
2 parents 04762ac + a0bfe04
commit 5fd937e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/libs/shouldEnableContextMenuEnterShortcut/index.native.ts b/src/libs/shouldEnableContextMenuEnterShortcut/index.native.ts
@@ -0,0 +1 @@
+export default true;
diff --git a/src/libs/shouldEnableContextMenuEnterShortcut/index.ts b/src/libs/shouldEnableContextMenuEnterShortcut/index.ts
@@ -0,0 +1 @@
+export default false;
diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx
@@ -19,6 +19,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import shouldEnableContextMenuEnterShortcut from '@libs/shouldEnableContextMenuEnterShortcut';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -257,7 +258,7 @@ function BaseReportActionContextMenu({
             menuItemRefs.current[focusedIndex]?.triggerPressAndUpdateSuccess?.();
             setFocusedIndex(-1);
         },
-        {isActive: shouldEnableArrowNavigation, shouldPreventDefault: false},
+        {isActive: shouldEnableArrowNavigation && shouldEnableContextMenuEnterShortcut, shouldPreventDefault: false},
     );
 
     const openOverflowMenu = (event: GestureResponderEvent | MouseEvent, anchorRef: MutableRefObject<View | null>) => {