Skip to content

Commit 5e3dce1

Browse files
fix(ui): do not disable image context canvas actions based on selected base model
These actions should be accessible at any time.
1 parent cac974d commit 5e3dce1

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

Diff for: invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewCanvasFromImageSubMenu.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Menu, MenuButton, MenuItem, MenuList } from '@invoke-ai/ui-library';
22
import { useAppStore } from 'app/store/nanostores/store';
33
import { SubMenuButtonContent, useSubMenu } from 'common/hooks/useSubMenu';
44
import { useCanvasIsBusySafe } from 'features/controlLayers/hooks/useCanvasIsBusy';
5-
import { useIsEntityTypeEnabled } from 'features/controlLayers/hooks/useIsEntityTypeEnabled';
65
import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
76
import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
87
import { newCanvasFromImage } from 'features/imageActions/actions';
@@ -19,7 +18,6 @@ export const ImageMenuItemNewCanvasFromImageSubMenu = memo(() => {
1918
const imageDTO = useImageDTOContext();
2019
const imageViewer = useImageViewer();
2120
const isBusy = useCanvasIsBusySafe();
22-
const isControlLayerEnabled = useIsEntityTypeEnabled('control_layer');
2321

2422
const onClickNewCanvasWithRasterLayerFromImage = useCallback(() => {
2523
const { dispatch, getState } = store;
@@ -89,14 +87,14 @@ export const ImageMenuItemNewCanvasFromImageSubMenu = memo(() => {
8987
<MenuItem
9088
icon={<PiFileBold />}
9189
onClickCapture={onClickNewCanvasWithControlLayerFromImage}
92-
isDisabled={isBusy || !isControlLayerEnabled}
90+
isDisabled={isBusy}
9391
>
9492
{t('controlLayers.asControlLayer')}
9593
</MenuItem>
9694
<MenuItem
9795
icon={<PiFileBold />}
9896
onClickCapture={onClickNewCanvasWithControlLayerFromImageWithResize}
99-
isDisabled={isBusy || !isControlLayerEnabled}
97+
isDisabled={isBusy}
10098
>
10199
{t('controlLayers.asControlLayerResize')}
102100
</MenuItem>

Diff for: invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewLayerFromImageSubMenu.tsx

+4-16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useAppStore } from 'app/store/nanostores/store';
33
import { SubMenuButtonContent, useSubMenu } from 'common/hooks/useSubMenu';
44
import { NewLayerIcon } from 'features/controlLayers/components/common/icons';
55
import { useCanvasIsBusySafe } from 'features/controlLayers/hooks/useCanvasIsBusy';
6-
import { useIsEntityTypeEnabled } from 'features/controlLayers/hooks/useIsEntityTypeEnabled';
76
import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
87
import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
98
import { sentImageToCanvas } from 'features/gallery/store/actions';
@@ -21,9 +20,6 @@ export const ImageMenuItemNewLayerFromImageSubMenu = memo(() => {
2120
const imageDTO = useImageDTOContext();
2221
const imageViewer = useImageViewer();
2322
const isBusy = useCanvasIsBusySafe();
24-
const isReferenceImageEnabled = useIsEntityTypeEnabled('reference_image');
25-
const isRegionalGuidanceEnabled = useIsEntityTypeEnabled('regional_guidance');
26-
const isControlLayerEnabled = useIsEntityTypeEnabled('control_layer');
2723

2824
const onClickNewRasterLayerFromImage = useCallback(() => {
2925
const { dispatch, getState } = store;
@@ -113,18 +109,10 @@ export const ImageMenuItemNewLayerFromImageSubMenu = memo(() => {
113109
<MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewInpaintMaskFromImage} isDisabled={isBusy}>
114110
{t('controlLayers.inpaintMask')}
115111
</MenuItem>
116-
<MenuItem
117-
icon={<NewLayerIcon />}
118-
onClickCapture={onClickNewRegionalGuidanceFromImage}
119-
isDisabled={isBusy || !isRegionalGuidanceEnabled}
120-
>
112+
<MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewRegionalGuidanceFromImage} isDisabled={isBusy}>
121113
{t('controlLayers.regionalGuidance')}
122114
</MenuItem>
123-
<MenuItem
124-
icon={<NewLayerIcon />}
125-
onClickCapture={onClickNewControlLayerFromImage}
126-
isDisabled={isBusy || !isControlLayerEnabled}
127-
>
115+
<MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewControlLayerFromImage} isDisabled={isBusy}>
128116
{t('controlLayers.controlLayer')}
129117
</MenuItem>
130118
<MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewRasterLayerFromImage} isDisabled={isBusy}>
@@ -133,14 +121,14 @@ export const ImageMenuItemNewLayerFromImageSubMenu = memo(() => {
133121
<MenuItem
134122
icon={<NewLayerIcon />}
135123
onClickCapture={onClickNewRegionalReferenceImageFromImage}
136-
isDisabled={isBusy || !isRegionalGuidanceEnabled}
124+
isDisabled={isBusy}
137125
>
138126
{t('controlLayers.referenceImageRegional')}
139127
</MenuItem>
140128
<MenuItem
141129
icon={<NewLayerIcon />}
142130
onClickCapture={onClickNewGlobalReferenceImageFromImage}
143-
isDisabled={isBusy || !isReferenceImageEnabled}
131+
isDisabled={isBusy}
144132
>
145133
{t('controlLayers.referenceImageGlobal')}
146134
</MenuItem>

0 commit comments

Comments
 (0)