Merge pull request #4179 from parasharrajat/right-click

Fix: Enable default context-menu on messages being edited
Expensify · Jul 26, 2021 · 59c393d · 59c393d
2 parents 57dac86 + be9b748
commit 59c393d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/components/PressableWithSecondaryInteraction/index.js b/src/components/PressableWithSecondaryInteraction/index.js
@@ -30,7 +30,9 @@ class PressableWithSecondaryInteraction extends Component {
      */
     executeSecondaryInteractionOnContextMenu(e) {
         const selection = window.getSelection().toString();
-        e.preventDefault();
+        if (this.props.preventDefaultContentMenu) {
+            e.preventDefault();
+        }
         this.props.onSecondaryInteraction(e, selection);
     }
 

diff --git a/...omponents/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js b/...omponents/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
@@ -15,12 +15,16 @@ const propTypes = {
 
     /** The ref to the search input (may be null on small screen widths) */
     forwardedRef: PropTypes.func,
+
+    /** Prevent the default ContextMenu on web/Desktop */
+    preventDefaultContentMenu: PropTypes.bool,
 };
 
 const defaultProps = {
     forwardedRef: () => {},
     onPressIn: () => {},
     onPressOut: () => {},
+    preventDefaultContentMenu: true,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -273,6 +273,7 @@ class ReportActionItem extends Component {
                     onPressIn={() => this.props.isSmallScreenWidth && canUseTouchScreen() && ControlSelection.block()}
                     onPressOut={() => ControlSelection.unblock()}
                     onSecondaryInteraction={this.showPopover}
+                    preventDefaultContentMenu={!this.props.draftMessage}
                 >
                     <Hoverable resetsOnClickOutside={false}>
                         {hovered => (