diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx index 54aaca4eaf..6887d1abb0 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredCannyImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.canny_image_processor.default; @@ -44,7 +44,7 @@ const CannyProcessor = (props: CannyProcessorProps) => { }, [controlNetId, processorChanged]); return ( - + { max={255} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx index 5c83cca2ea..7ce6ab2297 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredContentShuffleImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.content_shuffle_image_processor.default; @@ -83,7 +83,7 @@ const ContentShuffleProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { max={4096} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx index 4a55c2694f..a1aced5a8f 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx @@ -4,7 +4,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredHedImageProcessorInvocation } from 'features/controlNet/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.hed_image_processor.default; @@ -55,7 +55,7 @@ const HedPreprocessor = (props: HedProcessorProps) => { }, [controlNetId, processorChanged]); return ( - + { isChecked={scribble} onChange={handleScribbleChanged} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx index f64508e48c..17dc9b43df 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredLineartAnimeImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.lineart_anime_image_processor.default; @@ -44,7 +44,7 @@ const LineartAnimeProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { max={4096} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx index 13f889f245..99765ff62f 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx @@ -4,7 +4,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredLineartImageProcessorInvocation } from 'features/controlNet/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.lineart_image_processor.default; @@ -52,7 +52,7 @@ const LineartProcessor = (props: LineartProcessorProps) => { ); return ( - + { isChecked={coarse} onChange={handleCoarseChanged} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx index b7a56a9a6b..6e1a3959f2 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredMediapipeFaceProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.mediapipe_face_processor.default; @@ -40,7 +40,7 @@ const MediapipeFaceProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { step={0.01} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx index 84363b03bb..a552c90f3a 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredMidasDepthImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.midas_depth_image_processor.default; @@ -40,7 +40,7 @@ const MidasDepthProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { step={0.01} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx index 271a55cd83..d753d3b266 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredMlsdImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.mlsd_image_processor.default; @@ -66,7 +66,7 @@ const MlsdImageProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { step={0.01} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx index bd5477e716..ea3270adb3 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx @@ -3,7 +3,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredNormalbaeImageProcessorInvocation } from 'features/controlNet/store/types'; import { memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.normalbae_image_processor.default; @@ -44,7 +44,7 @@ const NormalBaeProcessor = (props: Props) => { }, [controlNetId, processorChanged]); return ( - + { max={4096} withInput /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx index bbb7db316f..57b45fffa4 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx @@ -4,7 +4,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredOpenposeImageProcessorInvocation } from 'features/controlNet/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.openpose_image_processor.default; @@ -52,7 +52,7 @@ const OpenposeProcessor = (props: Props) => { ); return ( - + { isChecked={hand_and_face} onChange={handleHandAndFaceChanged} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx index 2309c375d6..7fb5b92b9c 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx @@ -4,7 +4,7 @@ import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; import { RequiredPidiImageProcessorInvocation } from 'features/controlNet/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; -import ProcessorOptionsContainer from './shared/ProcessorOptionsContainer'; +import ProcessorWrapper from './common/ProcessorWrapper'; const DEFAULTS = CONTROLNET_PROCESSORS.pidi_image_processor.default; @@ -59,7 +59,7 @@ const PidiProcessor = (props: Props) => { ); return ( - + { onChange={handleScribbleChanged} /> - + ); }; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/shared/ProcessorOptionsContainer.tsx b/invokeai/frontend/web/src/features/controlNet/components/processors/common/ProcessorWrapper.tsx similarity index 54% rename from invokeai/frontend/web/src/features/controlNet/components/processors/shared/ProcessorOptionsContainer.tsx rename to invokeai/frontend/web/src/features/controlNet/components/processors/common/ProcessorWrapper.tsx index 5cd7ff61ae..f1c9cb8048 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/shared/ProcessorOptionsContainer.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/processors/common/ProcessorWrapper.tsx @@ -1,11 +1,9 @@ import { Flex } from '@chakra-ui/react'; import { PropsWithChildren } from 'react'; -type ProcessorOptionsContainerProps = PropsWithChildren; +type Props = PropsWithChildren; -export default function ProcessorOptionsContainer( - props: ProcessorOptionsContainerProps -) { +export default function ProcessorWrapper(props: Props) { return ( {props.children} );