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

Fix catalog entity context menu duplicate entries (#3035)

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2021-06-11 16:06:13 +03:00 committed by GitHub
parent a064d5fbfd
commit e21178ed4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer/components/+catalog/catalog.tsx
View File

@ -79,7 +79,7 @@ export class Catalog extends React.Component<Props> {
async componentDidMount() {
this.contextMenu = {
menuItems: [],
menuItems: observable.array([]),
navigate: (url: string) => navigate(url)
};
this.catalogEntityStore = new CatalogEntityStore();
@ -169,8 +169,14 @@ export class Catalog extends React.Component<Props> {
}
renderItemMenu = (item: CatalogEntityItem) => {
const onOpen = () => {
this.contextMenu.menuItems = [];
item.onContextMenuOpen(this.contextMenu);
};
return (
<MenuActions onOpen={() => item.onContextMenuOpen(this.contextMenu)}>
<MenuActions onOpen={onOpen}>
{
this.contextMenu.menuItems.map((menuItem, index) => (
<MenuItem key={index} onClick={() => this.onMenuItemClick(menuItem)}>

36
src/renderer/components/hotbar/hotbar-entity-icon.tsx
View File

@ -23,7 +23,7 @@ import React, { DOMAttributes } from "react";
import { makeObservable, observable } from "mobx";
import { observer } from "mobx-react";
import type { CatalogEntity, CatalogEntityContextMenuContext } from "../../../common/catalog";
import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../../common/catalog";
import { catalogCategoryRegistry } from "../../api/catalog-category-registry";
import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
import { navigate } from "../../navigation";
@ -101,24 +101,28 @@ export class HotbarEntityIcon extends React.Component<Props> {
active: this.isActive(entity),
disabled: !entity
});
const isPersisted = this.isPersisted(entity);
const onOpen = async () => {
const menuItems: CatalogEntityContextMenu[] = [];
if (!isPersisted) {
menuItems.unshift({
title: "Pin to Hotbar",
onClick: () => add(entity, index)
});
} else {
menuItems.unshift({
title: "Unpin from Hotbar",
onClick: () => remove(entity.metadata.uid)
});
}
this.contextMenu.menuItems = menuItems;
await entity.onContextMenuOpen(this.contextMenu);
};
const isActive = this.isActive(entity);
const isPersisted = this.isPersisted(entity);
const menuItems = this.contextMenu?.menuItems ?? [];
if (!isPersisted) {
menuItems.unshift({
title: "Pin to Hotbar",
onClick: () => add(entity, index)
});
} else {
menuItems.unshift({
title: "Unpin from Hotbar",
onClick: () => remove(entity.metadata.uid)
});
}
return (
<HotbarIcon
@ -128,7 +132,7 @@ export class HotbarEntityIcon extends React.Component<Props> {
className={className}
active={isActive}
onMenuOpen={onOpen}
menuItems={menuItems}
menuItems={this.contextMenu.menuItems}
{...elemProps}
>
{ this.ledIcon }