projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change chip styles
[arvados-workbench2.git]
/
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 4f2b83af6591e6ab9d72d1e0d83914ff55bd4414..73b279b25e44886f2cb1639c425c55305e622fd3 100644
(file)
--- a/
src/components/dropdown-menu/dropdown-menu.tsx
+++ b/
src/components/dropdown-menu/dropdown-menu.tsx
@@
-3,17
+3,20
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
// 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';
import { PopoverOrigin } from '@material-ui/core/Popover';
-
interface DropdownMenuProps {
id: string;
interface DropdownMenuProps {
id: string;
- icon: React.
ComponentType
;
+ icon: React.
ReactElement<any>
;
}
}
-class DropdownMenu extends React.Component<DropdownMenuProps> {
+interface DropdownMenuState {
+ anchorEl: any;
+}
+export class DropdownMenu extends React.Component<DropdownMenuProps, DropdownMenuState> {
state = {
anchorEl: undefined
};
state = {
anchorEl: undefined
};
@@
-24,7
+27,7
@@
class DropdownMenu extends React.Component<DropdownMenuProps> {
};
render() {
};
render() {
- const { icon
: Icon
, id, children } = this.props;
+ const { icon, id, children } = this.props;
const { anchorEl } = this.state;
return (
<div>
const { anchorEl } = this.state;
return (
<div>
@@
-32,10
+35,8
@@
class DropdownMenu extends React.Component<DropdownMenuProps> {
aria-owns={anchorEl ? id : undefined}
aria-haspopup="true"
color="inherit"
aria-owns={anchorEl ? id : undefined}
aria-haspopup="true"
color="inherit"
- onClick={this.handleOpen}
-
- >
- <Icon />
+ onClick={this.handleOpen}>
+ {icon}
</IconButton>
<Menu
id={id}
</IconButton>
<Menu
id={id}
@@
-44,8
+45,7
@@
class DropdownMenu extends React.Component<DropdownMenuProps> {
onClose={this.handleClose}
onClick={this.handleClose}
anchorOrigin={this.transformOrigin}
onClose={this.handleClose}
onClick={this.handleClose}
anchorOrigin={this.transformOrigin}
- transformOrigin={this.transformOrigin}
- >
+ transformOrigin={this.transformOrigin}>
{children}
</Menu>
</div>
{children}
</Menu>
</div>
@@
-60,6
+60,3
@@
class DropdownMenu extends React.Component<DropdownMenuProps> {
this.setState({ anchorEl: event.currentTarget });
}
}
this.setState({ anchorEl: event.currentTarget });
}
}
-
-
-export default DropdownMenu;