Merge branch 'master'

[arvados-workbench2.git] / src / components / context-menu / context-menu.tsx

diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx
index a7b83bcfacc1710174fb2fabbfcebe5069ca7588..2103a2a09c1211b1123ee8d93088fae8516cb9af 100644 (file)
--- a/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@ -4,11 +4,11 @@
 import * as React from "react";
 import { Popover, List, ListItem, ListItemIcon, ListItemText, Divider } from "@material-ui/core";
 import { DefaultTransformOrigin } from "../popover/helpers";
-import IconBase, { IconTypes } from "../icon/icon";
+import { IconType } from "../icon/icon";
 
 export interface ContextMenuItem {
     name: string;
-    icon: IconTypes;
+    icon: IconType;
 }
 
 export type ContextMenuItemGroup = ContextMenuItem[];
@@ -20,9 +20,9 @@ export interface ContextMenuProps {
     onClose: () => void;
 }
 
-export default class ContextMenu extends React.PureComponent<ContextMenuProps> {
+export class ContextMenu extends React.PureComponent<ContextMenuProps> {
     render() {
-        const { anchorEl, items, onClose, onItemClick } = this.props;
+        const { anchorEl, items, onClose, onItemClick} = this.props;
         return <Popover
             anchorEl={anchorEl}
             open={!!anchorEl}
@@ -39,7 +39,7 @@ export default class ContextMenu extends React.PureComponent<ContextMenuProps> {
                                 key={actionIndex}
                                 onClick={() => onItemClick(item)}>
                                 <ListItemIcon>
-                                    <IconBase icon={item.icon} />
+                                    <item.icon/>
                                 </ListItemIcon>
                                 <ListItemText>
                                     {item.name}