From 52827807de5bdfaecaa0f5cb29b6fa742096c681 Mon Sep 17 00:00:00 2001 From: Kent Keirsey <31807370+hipsterusername@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:57:56 -0400 Subject: [PATCH] remove ref image from upscale --- .../components/Prompts/UpscalePrompts.tsx | 34 +++++++++++++++++++ .../ParametersPanelUpscale.tsx | 4 +-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 invokeai/frontend/web/src/features/parameters/components/Prompts/UpscalePrompts.tsx diff --git a/invokeai/frontend/web/src/features/parameters/components/Prompts/UpscalePrompts.tsx b/invokeai/frontend/web/src/features/parameters/components/Prompts/UpscalePrompts.tsx new file mode 100644 index 0000000000..3efe674680 --- /dev/null +++ b/invokeai/frontend/web/src/features/parameters/components/Prompts/UpscalePrompts.tsx @@ -0,0 +1,34 @@ +import { Flex } from '@invoke-ai/ui-library'; +import { useAppSelector } from 'app/store/storeHooks'; +import { + createParamsSelector, + selectHasNegativePrompt, + selectModelSupportsNegativePrompt, +} from 'features/controlLayers/store/paramsSlice'; +import { ParamNegativePrompt } from 'features/parameters/components/Core/ParamNegativePrompt'; +import { ParamPositivePrompt } from 'features/parameters/components/Core/ParamPositivePrompt'; +import { ParamSDXLNegativeStylePrompt } from 'features/sdxl/components/SDXLPrompts/ParamSDXLNegativeStylePrompt'; +import { ParamSDXLPositiveStylePrompt } from 'features/sdxl/components/SDXLPrompts/ParamSDXLPositiveStylePrompt'; +import { memo } from 'react'; + +const selectWithStylePrompts = createParamsSelector((params) => { + const isSDXL = params.model?.base === 'sdxl'; + const shouldConcatPrompts = params.shouldConcatPrompts; + return isSDXL && !shouldConcatPrompts; +}); + +export const UpscalePrompts = memo(() => { + const withStylePrompts = useAppSelector(selectWithStylePrompts); + const modelSupportsNegativePrompt = useAppSelector(selectModelSupportsNegativePrompt); + const hasNegativePrompt = useAppSelector(selectHasNegativePrompt); + return ( + + + {withStylePrompts && } + {modelSupportsNegativePrompt && hasNegativePrompt && } + {withStylePrompts && } + + ); +}); + +UpscalePrompts.displayName = 'UpscalePrompts'; \ No newline at end of file diff --git a/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx b/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx index 520b7b5c2f..71f3c94fcd 100644 --- a/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx +++ b/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx @@ -1,7 +1,7 @@ import { Box, Flex } from '@invoke-ai/ui-library'; import { useStore } from '@nanostores/react'; import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants'; -import { Prompts } from 'features/parameters/components/Prompts/Prompts'; +import { UpscalePrompts } from 'features/parameters/components/Prompts/UpscalePrompts'; import { UpscaleTabAdvancedSettingsAccordion } from 'features/settingsAccordions/components/AdvancedSettingsAccordion/UpscaleTabAdvancedSettingsAccordion'; import { UpscaleTabGenerationSettingsAccordion } from 'features/settingsAccordions/components/GenerationSettingsAccordion/UpscaleTabGenerationSettingsAccordion'; import { UpscaleSettingsAccordion } from 'features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion'; @@ -34,7 +34,7 @@ export const ParametersPanelUpscale = memo(() => { )} - +