Merge remote-tracking branch 'origin' into 13694-Data-operations-Project-creation

refs #13694

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --combined src/components/context-menu/context-menu.tsx
index 48e63ba0b975916d42dd03845f52eb279a15a1eb,6ac1207b9b3fb8875a9b524bd44d21b5a4ce3fc3..c892ba2616dda6480de47d2c3767596636267917
--- 1/src/components/context-menu/context-menu.tsx
--- 2/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@@ -8,7 -8,6 +8,7 @@@ import { DefaultTransformOrigin } from 
  export interface ContextMenuAction {
      name: string;
      icon: string;
 +    openCreateDialog?: boolean;
  }
  
  export type ContextMenuActionGroup = ContextMenuAction[];
@@@ -28,7 -27,8 +28,8 @@@ export default class ContextMenu<T> ext
              open={!!anchorEl}
              onClose={onClose}
              transformOrigin={DefaultTransformOrigin}
-             anchorOrigin={DefaultTransformOrigin}>
+             anchorOrigin={DefaultTransformOrigin}
+             onContextMenu={this.handleContextMenu}>
              <List dense>
                  {actions.map((group, groupIndex) =>
                      <React.Fragment key={groupIndex}>
@@@ -49,4 -49,9 +50,9 @@@
              </List>
          </Popover>;
      }
+ 
+     handleContextMenu = (event: React.MouseEvent<HTMLElement>) => {
+         event.preventDefault();
+         this.props.onClose();
+     }
  }