hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131 from lensapp/fix/kube-object-menu-classname

Browse Source 
Fix MenuActions classname
This commit is contained in:
Jari Kolehmainen 2020-03-17 08:28:59 +02:00 committed by GitHub
commit 87068540ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dashboard/client/components/menu/menu-actions.tsx
View File

@ -40,9 +40,8 @@ export class MenuActions extends React.Component<MenuActionsProps> {
@autobind() @autobind()
remove() { remove() {
const { removeAction} = this.props; const { removeAction } = this.props;
let { removeConfirmationMessage } = this.props; let { removeConfirmationMessage } = this.props;
if (typeof removeConfirmationMessage === "function") { if (typeof removeConfirmationMessage === "function") {
removeConfirmationMessage = removeConfirmationMessage(); removeConfirmationMessage = removeConfirmationMessage();
} }
@ -56,8 +55,9 @@ export class MenuActions extends React.Component<MenuActionsProps> {
renderTriggerIcon() { renderTriggerIcon() {
if (this.props.toolbar) return; if (this.props.toolbar) return;
const { triggerIcon = "more_vert" } = this.props; const { triggerIcon = "more_vert" } = this.props;
let className: string;
if (isValidElement<HTMLElement>(triggerIcon)) { if (isValidElement<HTMLElement>(triggerIcon)) {
const className = cssNames(triggerIcon.props.className, { active: this.isOpen }); className = cssNames(triggerIcon.props.className, { active: this.isOpen });
return React.cloneElement(triggerIcon, { id: this.id, className } as any); return React.cloneElement(triggerIcon, { id: this.id, className } as any);
} }
const iconProps: Partial<IconProps> = { const iconProps: Partial<IconProps> = {
@ -77,11 +77,10 @@ export class MenuActions extends React.Component<MenuActionsProps> {
render() { render() {
const { const {
toolbar, children, updateAction, removeAction, triggerIcon, removeConfirmationMessage, className, toolbar, children, updateAction, removeAction, triggerIcon, removeConfirmationMessage,
...menuProps ...menuProps
} = this.props; } = this.props;
let { className } = this.props; const menuClassName = cssNames("MenuActions flex", className, {
className = cssNames("MenuActions flex", className, {
toolbar: toolbar, toolbar: toolbar,
gaps: toolbar, // add spacing for .flex gaps: toolbar, // add spacing for .flex
}); });
@ -92,7 +91,7 @@ export class MenuActions extends React.Component<MenuActionsProps> {
<Menu <Menu
htmlFor={this.id} htmlFor={this.id}
isOpen={this.isOpen} open={this.toggle} close={this.toggle} isOpen={this.isOpen} open={this.toggle} close={this.toggle}
className={className} className={menuClassName}
usePortal={autoClose} usePortal={autoClose}
closeOnScroll={autoClose} closeOnScroll={autoClose}
closeOnClickItem={autoClose} closeOnClickItem={autoClose}