github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): use non-icon version of delete menu item on canvas context menu

Browse Source
This commit is contained in:
psychedelicious
2024-10-11 08:17:11 +10:00
committed by Kent Keirsey
parent 4aa20a95b2
commit 3f6acdc2d3
6 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerMenuItems.tsx
View File

@@ -18,7 +18,7 @@ export const ControlLayerMenuItems = memo(() => {
<IconMenuItemGroup>
<CanvasEntityMenuItemsArrange />
<CanvasEntityMenuItemsDuplicate />
<CanvasEntityMenuItemsDelete />
<CanvasEntityMenuItemsDelete asIcon />
</IconMenuItemGroup>
<MenuDivider />
<CanvasEntityMenuItemsTransform />

2
invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterMenuItems.tsx
View File

@@ -9,7 +9,7 @@ export const IPAdapterMenuItems = memo(() => {
<IconMenuItemGroup>
<CanvasEntityMenuItemsArrange />
<CanvasEntityMenuItemsDuplicate />
<CanvasEntityMenuItemsDelete />
<CanvasEntityMenuItemsDelete asIcon />
</IconMenuItemGroup>
);
});

2
invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx
View File

@@ -13,7 +13,7 @@ export const InpaintMaskMenuItems = memo(() => {
<IconMenuItemGroup>
<CanvasEntityMenuItemsArrange />
<CanvasEntityMenuItemsDuplicate />
<CanvasEntityMenuItemsDelete />
<CanvasEntityMenuItemsDelete asIcon />
</IconMenuItemGroup>
<MenuDivider />
<CanvasEntityMenuItemsTransform />

2
invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerMenuItems.tsx
View File

@@ -17,7 +17,7 @@ export const RasterLayerMenuItems = memo(() => {
<IconMenuItemGroup>
<CanvasEntityMenuItemsArrange />
<CanvasEntityMenuItemsDuplicate />
<CanvasEntityMenuItemsDelete />
<CanvasEntityMenuItemsDelete asIcon />
</IconMenuItemGroup>
<MenuDivider />
<CanvasEntityMenuItemsTransform />

2
invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx
View File

@@ -14,7 +14,7 @@ export const RegionalGuidanceMenuItems = memo(() => {
<Flex gap={2}>
<CanvasEntityMenuItemsArrange />
<CanvasEntityMenuItemsDuplicate />
<CanvasEntityMenuItemsDelete />
<CanvasEntityMenuItemsDelete asIcon />
</Flex>
<MenuDivider />
<RegionalGuidanceMenuItemsAddPromptsAndIPAdapter />

31
invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityMenuItemsDelete.tsx
View File

@@ -1,3 +1,4 @@
import { MenuItem } from '@invoke-ai/ui-library';
import { useAppDispatch } from 'app/store/storeHooks';
import { IconMenuItem } from 'common/components/IconMenuItem';
import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
@@ -7,7 +8,11 @@ import { memo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { PiTrashSimpleBold } from 'react-icons/pi';
export const CanvasEntityMenuItemsDelete = memo(() => {
type Props = {
asIcon?: boolean;
};
export const CanvasEntityMenuItemsDelete = memo(({ asIcon = false }: Props) => {
const { t } = useTranslation();
const dispatch = useAppDispatch();
const entityIdentifier = useEntityIdentifierContext();
@@ -17,15 +22,23 @@ export const CanvasEntityMenuItemsDelete = memo(() => {
dispatch(entityDeleted({ entityIdentifier }));
}, [dispatch, entityIdentifier]);
if (asIcon) {
return (
<IconMenuItem
aria-label={t('common.delete')}
tooltip={t('common.delete')}
onClick={deleteEntity}
icon={<PiTrashSimpleBold />}
isDestructive
isDisabled={!isInteractable}
/>
);
}
return (
<IconMenuItem
aria-label={t('common.delete')}
tooltip={t('common.delete')}
onClick={deleteEntity}
icon={<PiTrashSimpleBold />}
isDestructive
isDisabled={!isInteractable}
/>
<MenuItem onClick={deleteEntity} icon={<PiTrashSimpleBold />} isDestructive isDisabled={!isInteractable}>
{t('common.delete')}
</MenuItem>
);
});