[ARVADOS-WORKBENCH2] updated: 1.1.4-230-g1fd9a76
Git user
git at public.curoverse.com
Mon Jul 9 08:55:08 EDT 2018
Summary of changes:
src/components/context-menu/context-menu.tsx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
via 1fd9a76aa32b299073a01d70b55cd49720ecac7f (commit)
via 4187ee4067e67370f6708ba1a0121ecf0a1ac756 (commit)
from 6ee23f0a48cce527596ef1f260b40a71618326a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 1fd9a76aa32b299073a01d70b55cd49720ecac7f
Merge: 6ee23f0 4187ee4
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Jul 9 14:54:41 2018 +0200
Merge branch '13770-browser-context-menu-on-top'
refs #13770
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
commit 4187ee4067e67370f6708ba1a0121ecf0a1ac756
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Jul 9 14:52:01 2018 +0200
Block browser context menu inside app's context menu
Feature #13770
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx
index 7751be4..6ac1207 100644
--- a/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@ -27,7 +27,8 @@ export default class ContextMenu<T> extends React.PureComponent<ContextMenuProps
open={!!anchorEl}
onClose={onClose}
transformOrigin={DefaultTransformOrigin}
- anchorOrigin={DefaultTransformOrigin}>
+ anchorOrigin={DefaultTransformOrigin}
+ onContextMenu={this.handleContextMenu}>
<List dense>
{actions.map((group, groupIndex) =>
<React.Fragment key={groupIndex}>
@@ -48,4 +49,9 @@ export default class ContextMenu<T> extends React.PureComponent<ContextMenuProps
</List>
</Popover>;
}
+
+ handleContextMenu = (event: React.MouseEvent<HTMLElement>) => {
+ event.preventDefault();
+ this.props.onClose();
+ }
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list