X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1a9eb2261e6030ba78078e2a206bad27653f2475..e3493974f91d07723008cdb8c7466a5ff8407cb5:/src/components/dropdown-menu/dropdown-menu.tsx diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx index 4f2b83af..98c29c64 100644 --- a/src/components/dropdown-menu/dropdown-menu.tsx +++ b/src/components/dropdown-menu/dropdown-menu.tsx @@ -3,13 +3,13 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Menu, IconButton } from '@material-ui/core'; +import Menu from '@material-ui/core/Menu'; +import IconButton from '@material-ui/core/IconButton'; import { PopoverOrigin } from '@material-ui/core/Popover'; - interface DropdownMenuProps { id: string; - icon: React.ComponentType; + icon: React.ReactElement; } class DropdownMenu extends React.Component { @@ -24,7 +24,7 @@ class DropdownMenu extends React.Component { }; render() { - const { icon: Icon, id, children } = this.props; + const { icon, id, children } = this.props; const { anchorEl } = this.state; return (
@@ -32,10 +32,8 @@ class DropdownMenu extends React.Component { aria-owns={anchorEl ? id : undefined} aria-haspopup="true" color="inherit" - onClick={this.handleOpen} - - > - + onClick={this.handleOpen}> + {icon} { onClose={this.handleClose} onClick={this.handleClose} anchorOrigin={this.transformOrigin} - transformOrigin={this.transformOrigin} - > + transformOrigin={this.transformOrigin}> {children}