From e5293fdd1a790cb41c29f30086e5cffada776305 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:09:10 +1000
Subject: [PATCH] fix(ui): match new default controlnet behaviour

---
 .../web/src/features/imageActions/actions.ts     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/invokeai/frontend/web/src/features/imageActions/actions.ts b/invokeai/frontend/web/src/features/imageActions/actions.ts
index 1de69bdc8d..d1b2400501 100644
--- a/invokeai/frontend/web/src/features/imageActions/actions.ts
+++ b/invokeai/frontend/web/src/features/imageActions/actions.ts
@@ -1,5 +1,6 @@
 import type { AppDispatch, RootState } from 'app/store/store';
-import { selectDefaultControlAdapter, selectDefaultIPAdapter } from 'features/controlLayers/hooks/addLayerHooks';
+import { deepClone } from 'common/util/deepClone';
+import { selectDefaultIPAdapter } from 'features/controlLayers/hooks/addLayerHooks';
 import { CanvasEntityAdapterBase } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterBase';
 import { getPrefixedId } from 'features/controlLayers/konva/util';
 import { canvasReset } from 'features/controlLayers/store/actions';
@@ -24,7 +25,7 @@ import type {
   CanvasRegionalGuidanceState,
   CanvasRenderableEntityIdentifier,
 } from 'features/controlLayers/store/types';
-import { imageDTOToImageObject, imageDTOToImageWithDims } from 'features/controlLayers/store/util';
+import { imageDTOToImageObject, imageDTOToImageWithDims, initialControlNet } from 'features/controlLayers/store/util';
 import { calculateNewSize } from 'features/controlLayers/util/getScaledBoundingBoxDimensions';
 import { imageToCompareChanged, selectionChanged } from 'features/gallery/store/gallerySlice';
 import type { BoardId } from 'features/gallery/store/types';
@@ -95,8 +96,12 @@ export const createNewCanvasEntityFromImage = (arg: {
       break;
     }
     case 'control_layer': {
-      const controlAdapter = selectDefaultControlAdapter(state);
-      dispatch(controlLayerAdded({ overrides: { ...overrides, controlAdapter }, isSelected: true }));
+      dispatch(
+        controlLayerAdded({
+          overrides: { ...overrides, controlAdapter: deepClone(initialControlNet) },
+          isSelected: true,
+        })
+      );
       break;
     }
     case 'inpaint_mask': {
@@ -179,12 +184,11 @@ export const newCanvasFromImage = (arg: {
       break;
     }
     case 'control_layer': {
-      const controlAdapter = selectDefaultControlAdapter(state);
       const overrides = {
         id: getPrefixedId('control_layer'),
         objects: [imageObject],
         position: { x, y },
-        controlAdapter,
+        controlAdapter: deepClone(initialControlNet),
       } satisfies Partial<CanvasControlLayerState>;
       addInitCallback(overrides.id);
       dispatch(canvasReset());