From d07410b78e7379907260a55275329ff1e0e44d64 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Tue, 29 Jun 2021 09:35:48 +0300 Subject: [PATCH] Removing explicit interactive prop Signed-off-by: Alex Andreev --- src/renderer/components/+entity-settings/entity-settings.tsx | 1 - src/renderer/components/hotbar/hotbar-icon.tsx | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx index cb2e37f5ef..ad0713e342 100644 --- a/src/renderer/components/+entity-settings/entity-settings.tsx +++ b/src/renderer/components/+entity-settings/entity-settings.tsx @@ -90,7 +90,6 @@ export class EntitySettings extends React.Component { title={this.entity.metadata.name} source={this.entity.metadata.source} src={this.entity.spec.icon?.src} - interactive={false} />

{this.entity.metadata.name}

diff --git a/src/renderer/components/hotbar/hotbar-icon.tsx b/src/renderer/components/hotbar/hotbar-icon.tsx index 4b28220958..b8447baf80 100644 --- a/src/renderer/components/hotbar/hotbar-icon.tsx +++ b/src/renderer/components/hotbar/hotbar-icon.tsx @@ -45,7 +45,6 @@ export interface HotbarIconProps extends DOMAttributes { disabled?: boolean; size?: number; background?: string; - interactive?: boolean; tooltip?: string; } @@ -66,7 +65,7 @@ function onMenuItemClick(menuItem: CatalogEntityContextMenu) { } } -export const HotbarIcon = observer(({menuItems = [], size = 40, interactive = true, tooltip, ...props}: HotbarIconProps) => { +export const HotbarIcon = observer(({menuItems = [], size = 40, tooltip, ...props}: HotbarIconProps) => { const { uid, title, src, material, active, className, source, disabled, onMenuOpen, onClick, children, ...rest } = props; const id = `hotbarIcon-${uid}`; const [menuOpen, setMenuOpen] = useState(false); @@ -81,7 +80,7 @@ export const HotbarIcon = observer(({menuItems = [], size = 40, interactive = tr {...rest} title={title} colorHash={`${title}-${source}`} - className={cssNames(active ? "active" : "default", { interactive })} + className={cssNames(active ? "active" : "default", { interactive: !!onClick })} width={size} height={size} src={src}