revert(ui): drop targets for inpaint mask and rg

Author: psychedelicious

invokeai/frontend/web/src/features/controlLayers/components/CanvasDropArea.tsx

@@ -3,9 +3,7 @@ import IAIDroppable from 'common/components/IAIDroppable';
 import type {
   AddControlLayerFromImageDropData,
   AddGlobalReferenceImageFromImageDropData,
-  AddInpaintMaskFromImageDropData,
   AddRasterLayerFromImageDropData,
-  AddRegionalGuidanceFromImageDropData,
   AddRegionalReferenceImageFromImageDropData,
 } from 'features/dnd/types';
 import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
@@ -22,16 +20,6 @@ const addControlLayerFromImageDropData: AddControlLayerFromImageDropData = {
   actionType: 'ADD_CONTROL_LAYER_FROM_IMAGE',
 };
 
-const addInpaintMaskFromImageDropData: AddInpaintMaskFromImageDropData = {
-  id: 'add-inpaint-mask-from-image-drop-data',
-  actionType: 'ADD_INPAINT_MASK_FROM_IMAGE',
-};
-
-const addRegionalGuidanceFromImageDropData: AddRegionalGuidanceFromImageDropData = {
-  id: 'add-regional-guidance-from-image-drop-data',
-  actionType: 'ADD_REGIONAL_GUIDANCE_FROM_IMAGE',
-};
-
 const addRegionalReferenceImageFromImageDropData: AddRegionalReferenceImageFromImageDropData = {
   id: 'add-control-layer-from-image-drop-data',
   actionType: 'ADD_REGIONAL_REFERENCE_IMAGE_FROM_IMAGE',
@@ -87,19 +75,6 @@ export const CanvasDropArea = memo(() => {
             data={addGlobalReferenceImageFromImageDropData}
           />
         </GridItem>
-
-        <GridItem position="relative">
-          <IAIDroppable
-            dropLabel={t('controlLayers.canvasContextMenu.newInpaintMask')}
-            data={addInpaintMaskFromImageDropData}
-          />
-        </GridItem>
-        <GridItem position="relative">
-          <IAIDroppable
-            dropLabel={t('controlLayers.canvasContextMenu.newRegionalGuidance')}
-            data={addRegionalGuidanceFromImageDropData}
-          />
-        </GridItem>
       </Grid>
     </>
   );

invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx

@@ -1,5 +1,4 @@
 import { Spacer } from '@invoke-ai/ui-library';
-import IAIDroppable from 'common/components/IAIDroppable';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
 import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
@@ -8,21 +7,14 @@ import { CanvasEntityEditableTitle } from 'features/controlLayers/components/com
 import { InpaintMaskAdapterGate } from 'features/controlLayers/contexts/EntityAdapterContext';
 import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
-import type { ReplaceLayerImageDropData } from 'features/dnd/types';
 import { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type Props = {
   id: string;
 };
 
 export const InpaintMask = memo(({ id }: Props) => {
-  const { t } = useTranslation();
   const entityIdentifier = useMemo<CanvasEntityIdentifier<'inpaint_mask'>>(() => ({ id, type: 'inpaint_mask' }), [id]);
-  const dropData = useMemo<ReplaceLayerImageDropData>(
-    () => ({ id, actionType: 'REPLACE_LAYER_WITH_IMAGE', context: { entityIdentifier } }),
-    [id, entityIdentifier]
-  );
 
   return (
     <EntityIdentifierContext.Provider value={entityIdentifier}>
@@ -34,7 +26,6 @@ export const InpaintMask = memo(({ id }: Props) => {
             <Spacer />
             <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
-          <IAIDroppable data={dropData} dropLabel={t('controlLayers.replaceLayer')} />
         </CanvasEntityContainer>
       </InpaintMaskAdapterGate>
     </EntityIdentifierContext.Provider>

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidance.tsx

@@ -1,5 +1,4 @@
 import { Spacer } from '@invoke-ai/ui-library';
-import IAIDroppable from 'common/components/IAIDroppable';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
 import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
@@ -10,24 +9,17 @@ import { RegionalGuidanceSettings } from 'features/controlLayers/components/Regi
 import { RegionalGuidanceAdapterGate } from 'features/controlLayers/contexts/EntityAdapterContext';
 import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
-import type { ReplaceLayerImageDropData } from 'features/dnd/types';
 import { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 type Props = {
   id: string;
 };
 
 export const RegionalGuidance = memo(({ id }: Props) => {
-  const { t } = useTranslation();
   const entityIdentifier = useMemo<CanvasEntityIdentifier<'regional_guidance'>>(
     () => ({ id, type: 'regional_guidance' }),
     [id]
   );
-  const dropData = useMemo<ReplaceLayerImageDropData>(
-    () => ({ id, actionType: 'REPLACE_LAYER_WITH_IMAGE', context: { entityIdentifier } }),
-    [id, entityIdentifier]
-  );
 
   return (
     <EntityIdentifierContext.Provider value={entityIdentifier}>
@@ -41,7 +33,6 @@ export const RegionalGuidance = memo(({ id }: Props) => {
             <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
           <RegionalGuidanceSettings />
-          <IAIDroppable data={dropData} dropLabel={t('controlLayers.replaceLayer')} />
         </CanvasEntityContainer>
       </RegionalGuidanceAdapterGate>
     </EntityIdentifierContext.Provider>

invokeai/frontend/web/src/features/dnd/types/index.ts

@@ -42,11 +42,11 @@ export type AddControlLayerFromImageDropData = BaseDropData & {
   actionType: 'ADD_CONTROL_LAYER_FROM_IMAGE';
 };
 
-export type AddInpaintMaskFromImageDropData = BaseDropData & {
+type AddInpaintMaskFromImageDropData = BaseDropData & {
   actionType: 'ADD_INPAINT_MASK_FROM_IMAGE';
 };
 
-export type AddRegionalGuidanceFromImageDropData = BaseDropData & {
+type AddRegionalGuidanceFromImageDropData = BaseDropData & {
   actionType: 'ADD_REGIONAL_GUIDANCE_FROM_IMAGE';
 };