Skip to content

Commit e5293fd

Browse files
fix(ui): match new default controlnet behaviour
1 parent 8883775 commit e5293fd

File tree

1 file changed

+10
-6
lines changed
  • invokeai/frontend/web/src/features/imageActions

1 file changed

+10
-6
lines changed

invokeai/frontend/web/src/features/imageActions/actions.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { AppDispatch, RootState } from 'app/store/store';
2-
import { selectDefaultControlAdapter, selectDefaultIPAdapter } from 'features/controlLayers/hooks/addLayerHooks';
2+
import { deepClone } from 'common/util/deepClone';
3+
import { selectDefaultIPAdapter } from 'features/controlLayers/hooks/addLayerHooks';
34
import { CanvasEntityAdapterBase } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterBase';
45
import { getPrefixedId } from 'features/controlLayers/konva/util';
56
import { canvasReset } from 'features/controlLayers/store/actions';
@@ -24,7 +25,7 @@ import type {
2425
CanvasRegionalGuidanceState,
2526
CanvasRenderableEntityIdentifier,
2627
} from 'features/controlLayers/store/types';
27-
import { imageDTOToImageObject, imageDTOToImageWithDims } from 'features/controlLayers/store/util';
28+
import { imageDTOToImageObject, imageDTOToImageWithDims, initialControlNet } from 'features/controlLayers/store/util';
2829
import { calculateNewSize } from 'features/controlLayers/util/getScaledBoundingBoxDimensions';
2930
import { imageToCompareChanged, selectionChanged } from 'features/gallery/store/gallerySlice';
3031
import type { BoardId } from 'features/gallery/store/types';
@@ -95,8 +96,12 @@ export const createNewCanvasEntityFromImage = (arg: {
9596
break;
9697
}
9798
case 'control_layer': {
98-
const controlAdapter = selectDefaultControlAdapter(state);
99-
dispatch(controlLayerAdded({ overrides: { ...overrides, controlAdapter }, isSelected: true }));
99+
dispatch(
100+
controlLayerAdded({
101+
overrides: { ...overrides, controlAdapter: deepClone(initialControlNet) },
102+
isSelected: true,
103+
})
104+
);
100105
break;
101106
}
102107
case 'inpaint_mask': {
@@ -179,12 +184,11 @@ export const newCanvasFromImage = (arg: {
179184
break;
180185
}
181186
case 'control_layer': {
182-
const controlAdapter = selectDefaultControlAdapter(state);
183187
const overrides = {
184188
id: getPrefixedId('control_layer'),
185189
objects: [imageObject],
186190
position: { x, y },
187-
controlAdapter,
191+
controlAdapter: deepClone(initialControlNet),
188192
} satisfies Partial<CanvasControlLayerState>;
189193
addInitCallback(overrides.id);
190194
dispatch(canvasReset());

0 commit comments

Comments
 (0)