From 45d5ab20eccbeba271bd52b11fa44910fac1d718 Mon Sep 17 00:00:00 2001 From: Jennifer Player Date: Fri, 15 Sep 2023 14:36:36 -0400 Subject: [PATCH] remove individual popover components --- .../components/IAIInformationalPopover.tsx | 19 +++++++----- .../parameters/ParamControlNetBeginEnd.tsx | 22 ++----------- .../parameters/ParamControlNetControlMode.tsx | 6 ++-- .../ParamControlNetFeatureToggle.tsx | 6 ++-- .../parameters/ParamControlNetResizeMode.tsx | 6 ++-- .../parameters/ParamControlNetWeight.tsx | 6 ++-- .../ParamDynamicPromptsCombinatorial.tsx | 6 ++-- .../components/ParamDynamicPromptsEnabled.tsx | 7 ++--- .../components/clipSkip.tsx | 15 --------- .../components/compositingBlur.tsx | 15 --------- .../components/compositingBlurMethod.tsx | 15 --------- .../components/compositingCoherencePass.tsx | 15 --------- .../components/compositingMode.tsx | 15 --------- .../components/compositingSteps.tsx | 15 --------- .../components/compositingStrength.tsx | 15 --------- .../components/compositiveMaskAdjustments.tsx | 15 --------- .../components/controlNetBeginEnd.tsx | 15 --------- .../components/controlNetControlMode.tsx | 15 --------- .../components/controlNetResizeMode.tsx | 15 --------- .../components/controlNetToggle.tsx | 15 --------- .../components/controlNetWeight.tsx | 15 --------- .../dynamicPromptsCombinatorial.tsx | 17 ---------- .../components/dynamicPromptsToggle.tsx | 15 --------- .../components/infillMethod.tsx | 15 --------- .../informationalPopovers/components/lora.tsx | 15 --------- .../components/noiseEnable.tsx | 15 --------- .../components/noiseUseCPU.tsx | 15 --------- .../components/paramCFGScale.tsx | 15 --------- .../components/paramDenoisingStrength.tsx | 15 --------- .../components/paramImages.tsx | 15 --------- .../components/paramModel.tsx | 15 --------- .../components/paramPositiveConditioning.tsx | 19 ------------ .../components/paramScheduler.tsx | 15 --------- .../components/paramSeed.tsx | 15 --------- .../components/paramSteps.tsx | 15 --------- .../components/paramVAE.tsx | 15 --------- .../components/paramVAEPrecision.tsx | 15 --------- .../components/scaleBeforeProcessing.tsx | 15 --------- .../features/lora/components/ParamLora.tsx | 6 ++-- .../Parameters/Advanced/ParamClipSkip.tsx | 6 ++-- .../ParamCanvasCoherenceMode.tsx | 6 ++-- .../ParamCanvasCoherenceSteps.tsx | 6 ++-- .../ParamCanvasCoherenceStrength.tsx | 6 ++-- .../MaskAdjustment/ParamMaskBlur.tsx | 6 ++-- .../MaskAdjustment/ParamMaskBlurMethod.tsx | 6 ++-- .../InfillAndScaling/ParamInfillMethod.tsx | 6 ++-- .../ParamScaleBeforeProcessing.tsx | 6 ++-- .../Parameters/Core/ParamCFGScale.tsx | 10 +++--- .../Parameters/Core/ParamIterations.tsx | 9 +++--- .../Core/ParamPositiveConditioning.tsx | 5 ++- .../Parameters/Core/ParamScheduler.tsx | 6 ++-- .../components/Parameters/Core/ParamSteps.tsx | 10 +++--- .../ImageToImage/ImageToImageStrength.tsx | 31 ++++++++++--------- .../MainModel/ParamMainModelSelect.tsx | 6 ++-- .../Parameters/Noise/ParamCpuNoise.tsx | 6 ++-- .../Parameters/Noise/ParamNoiseToggle.tsx | 6 ++-- .../Parameters/Seed/ParamSeedFull.tsx | 6 ++-- .../VAEModel/ParamVAEModelSelect.tsx | 6 ++-- .../Parameters/VAEModel/ParamVAEPrecision.tsx | 6 ++-- .../ParamSDXLImg2ImgDenoisingStrength.tsx | 6 ++-- 60 files changed, 117 insertions(+), 584 deletions(-) delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/clipSkip.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlur.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlurMethod.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingCoherencePass.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingMode.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingSteps.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositingStrength.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/compositiveMaskAdjustments.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/controlNetBeginEnd.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/controlNetControlMode.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/controlNetResizeMode.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/controlNetToggle.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/controlNetWeight.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsCombinatorial.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsToggle.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/infillMethod.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/lora.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/noiseEnable.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/noiseUseCPU.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramCFGScale.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramDenoisingStrength.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramImages.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramModel.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramPositiveConditioning.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramScheduler.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramSeed.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramSteps.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramVAE.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/paramVAEPrecision.tsx delete mode 100644 invokeai/frontend/web/src/features/informationalPopovers/components/scaleBeforeProcessing.tsx diff --git a/invokeai/frontend/web/src/common/components/IAIInformationalPopover.tsx b/invokeai/frontend/web/src/common/components/IAIInformationalPopover.tsx index a5bc691bf6..2c5d1b7599 100644 --- a/invokeai/frontend/web/src/common/components/IAIInformationalPopover.tsx +++ b/invokeai/frontend/web/src/common/components/IAIInformationalPopover.tsx @@ -15,11 +15,11 @@ import { import { ReactNode } from 'react'; import { useAppSelector } from '../../app/store/storeHooks'; import { systemSelector } from '../../features/system/store/systemSelectors'; +import { useTranslation } from 'react-i18next'; interface Props extends PopoverProps { - heading?: string; - paragraph: string; - triggerComponent: ReactNode; + details: string; + children: ReactNode; image?: string; buttonLabel?: string; buttonHref?: string; @@ -27,18 +27,21 @@ interface Props extends PopoverProps { } function IAIInformationalPopover({ - heading, - paragraph, + details, image, buttonLabel, buttonHref, - triggerComponent, + children, placement, }: Props) { const { shouldDisableInformationalPopovers } = useAppSelector(systemSelector); + const { t } = useTranslation(); + + const heading = t(`popovers.${details}.heading`); + const paragraph = t(`popovers.${details}.paragraph`); if (shouldDisableInformationalPopovers) { - return triggerComponent; + return children; } else { return ( -
{triggerComponent}
+
{children}
diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx index fa91003c8d..fb43c3553d 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx @@ -10,12 +10,12 @@ import { Tooltip, } from '@chakra-ui/react'; import { useAppDispatch } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import { ControlNetConfig, controlNetBeginStepPctChanged, controlNetEndStepPctChanged, } from 'features/controlNet/store/controlNetSlice'; -import { ControlNetBeginEndPopover } from 'features/informationalPopovers/components/controlNetBeginEnd'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -50,7 +50,7 @@ const ParamControlNetBeginEnd = (props: Props) => { ); return ( - + {t('controlnet.beginEndStepPercent')} @@ -64,22 +64,6 @@ const ParamControlNetBeginEnd = (props: Props) => { minStepsBetweenThumbs={5} isDisabled={!isEnabled} > - - - - - - - - - - @@ -119,7 +103,7 @@ const ParamControlNetBeginEnd = (props: Props) => { - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx index 5b2c1b169f..9b17c2bfb2 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx @@ -1,11 +1,11 @@ import { useAppDispatch } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; import { ControlModes, ControlNetConfig, controlNetControlModeChanged, } from 'features/controlNet/store/controlNetSlice'; -import { ControlNetControlModePopover } from 'features/informationalPopovers/components/controlNetControlMode'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -35,7 +35,7 @@ export default function ParamControlNetControlMode( ); return ( - + - + ); } diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx index 930ec26de7..1902d622ff 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx @@ -2,9 +2,9 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISwitch from 'common/components/IAISwitch'; import { isControlNetEnabledToggled } from 'features/controlNet/store/controlNetSlice'; -import { ControlNetTogglePopover } from 'features/informationalPopovers/components/controlnetToggle'; import { memo, useCallback } from 'react'; const selector = createSelector( @@ -26,7 +26,7 @@ const ParamControlNetFeatureToggle = () => { }, [dispatch]); return ( - + { width: '100%', }} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx index f84c2b9f13..0ad2f342b2 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx @@ -1,11 +1,11 @@ import { useAppDispatch } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; import { ControlNetConfig, ResizeModes, controlNetResizeModeChanged, } from 'features/controlNet/store/controlNetSlice'; -import { ControlNetResizeModePopover } from 'features/informationalPopovers/components/controlNetResizeMode'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -34,7 +34,7 @@ export default function ParamControlNetResizeMode( ); return ( - + - + ); } diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx index 58f7f4ffb1..4e9928d828 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx @@ -1,10 +1,10 @@ import { useAppDispatch } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; import { ControlNetConfig, controlNetWeightChanged, } from 'features/controlNet/store/controlNetSlice'; -import { ControlNetWeightPopover } from 'features/informationalPopovers/components/controlNetWeight'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -24,7 +24,7 @@ const ParamControlNetWeight = (props: ParamControlNetWeightProps) => { ); return ( - + { withSliderMarks sliderMarks={[0, 1, 2]} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCombinatorial.tsx b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCombinatorial.tsx index 1b227d2191..d2013c2b89 100644 --- a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCombinatorial.tsx +++ b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCombinatorial.tsx @@ -5,8 +5,8 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAISwitch from 'common/components/IAISwitch'; import { memo, useCallback } from 'react'; import { combinatorialToggled } from '../store/dynamicPromptsSlice'; -import { DynamicPromptsCombinatorialPopover } from 'features/informationalPopovers/components/dynamicPromptsCombinatorial'; import { useTranslation } from 'react-i18next'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( stateSelector, @@ -28,14 +28,14 @@ const ParamDynamicPromptsCombinatorial = () => { }, [dispatch]); return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsEnabled.tsx b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsEnabled.tsx index cdbb3b17db..e6e1a6a031 100644 --- a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsEnabled.tsx +++ b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsEnabled.tsx @@ -5,8 +5,8 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAISwitch from 'common/components/IAISwitch'; import { memo, useCallback } from 'react'; import { isEnabledToggled } from '../store/dynamicPromptsSlice'; -import { DynamicPromptsTogglePopover } from 'features/informationalPopovers/components/dynamicPromptsToggle'; import { useTranslation } from 'react-i18next'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( stateSelector, @@ -28,14 +28,13 @@ const ParamDynamicPromptsToggle = () => { }, [dispatch]); return ( - + - - + ); }; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/clipSkip.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/clipSkip.tsx deleted file mode 100644 index c267fbc8f2..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/clipSkip.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ClipSkipPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlur.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlur.tsx deleted file mode 100644 index 3dfdbd33ec..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlur.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingBlurPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlurMethod.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlurMethod.tsx deleted file mode 100644 index 9fbc5f2cf9..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingBlurMethod.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingBlurMethodPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingCoherencePass.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingCoherencePass.tsx deleted file mode 100644 index 462d136553..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingCoherencePass.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingCoherencePassPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingMode.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingMode.tsx deleted file mode 100644 index d5bb12f09f..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingMode.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingModePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingSteps.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingSteps.tsx deleted file mode 100644 index a8aef2b9d8..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingSteps.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingStepsPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingStrength.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositingStrength.tsx deleted file mode 100644 index 9a0d6d2f68..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositingStrength.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingStrengthPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/compositiveMaskAdjustments.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/compositiveMaskAdjustments.tsx deleted file mode 100644 index 541e6c1e56..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/compositiveMaskAdjustments.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const CompositingMaskAdjustmentsPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetBeginEnd.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetBeginEnd.tsx deleted file mode 100644 index fbf2b25d30..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetBeginEnd.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ControlNetBeginEndPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetControlMode.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetControlMode.tsx deleted file mode 100644 index f8a844edae..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetControlMode.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ControlNetControlModePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetResizeMode.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetResizeMode.tsx deleted file mode 100644 index 00dfae502b..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetResizeMode.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ControlNetResizeModePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetToggle.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetToggle.tsx deleted file mode 100644 index f85a3a7a54..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetToggle.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ControlNetTogglePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetWeight.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetWeight.tsx deleted file mode 100644 index ee358651b3..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/controlNetWeight.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ControlNetWeightPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsCombinatorial.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsCombinatorial.tsx deleted file mode 100644 index d294f41680..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsCombinatorial.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const DynamicPromptsCombinatorialPopover = ( - props: PropsWithChildren -) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsToggle.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsToggle.tsx deleted file mode 100644 index 9222d0d03d..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/dynamicPromptsToggle.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const DynamicPromptsTogglePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/infillMethod.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/infillMethod.tsx deleted file mode 100644 index 8a2fc562e1..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/infillMethod.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const InfillMethodPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/lora.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/lora.tsx deleted file mode 100644 index fbeebb7bd7..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/lora.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const LoraPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/noiseEnable.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/noiseEnable.tsx deleted file mode 100644 index cfe33e60ab..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/noiseEnable.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const NoiseEnablePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/noiseUseCPU.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/noiseUseCPU.tsx deleted file mode 100644 index 88524eace5..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/noiseUseCPU.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const NoiseUseCPUPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramCFGScale.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramCFGScale.tsx deleted file mode 100644 index 47ab8acbbd..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramCFGScale.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamCFGScalePopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramDenoisingStrength.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramDenoisingStrength.tsx deleted file mode 100644 index 0c60604bcf..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramDenoisingStrength.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamDenoisingStrengthPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramImages.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramImages.tsx deleted file mode 100644 index f9516f4df0..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramImages.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamImagesPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramModel.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramModel.tsx deleted file mode 100644 index 10a454cf18..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramModel.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamModelPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramPositiveConditioning.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramPositiveConditioning.tsx deleted file mode 100644 index 8736559e61..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramPositiveConditioning.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import InvokeAILogoImage from 'assets/images/logo.png'; -import { useTranslation } from 'react-i18next'; - -export const ParamPositiveConditioningPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramScheduler.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramScheduler.tsx deleted file mode 100644 index 342ec6203d..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramScheduler.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamSchedulerPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramSeed.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramSeed.tsx deleted file mode 100644 index 5b0572224b..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramSeed.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamSeedPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramSteps.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramSteps.tsx deleted file mode 100644 index d5dc47c336..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramSteps.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamStepsPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAE.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAE.tsx deleted file mode 100644 index e006e162c6..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAE.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamVAEPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAEPrecision.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAEPrecision.tsx deleted file mode 100644 index f2d70775b1..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/paramVAEPrecision.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ParamVAEPrecisionPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/informationalPopovers/components/scaleBeforeProcessing.tsx b/invokeai/frontend/web/src/features/informationalPopovers/components/scaleBeforeProcessing.tsx deleted file mode 100644 index 0390f342ba..0000000000 --- a/invokeai/frontend/web/src/features/informationalPopovers/components/scaleBeforeProcessing.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { PropsWithChildren } from 'react'; -import IAIInformationalPopover from '../../../common/components/IAIInformationalPopover'; -import { useTranslation } from 'react-i18next'; - -export const ScaleBeforeProcessingPopover = (props: PropsWithChildren) => { - const { t } = useTranslation(); - - return ( - - ); -}; diff --git a/invokeai/frontend/web/src/features/lora/components/ParamLora.tsx b/invokeai/frontend/web/src/features/lora/components/ParamLora.tsx index 3c57961f89..951de86217 100644 --- a/invokeai/frontend/web/src/features/lora/components/ParamLora.tsx +++ b/invokeai/frontend/web/src/features/lora/components/ParamLora.tsx @@ -10,7 +10,7 @@ import { loraWeightChanged, loraWeightReset, } from '../store/loraSlice'; -import { LoraPopover } from 'features/informationalPopovers/components/lora'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; type Props = { lora: LoRA; @@ -36,7 +36,7 @@ const ParamLora = (props: Props) => { }, [dispatch, lora.id]); return ( - + { colorScheme="error" /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx index 4faf8a8eac..a7d3d3c655 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx @@ -1,7 +1,7 @@ import { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; -import { ClipSkipPopover } from 'features/informationalPopovers/components/clipSkip'; import { setClipSkip } from 'features/parameters/store/generationSlice'; import { clipSkipMap } from 'features/parameters/types/constants'; import { useCallback, useMemo } from 'react'; @@ -43,7 +43,7 @@ export default function ParamClipSkip() { }, [model]); return ( - + - + ); } diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx index 169cb96db0..62bfca901c 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx @@ -1,8 +1,8 @@ import type { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import { IAISelectDataType } from 'common/components/IAIMantineSearchableSelect'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { CompositingModePopover } from 'features/informationalPopovers/components/compositingMode'; import { setCanvasCoherenceMode } from 'features/parameters/store/generationSlice'; import { CanvasCoherenceModeParam } from 'features/parameters/types/parameterSchemas'; @@ -31,14 +31,14 @@ const ParamCanvasCoherenceMode = () => { }; return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceSteps.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceSteps.tsx index 187d6577e0..f7de446737 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceSteps.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceSteps.tsx @@ -1,7 +1,7 @@ import type { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; -import { CompositingStepsPopover } from 'features/informationalPopovers/components/compositingSteps'; import { setCanvasCoherenceSteps } from 'features/parameters/store/generationSlice'; import { memo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -14,7 +14,7 @@ const ParamCanvasCoherenceSteps = () => { const { t } = useTranslation(); return ( - + { dispatch(setCanvasCoherenceSteps(20)); }} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceStrength.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceStrength.tsx index c7e763c1eb..31b86cfd49 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceStrength.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceStrength.tsx @@ -1,7 +1,7 @@ import type { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; -import { CompositingStrengthPopover } from 'features/informationalPopovers/components/compositingStrength'; import { setCanvasCoherenceStrength } from 'features/parameters/store/generationSlice'; import { memo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -14,7 +14,7 @@ const ParamCanvasCoherenceStrength = () => { const { t } = useTranslation(); return ( - + { dispatch(setCanvasCoherenceStrength(0.3)); }} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx index 0211d4bf98..da68f5ed3c 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx @@ -1,7 +1,7 @@ import type { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; -import { CompositingBlurPopover } from 'features/informationalPopovers/components/compositingBlur'; import { setMaskBlur } from 'features/parameters/store/generationSlice'; import { useTranslation } from 'react-i18next'; @@ -13,7 +13,7 @@ export default function ParamMaskBlur() { const { t } = useTranslation(); return ( - + - + ); } diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod.tsx index 77038066f9..8b17f46298 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod.tsx @@ -2,8 +2,8 @@ import { SelectItem } from '@mantine/core'; import { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { CompositingBlurMethodPopover } from 'features/informationalPopovers/components/compositingBlurMethod'; import { setMaskBlurMethod } from 'features/parameters/store/generationSlice'; import { useTranslation } from 'react-i18next'; @@ -29,13 +29,13 @@ export default function ParamMaskBlurMethod() { }; return ( - + - + ); } diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillMethod.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillMethod.tsx index a6f531ae19..7a4ac1601d 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillMethod.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillMethod.tsx @@ -2,8 +2,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { InfillMethodPopover } from 'features/informationalPopovers/components/infillMethod'; import { setInfillMethod } from 'features/parameters/store/generationSlice'; import { memo, useCallback } from 'react'; @@ -40,7 +40,7 @@ const ParamInfillMethod = () => { ); return ( - + { data={infill_methods ?? []} onChange={handleChange} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamScaleBeforeProcessing.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamScaleBeforeProcessing.tsx index a1164605df..a1c63d6ddb 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamScaleBeforeProcessing.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamScaleBeforeProcessing.tsx @@ -1,6 +1,7 @@ import { createSelector } from '@reduxjs/toolkit'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSearchableSelect from 'common/components/IAIMantineSearchableSelect'; import { canvasSelector } from 'features/canvas/store/canvasSelectors'; import { setBoundingBoxScaleMethod } from 'features/canvas/store/canvasSlice'; @@ -8,7 +9,6 @@ import { BOUNDING_BOX_SCALES_DICT, BoundingBoxScale, } from 'features/canvas/store/canvasTypes'; -import { ScaleBeforeProcessingPopover } from 'features/informationalPopovers/components/scaleBeforeProcessing'; import { memo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -36,14 +36,14 @@ const ParamScaleBeforeProcessing = () => { }; return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamCFGScale.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamCFGScale.tsx index e1413b9c2f..51d6edc2dc 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamCFGScale.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamCFGScale.tsx @@ -2,9 +2,9 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAINumberInput from 'common/components/IAINumberInput'; import IAISlider from 'common/components/IAISlider'; -import { ParamCFGScalePopover } from 'features/informationalPopovers/components/paramCFGScale'; import { setCfgScale } from 'features/parameters/store/generationSlice'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -54,7 +54,7 @@ const ParamCFGScale = () => { ); return shouldUseSliders ? ( - + { withSliderMarks isInteger={false} /> - + ) : ( - + { isInteger={false} numberInputFieldProps={{ textAlign: 'center' }} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx index 391457a43b..3b8c88ce83 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx @@ -2,6 +2,7 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAINumberInput from 'common/components/IAINumberInput'; import IAISlider from 'common/components/IAISlider'; import { ParamImagesPopover } from 'features/informationalPopovers/components/paramImages'; @@ -61,7 +62,7 @@ const ParamIterations = () => { }, [dispatch, initial]); return shouldUseSliders ? ( - + { withSliderMarks sliderNumberInputProps={{ max: inputMax }} /> - + ) : ( - + { value={iterations} numberInputFieldProps={{ textAlign: 'center' }} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamPositiveConditioning.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamPositiveConditioning.tsx index a36fe687e5..9f7df78a9c 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamPositiveConditioning.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamPositiveConditioning.tsx @@ -29,7 +29,6 @@ import { useTranslation } from 'react-i18next'; import { useFeatureStatus } from '../../../../system/hooks/useFeatureStatus'; import IAIInformationalPopover from '../../../../../common/components/IAIInformationalPopover'; import InvokeAILogoImage from 'assets/images/logo.png'; -import { ParamPositiveConditioningPopover } from '../../../../informationalPopovers/components/paramPositiveConditioning'; const promptInputSelector = createSelector( [stateSelector, activeTabNameSelector], @@ -139,7 +138,7 @@ const ParamPositiveConditioning = () => { onClose={onClose} onSelect={handleSelectEmbedding} > - + { resize="vertical" minH={32} /> - + {!isOpen && isEmbeddingEnabled && ( diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamScheduler.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamScheduler.tsx index e613b50b5b..3aadac0457 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamScheduler.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamScheduler.tsx @@ -1,8 +1,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSearchableSelect from 'common/components/IAIMantineSearchableSelect'; -import { ParamSchedulerPopover } from 'features/informationalPopovers/components/paramScheduler'; import { generationSelector } from 'features/parameters/store/generationSelectors'; import { setScheduler } from 'features/parameters/store/generationSlice'; import { @@ -52,14 +52,14 @@ const ParamScheduler = () => { ); return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamSteps.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamSteps.tsx index dd1ee4c7f4..61bdec571d 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamSteps.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamSteps.tsx @@ -2,10 +2,10 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAINumberInput from 'common/components/IAINumberInput'; import IAISlider from 'common/components/IAISlider'; -import { ParamStepsPopover } from 'features/informationalPopovers/components/paramSteps'; import { clampSymmetrySteps, setSteps, @@ -57,7 +57,7 @@ const ParamSteps = () => { }, [dispatch]); return shouldUseSliders ? ( - + { withSliderMarks sliderNumberInputProps={{ max: inputMax }} /> - + ) : ( - + { numberInputFieldProps={{ textAlign: 'center' }} onBlur={handleBlur} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx index 2a14ee634c..b22dff22e5 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx @@ -7,6 +7,7 @@ import { setImg2imgStrength } from 'features/parameters/store/generationSlice'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import SubParametersWrapper from '../SubParametersWrapper'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( [stateSelector], @@ -46,20 +47,22 @@ const ImageToImageStrength = () => { return ( - + + + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/MainModel/ParamMainModelSelect.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/MainModel/ParamMainModelSelect.tsx index daebc503a5..9c957523bc 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/MainModel/ParamMainModelSelect.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/MainModel/ParamMainModelSelect.tsx @@ -21,7 +21,7 @@ import { useGetOnnxModelsQuery, } from 'services/api/endpoints/models'; import { useFeatureStatus } from '../../../../system/hooks/useFeatureStatus'; -import { ParamModelPopover } from 'features/informationalPopovers/components/paramModel'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( stateSelector, @@ -119,7 +119,7 @@ const ParamMainModelSelect = () => { data={[]} /> ) : ( - + { )} - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamCpuNoise.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamCpuNoise.tsx index 11feff880d..9c5fe30a08 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamCpuNoise.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamCpuNoise.tsx @@ -2,8 +2,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISwitch from 'common/components/IAISwitch'; -import { NoiseUseCPUPopover } from 'features/informationalPopovers/components/noiseUseCPU'; import { shouldUseCpuNoiseChanged } from 'features/parameters/store/generationSlice'; import { ChangeEvent } from 'react'; import { useTranslation } from 'react-i18next'; @@ -29,13 +29,13 @@ export const ParamCpuNoiseToggle = () => { dispatch(shouldUseCpuNoiseChanged(e.target.checked)); return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamNoiseToggle.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamNoiseToggle.tsx index 9f3e674c1c..d17e643df7 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamNoiseToggle.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Noise/ParamNoiseToggle.tsx @@ -1,7 +1,7 @@ import type { RootState } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAISwitch from 'common/components/IAISwitch'; -import { NoiseEnablePopover } from 'features/informationalPopovers/components/noiseEnable'; import { setShouldUseNoiseSettings } from 'features/parameters/store/generationSlice'; import { ChangeEvent } from 'react'; import { useTranslation } from 'react-i18next'; @@ -18,12 +18,12 @@ export const ParamNoiseToggle = () => { dispatch(setShouldUseNoiseSettings(e.target.checked)); return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Seed/ParamSeedFull.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Seed/ParamSeedFull.tsx index e14dea6ec5..8ddba1cbb2 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Seed/ParamSeedFull.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Seed/ParamSeedFull.tsx @@ -3,17 +3,17 @@ import { memo } from 'react'; import ParamSeed from './ParamSeed'; import ParamSeedShuffle from './ParamSeedShuffle'; import ParamSeedRandomize from './ParamSeedRandomize'; -import { ParamSeedPopover } from 'features/informationalPopovers/components/paramSeed'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const ParamSeedFull = () => { return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEModelSelect.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEModelSelect.tsx index 5adb13ef45..c551562962 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEModelSelect.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEModelSelect.tsx @@ -15,7 +15,7 @@ import IAIMantineSelectItemWithTooltip from 'common/components/IAIMantineSelectI import { vaeSelected } from 'features/parameters/store/generationSlice'; import { MODEL_TYPE_MAP } from 'features/parameters/types/constants'; import { modelIdToVAEModelParam } from 'features/parameters/util/modelIdToVAEModelParam'; -import { ParamVAEPopover } from 'features/informationalPopovers/components/paramVAE'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( stateSelector, @@ -94,7 +94,7 @@ const ParamVAEModelSelect = () => { ); return ( - + { disabled={data.length === 0} clearable /> - + ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEPrecision.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEPrecision.tsx index d72e39eb46..5fa15c5fe3 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEPrecision.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/VAEModel/ParamVAEPrecision.tsx @@ -2,8 +2,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { ParamVAEPrecisionPopover } from 'features/informationalPopovers/components/paramVAEPrecision'; import { vaePrecisionChanged } from 'features/parameters/store/generationSlice'; import { PrecisionParam } from 'features/parameters/types/parameterSchemas'; import { memo, useCallback } from 'react'; @@ -35,14 +35,14 @@ const ParamVAEModelSelect = () => { ); return ( - + - + ); }; diff --git a/invokeai/frontend/web/src/features/sdxl/components/ParamSDXLImg2ImgDenoisingStrength.tsx b/invokeai/frontend/web/src/features/sdxl/components/ParamSDXLImg2ImgDenoisingStrength.tsx index 8917633869..dc8ae775f9 100644 --- a/invokeai/frontend/web/src/features/sdxl/components/ParamSDXLImg2ImgDenoisingStrength.tsx +++ b/invokeai/frontend/web/src/features/sdxl/components/ParamSDXLImg2ImgDenoisingStrength.tsx @@ -7,7 +7,7 @@ import SubParametersWrapper from 'features/parameters/components/Parameters/SubP import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { setSDXLImg2ImgDenoisingStrength } from '../store/sdxlSlice'; -import { ParamDenoisingStrengthPopover } from 'features/informationalPopovers/components/paramDenoisingStrength'; +import IAIInformationalPopover from 'common/components/IAIInformationalPopover'; const selector = createSelector( [stateSelector], @@ -37,7 +37,7 @@ const ParamSDXLImg2ImgDenoisingStrength = () => { return ( - + { withSliderMarks withReset /> - + ); };