Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useAppSelector } from 'app/store/storeHooks';
import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
import { useInvertMask } from 'features/controlLayers/hooks/useInvertMask';
import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
import { isInpaintMaskEntityIdentifier } from 'features/controlLayers/store/types';
import { isMaskEntityIdentifier } from 'features/controlLayers/store/types';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
import { PiSelectionInverseBold } from 'react-icons/pi';
Expand All @@ -18,19 +18,24 @@ export const EntityListSelectedEntityActionBarInvertMaskButton = memo(() => {
return null;
}

if (!isInpaintMaskEntityIdentifier(selectedEntityIdentifier)) {
if (!isMaskEntityIdentifier(selectedEntityIdentifier)) {
return null;
}

const label =
selectedEntityIdentifier.type === 'regional_guidance'
? t('controlLayers.invertRegion', { defaultValue: 'Invert Region' })
: t('controlLayers.invertMask');

return (
<IconButton
onClick={invertMask}
isDisabled={isBusy}
minW={8}
variant="link"
alignSelf="stretch"
aria-label={t('controlLayers.invertMask')}
tooltip={t('controlLayers.invertMask')}
aria-label={label}
tooltip={label}
icon={<PiSelectionInverseBold />}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
import { useInvertMask } from 'features/controlLayers/hooks/useInvertMask';
import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
import { isInpaintMaskEntityIdentifier } from 'features/controlLayers/store/types';
import { isMaskEntityIdentifier } from 'features/controlLayers/store/types';
import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
import { useMemo } from 'react';

Expand All @@ -17,7 +17,7 @@ export const useCanvasInvertMaskHotkey = () => {
if (!selectedEntityIdentifier) {
return false;
}
if (!isInpaintMaskEntityIdentifier(selectedEntityIdentifier)) {
if (!isMaskEntityIdentifier(selectedEntityIdentifier)) {
return false;
}
if (isBusy) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerP
import { canvasToBlob, canvasToImageData } from 'features/controlLayers/konva/util';
import { entityRasterized } from 'features/controlLayers/store/canvasSlice';
import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
import { isMaskEntityIdentifier } from 'features/controlLayers/store/types';
import { imageDTOToImageObject } from 'features/controlLayers/store/util';
import { toast } from 'features/toast/toast';
import { useCallback } from 'react';
Expand All @@ -17,9 +18,14 @@ export const useInvertMask = () => {

const invertMask = useCallback(async () => {
try {
if (!selectedEntityIdentifier || !isMaskEntityIdentifier(selectedEntityIdentifier)) {
return;
}

const bboxRect = canvasManager.stateApi.getBbox().rect;
const maskType = selectedEntityIdentifier.type;

const adapters = canvasManager.compositor.getVisibleAdaptersOfType('inpaint_mask');
const adapters = canvasManager.compositor.getVisibleAdaptersOfType(maskType);

if (adapters.length === 0) {
toast({
Expand All @@ -43,7 +49,7 @@ export const useInvertMask = () => {
fullCtx.fillStyle = 'rgba(0, 0, 0, 0)';
fullCtx.fillRect(0, 0, bboxRect.width, bboxRect.height);

const visibleMasksRect = canvasManager.compositor.getVisibleRectOfType('inpaint_mask');
const visibleMasksRect = canvasManager.compositor.getVisibleRectOfType(maskType);

if (visibleMasksRect.width > 0 && visibleMasksRect.height > 0) {
const compositeCanvas = canvasManager.compositor.getCompositeCanvas(adapters, visibleMasksRect);
Expand Down