diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/promptChanged.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/promptChanged.ts
index b78ddc3f69..93926f4b08 100644
--- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/promptChanged.ts
+++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/promptChanged.ts
@@ -10,11 +10,17 @@ import {
promptsChanged,
} from 'features/dynamicPrompts/store/dynamicPromptsSlice';
import { getShouldProcessPrompt } from 'features/dynamicPrompts/util/getShouldProcessPrompt';
-import { setPositivePrompt } from 'features/parameters/store/generationSlice';
+import { positivePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
import { utilitiesApi } from 'services/api/endpoints/utilities';
import { socketConnected } from 'services/events/actions';
-const matcher = isAnyOf(setPositivePrompt, combinatorialToggled, maxPromptsChanged, maxPromptsReset, socketConnected);
+const matcher = isAnyOf(
+ positivePromptChanged,
+ combinatorialToggled,
+ maxPromptsChanged,
+ maxPromptsReset,
+ socketConnected
+);
export const addDynamicPromptsListener = (startAppListening: AppStartListening) => {
startAppListening({
@@ -22,7 +28,7 @@ export const addDynamicPromptsListener = (startAppListening: AppStartListening)
effect: async (action, { dispatch, getState, cancelActiveListeners, delay }) => {
cancelActiveListeners();
const state = getState();
- const { positivePrompt } = state.generation;
+ const { positivePrompt } = state.regionalPrompts.present.baseLayer;
const { maxPrompts } = state.dynamicPrompts;
if (state.config.disabledFeatures.includes('dynamicPrompting')) {
@@ -32,7 +38,7 @@ export const addDynamicPromptsListener = (startAppListening: AppStartListening)
const cachedPrompts = utilitiesApi.endpoints.dynamicPrompts.select({
prompt: positivePrompt,
max_prompts: maxPrompts,
- })(getState()).data;
+ })(state).data;
if (cachedPrompts) {
dispatch(promptsChanged(cachedPrompts.prompts));
@@ -40,8 +46,8 @@ export const addDynamicPromptsListener = (startAppListening: AppStartListening)
return;
}
- if (!getShouldProcessPrompt(state.generation.positivePrompt)) {
- dispatch(promptsChanged([state.generation.positivePrompt]));
+ if (!getShouldProcessPrompt(positivePrompt)) {
+ dispatch(promptsChanged([positivePrompt]));
dispatch(parsingErrorChanged(undefined));
dispatch(isErrorChanged(false));
return;
diff --git a/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts b/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts
index b31efed970..fa4c1aaf45 100644
--- a/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts
+++ b/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts
@@ -10,6 +10,7 @@ import { getShouldProcessPrompt } from 'features/dynamicPrompts/util/getShouldPr
import { selectNodesSlice } from 'features/nodes/store/nodesSlice';
import { isInvocationNode } from 'features/nodes/types/invocation';
import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
+import { selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
import { selectSystemSlice } from 'features/system/store/systemSlice';
import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
import i18n from 'i18next';
@@ -23,10 +24,12 @@ const selector = createMemoizedSelector(
selectSystemSlice,
selectNodesSlice,
selectDynamicPromptsSlice,
+ selectRegionalPromptsSlice,
activeTabNameSelector,
],
- (controlAdapters, generation, system, nodes, dynamicPrompts, activeTabName) => {
- const { initialImage, model, positivePrompt } = generation;
+ (controlAdapters, generation, system, nodes, dynamicPrompts, regionalPrompts, activeTabName) => {
+ const { initialImage, model } = generation;
+ const { positivePrompt } = regionalPrompts.present.baseLayer;
const { isConnected } = system;
diff --git a/invokeai/frontend/web/src/features/metadata/util/recallers.ts b/invokeai/frontend/web/src/features/metadata/util/recallers.ts
index 4f332e23a9..192077b2ed 100644
--- a/invokeai/frontend/web/src/features/metadata/util/recallers.ts
+++ b/invokeai/frontend/web/src/features/metadata/util/recallers.ts
@@ -21,8 +21,6 @@ import {
setCfgRescaleMultiplier,
setCfgScale,
setImg2imgStrength,
- setNegativePrompt,
- setPositivePrompt,
setScheduler,
setSeed,
setSteps,
@@ -51,6 +49,7 @@ import type {
ParameterVAEModel,
ParameterWidth,
} from 'features/parameters/types/parameterSchemas';
+import { negativePromptChanged, positivePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
import {
refinerModelChanged,
setNegativeStylePromptSDXL,
@@ -65,11 +64,11 @@ import {
import type { ImageDTO } from 'services/api/types';
const recallPositivePrompt: MetadataRecallFunc<ParameterPositivePrompt> = (positivePrompt) => {
- getStore().dispatch(setPositivePrompt(positivePrompt));
+ getStore().dispatch(positivePromptChanged(positivePrompt));
};
const recallNegativePrompt: MetadataRecallFunc<ParameterNegativePrompt> = (negativePrompt) => {
- getStore().dispatch(setNegativePrompt(negativePrompt));
+ getStore().dispatch(negativePromptChanged(negativePrompt));
};
const recallSDXLPositiveStylePrompt: MetadataRecallFunc<ParameterPositiveStylePromptSDXL> = (positiveStylePrompt) => {
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasImageToImageGraph.ts
index 16c42cd111..e0844057ba 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasImageToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasImageToImageGraph.ts
@@ -42,8 +42,6 @@ export const buildCanvasImageToImageGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -57,6 +55,7 @@ export const buildCanvasImageToImageGraph = async (
seamlessXAxis,
seamlessYAxis,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
// The bounding box determines width and height, not the width and height params
const { width, height } = state.canvas.boundingBoxDimensions;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts
index f8390b8b9a..6c1c954f58 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts
@@ -47,8 +47,6 @@ export const buildCanvasInpaintGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -66,6 +64,7 @@ export const buildCanvasInpaintGraph = async (
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
if (!model) {
log.error('No model found in state');
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts
index 39eab4aa50..4a9beef3eb 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts
@@ -51,8 +51,6 @@ export const buildCanvasOutpaintGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -78,6 +76,7 @@ export const buildCanvasOutpaintGraph = async (
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
if (!model) {
log.error('No model found in state');
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLImageToImageGraph.ts
index 059003c34b..8e06dde054 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLImageToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLImageToImageGraph.ts
@@ -43,8 +43,6 @@ export const buildCanvasSDXLImageToImageGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -57,6 +55,7 @@ export const buildCanvasSDXLImageToImageGraph = async (
seamlessYAxis,
img2imgStrength: strength,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { refinerModel, refinerStart } = state.sdxl;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts
index 6a33a6ef99..ee3d0897b8 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts
@@ -48,8 +48,6 @@ export const buildCanvasSDXLInpaintGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -66,6 +64,7 @@ export const buildCanvasSDXLInpaintGraph = async (
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { refinerModel, refinerStart } = state.sdxl;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts
index 7cb215d5ec..ddcbb168ef 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts
@@ -52,8 +52,6 @@ export const buildCanvasSDXLOutpaintGraph = async (
): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -78,6 +76,7 @@ export const buildCanvasSDXLOutpaintGraph = async (
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { refinerModel, refinerStart } = state.sdxl;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLTextToImageGraph.ts
index b7e1ae80b0..9365faee81 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLTextToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLTextToImageGraph.ts
@@ -33,8 +33,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildCanvasSDXLTextToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -46,6 +44,7 @@ export const buildCanvasSDXLTextToImageGraph = async (state: RootState): Promise
seamlessXAxis,
seamlessYAxis,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
// The bounding box determines width and height, not the width and height params
const { width, height } = state.canvas.boundingBoxDimensions;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasTextToImageGraph.ts
index c14da86e3e..57529f9a02 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasTextToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasTextToImageGraph.ts
@@ -32,8 +32,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildCanvasTextToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -46,6 +44,7 @@ export const buildCanvasTextToImageGraph = async (state: RootState): Promise<Non
seamlessXAxis,
seamlessYAxis,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
// The bounding box determines width and height, not the width and height params
const { width, height } = state.canvas.boundingBoxDimensions;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearImageToImageGraph.ts
index 120afb98ee..08bad689ce 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearImageToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearImageToImageGraph.ts
@@ -38,8 +38,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildLinearImageToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -57,6 +55,7 @@ export const buildLinearImageToImageGraph = async (state: RootState): Promise<No
seamlessXAxis,
seamlessYAxis,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
/**
* The easiest way to build linear graphs is to do it in the node editor, then copy and paste the
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLImageToImageGraph.ts
index bd6902725b..a5298a4e32 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLImageToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLImageToImageGraph.ts
@@ -39,8 +39,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildLinearSDXLImageToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -57,6 +55,7 @@ export const buildLinearSDXLImageToImageGraph = async (state: RootState): Promis
seamlessYAxis,
img2imgStrength: strength,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { refinerModel, refinerStart } = state.sdxl;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLTextToImageGraph.ts
index b0b1140d5b..7e9b4cac3a 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLTextToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearSDXLTextToImageGraph.ts
@@ -30,8 +30,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildLinearSDXLTextToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -45,6 +43,7 @@ export const buildLinearSDXLTextToImageGraph = async (state: RootState): Promise
seamlessXAxis,
seamlessYAxis,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { refinerModel, refinerStart } = state.sdxl;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearTextToImageGraph.ts
index 90101add6d..35d02f38ea 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearTextToImageGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildLinearTextToImageGraph.ts
@@ -30,8 +30,6 @@ import { addCoreMetadataNode, getModelMetadataField } from './metadata';
export const buildLinearTextToImageGraph = async (state: RootState): Promise<NonNullableGraph> => {
const log = logger('nodes');
const {
- positivePrompt,
- negativePrompt,
model,
cfgScale: cfg_scale,
cfgRescaleMultiplier: cfg_rescale_multiplier,
@@ -46,6 +44,7 @@ export const buildLinearTextToImageGraph = async (state: RootState): Promise<Non
seamlessYAxis,
seed,
} = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const use_cpu = shouldUseCpuNoise;
diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts b/invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts
index cb6fc9acf1..89571a3679 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts
@@ -17,7 +17,7 @@ export const getBoardField = (state: RootState): BoardField | undefined => {
* Gets the SDXL style prompts, based on the concat setting.
*/
export const getSDXLStylePrompts = (state: RootState): { positiveStylePrompt: string; negativeStylePrompt: string } => {
- const { positivePrompt, negativePrompt } = state.generation;
+ const { positivePrompt, negativePrompt } = state.regionalPrompts.present.baseLayer;
const { positiveStylePrompt, negativeStylePrompt, shouldConcatSDXLStylePrompt } = state.sdxl;
return {
diff --git a/invokeai/frontend/web/src/features/parameters/components/Core/ParamNegativePrompt.tsx b/invokeai/frontend/web/src/features/parameters/components/Core/ParamNegativePrompt.tsx
index 55d97757e6..70e36e8dcc 100644
--- a/invokeai/frontend/web/src/features/parameters/components/Core/ParamNegativePrompt.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Core/ParamNegativePrompt.tsx
@@ -1,21 +1,21 @@
import { Box, Textarea } from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
-import { setNegativePrompt } from 'features/parameters/store/generationSlice';
import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
import { PromptPopover } from 'features/prompt/PromptPopover';
import { usePrompt } from 'features/prompt/usePrompt';
+import { negativePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
import { memo, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
export const ParamNegativePrompt = memo(() => {
const dispatch = useAppDispatch();
- const prompt = useAppSelector((s) => s.generation.negativePrompt);
+ const prompt = useAppSelector((s) => s.regionalPrompts.present.baseLayer.negativePrompt);
const textareaRef = useRef<HTMLTextAreaElement>(null);
const { t } = useTranslation();
const _onChange = useCallback(
(v: string) => {
- dispatch(setNegativePrompt(v));
+ dispatch(negativePromptChanged(v));
},
[dispatch]
);
diff --git a/invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx b/invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx
index a1c63def8d..732a50fa1b 100644
--- a/invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx
@@ -2,10 +2,10 @@ import { Box, Textarea } from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { ShowDynamicPromptsPreviewButton } from 'features/dynamicPrompts/components/ShowDynamicPromptsPreviewButton';
import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
-import { setPositivePrompt } from 'features/parameters/store/generationSlice';
import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
import { PromptPopover } from 'features/prompt/PromptPopover';
import { usePrompt } from 'features/prompt/usePrompt';
+import { positivePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
import { SDXLConcatButton } from 'features/sdxl/components/SDXLPrompts/SDXLConcatButton';
import { memo, useCallback, useRef } from 'react';
import type { HotkeyCallback } from 'react-hotkeys-hook';
@@ -14,14 +14,14 @@ import { useTranslation } from 'react-i18next';
export const ParamPositivePrompt = memo(() => {
const dispatch = useAppDispatch();
- const prompt = useAppSelector((s) => s.generation.positivePrompt);
+ const prompt = useAppSelector((s) => s.regionalPrompts.present.baseLayer.positivePrompt);
const baseModel = useAppSelector((s) => s.generation.model)?.base;
const textareaRef = useRef<HTMLTextAreaElement>(null);
const { t } = useTranslation();
const handleChange = useCallback(
(v: string) => {
- dispatch(setPositivePrompt(v));
+ dispatch(positivePromptChanged(v));
},
[dispatch]
);
diff --git a/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts b/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
index 0da6e21d9f..d8b747e17e 100644
--- a/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
+++ b/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
@@ -32,8 +32,6 @@ const initialGenerationState: GenerationState = {
img2imgStrength: 0.75,
infillMethod: 'patchmatch',
iterations: 1,
- positivePrompt: '',
- negativePrompt: '',
scheduler: 'euler',
maskBlur: 16,
maskBlurMethod: 'box',
@@ -67,12 +65,6 @@ export const generationSlice = createSlice({
name: 'generation',
initialState: initialGenerationState,
reducers: {
- setPositivePrompt: (state, action: PayloadAction<string>) => {
- state.positivePrompt = action.payload;
- },
- setNegativePrompt: (state, action: PayloadAction<string>) => {
- state.negativePrompt = action.payload;
- },
setIterations: (state, action: PayloadAction<number>) => {
state.iterations = action.payload;
},
@@ -259,8 +251,6 @@ export const {
setImg2imgStrength,
setInfillMethod,
setIterations,
- setPositivePrompt,
- setNegativePrompt,
setScheduler,
setMaskBlur,
setCanvasCoherenceMode,
diff --git a/invokeai/frontend/web/src/features/parameters/store/types.ts b/invokeai/frontend/web/src/features/parameters/store/types.ts
index 773cfbf925..55e6ae63f9 100644
--- a/invokeai/frontend/web/src/features/parameters/store/types.ts
+++ b/invokeai/frontend/web/src/features/parameters/store/types.ts
@@ -7,8 +7,6 @@ import type {
ParameterHeight,
ParameterMaskBlurMethod,
ParameterModel,
- ParameterNegativePrompt,
- ParameterPositivePrompt,
ParameterPrecision,
ParameterScheduler,
ParameterSeed,
@@ -28,8 +26,6 @@ export interface GenerationState {
infillMethod: string;
initialImage?: { imageName: string; width: number; height: number };
iterations: number;
- positivePrompt: ParameterPositivePrompt;
- negativePrompt: ParameterNegativePrompt;
scheduler: ParameterScheduler;
maskBlur: number;
maskBlurMethod: ParameterMaskBlurMethod;
diff --git a/invokeai/frontend/web/src/features/queue/components/QueueButtonTooltip.tsx b/invokeai/frontend/web/src/features/queue/components/QueueButtonTooltip.tsx
index 5d1b7264ea..3ea7d95309 100644
--- a/invokeai/frontend/web/src/features/queue/components/QueueButtonTooltip.tsx
+++ b/invokeai/frontend/web/src/features/queue/components/QueueButtonTooltip.tsx
@@ -4,17 +4,17 @@ import { useAppSelector } from 'app/store/storeHooks';
import { useIsReadyToEnqueue } from 'common/hooks/useIsReadyToEnqueue';
import { selectDynamicPromptsSlice } from 'features/dynamicPrompts/store/dynamicPromptsSlice';
import { getShouldProcessPrompt } from 'features/dynamicPrompts/util/getShouldProcessPrompt';
-import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
+import { selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
import { memo, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useEnqueueBatchMutation } from 'services/api/endpoints/queue';
import { useBoardName } from 'services/api/hooks/useBoardName';
const selectPromptsCount = createSelector(
- selectGenerationSlice,
+ selectRegionalPromptsSlice,
selectDynamicPromptsSlice,
- (generation, dynamicPrompts) =>
- getShouldProcessPrompt(generation.positivePrompt) ? dynamicPrompts.prompts.length : 1
+ (regionalPrompts, dynamicPrompts) =>
+ getShouldProcessPrompt(regionalPrompts.present.baseLayer.positivePrompt) ? dynamicPrompts.prompts.length : 1
);
type Props = {
diff --git a/invokeai/frontend/web/src/features/regionalPrompts/store/regionalPromptsSlice.ts b/invokeai/frontend/web/src/features/regionalPrompts/store/regionalPromptsSlice.ts
index 5593f0dff6..ec87b6c57b 100644
--- a/invokeai/frontend/web/src/features/regionalPrompts/store/regionalPromptsSlice.ts
+++ b/invokeai/frontend/web/src/features/regionalPrompts/store/regionalPromptsSlice.ts
@@ -4,7 +4,11 @@ import type { PersistConfig, RootState } from 'app/store/store';
import { moveBackward, moveForward, moveToBack, moveToFront } from 'common/util/arrayUtils';
import { controlAdapterRemoved } from 'features/controlAdapters/store/controlAdaptersSlice';
import type { ControlAdapterConfig } from 'features/controlAdapters/store/types';
-import type { ParameterAutoNegative } from 'features/parameters/types/parameterSchemas';
+import type {
+ ParameterAutoNegative,
+ ParameterNegativePrompt,
+ ParameterPositivePrompt,
+} from 'features/parameters/types/parameterSchemas';
import type { IRect, Vector2d } from 'konva/lib/types';
import { isEqual } from 'lodash-es';
import { atom } from 'nanostores';
@@ -64,6 +68,11 @@ export type VectorMaskLayer = MaskLayerBase & {
export type Layer = VectorMaskLayer | ControlLayer;
+type BaseLayerState = {
+ positivePrompt: ParameterPositivePrompt;
+ negativePrompt: ParameterNegativePrompt;
+};
+
type RegionalPromptsState = {
_version: 1;
selectedLayerId: string | null;
@@ -71,6 +80,7 @@ type RegionalPromptsState = {
brushSize: number;
globalMaskLayerOpacity: number;
isEnabled: boolean;
+ baseLayer: BaseLayerState;
};
export const initialRegionalPromptsState: RegionalPromptsState = {
@@ -80,6 +90,10 @@ export const initialRegionalPromptsState: RegionalPromptsState = {
layers: [],
globalMaskLayerOpacity: 0.5, // this globally changes all mask layers' opacity
isEnabled: true,
+ baseLayer: {
+ positivePrompt: '',
+ negativePrompt: '',
+ },
};
const isLine = (obj: VectorMaskLine | VectorMaskRect): obj is VectorMaskLine => obj.type === 'vector_mask_line';
@@ -326,6 +340,15 @@ export const regionalPromptsSlice = createSlice({
},
//#endregion
+ //#region Base Layer
+ positivePromptChanged: (state, action: PayloadAction<string>) => {
+ state.baseLayer.positivePrompt = action.payload;
+ },
+ negativePromptChanged: (state, action: PayloadAction<string>) => {
+ state.baseLayer.negativePrompt = action.payload;
+ },
+ //#endregion
+
//#region General
brushSizeChanged: (state, action: PayloadAction<number>) => {
state.brushSize = action.payload;
@@ -415,6 +438,9 @@ export const {
maskLayerIPAdapterAdded,
maskLayerAutoNegativeChanged,
maskLayerPreviewColorChanged,
+ // Base layer actions
+ positivePromptChanged,
+ negativePromptChanged,
// General actions
brushSizeChanged,
globalMaskLayerOpacityChanged,