diff --git a/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx b/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx index 8f90797fd9..40b4856d99 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx @@ -1,4 +1,4 @@ -import { Box, Flex, useColorMode } from '@chakra-ui/react'; +import { Box, Flex } from '@chakra-ui/react'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { memo, useCallback } from 'react'; import { FaCopy, FaTrash } from 'react-icons/fa'; @@ -17,7 +17,6 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAIIconButton from 'common/components/IAIIconButton'; import IAISwitch from 'common/components/IAISwitch'; import { useToggle } from 'react-use'; -import { mode } from 'theme/util/mode'; import { v4 as uuidv4 } from 'uuid'; import ControlNetImagePreview from './ControlNetImagePreview'; import ControlNetProcessorComponent from './ControlNetProcessorComponent'; @@ -46,9 +45,8 @@ const ControlNet = (props: ControlNetProps) => { ); const { isEnabled, shouldAutoConfig } = useAppSelector(selector); - const [isExpanded, toggleIsExpanded] = useToggle(false); - const { colorMode } = useColorMode(); + const handleDelete = useCallback(() => { dispatch(controlNetRemoved({ controlNetId })); }, [controlNetId, dispatch]); @@ -72,9 +70,12 @@ const ControlNet = (props: ControlNetProps) => { flexDir: 'column', gap: 2, p: 3, - bg: mode('base.200', 'base.850')(colorMode), borderRadius: 'base', position: 'relative', + bg: 'base.200', + _dark: { + bg: 'base.850', + }, }} > @@ -120,10 +121,13 @@ const ControlNet = (props: ControlNetProps) => { } @@ -136,72 +140,62 @@ const ControlNet = (props: ControlNetProps) => { w: 1.5, h: 1.5, borderRadius: 'full', - bg: mode('error.700', 'error.200')(colorMode), top: 4, insetInlineEnd: 4, + bg: 'error.700', + _dark: { + bg: 'error.200', + }, }} /> )} - - - - - {isEnabled && ( - <> - - - - - - - {!isExpanded && ( - - - - )} - - + + + + + - - {isExpanded && ( - <> - - - - - + {!isExpanded && ( + + + )} + + + + {isExpanded && ( + <> + + + + + + + + )} 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 c08ecf1bb2..57cf3f439e 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx @@ -1,5 +1,4 @@ import { - ChakraProps, FormControl, FormLabel, HStack, @@ -20,22 +19,14 @@ import { } from 'features/controlNet/store/controlNetSlice'; import { memo, useCallback, useMemo } from 'react'; -const SLIDER_MARK_STYLES: ChakraProps['sx'] = { - mt: 1.5, - fontSize: '2xs', - fontWeight: '500', - color: 'base.400', -}; - type Props = { controlNetId: string; - mini?: boolean; }; const formatPct = (v: number) => `${Math.round(v * 100)}%`; const ParamControlNetBeginEnd = (props: Props) => { - const { controlNetId, mini = false } = props; + const { controlNetId } = props; const dispatch = useAppDispatch(); const selector = useMemo( @@ -91,38 +82,33 @@ const ParamControlNetBeginEnd = (props: Props) => { - {!mini && ( - <> - - 0% - - - 50% - - - 100% - - - )} + + 0% + + + 50% + + + 100% + 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 3784829be9..f7a2a24cd5 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx @@ -8,11 +8,10 @@ import { memo, useCallback, useMemo } from 'react'; type ParamControlNetWeightProps = { controlNetId: string; - mini?: boolean; }; const ParamControlNetWeight = (props: ParamControlNetWeightProps) => { - const { controlNetId, mini = false } = props; + const { controlNetId } = props; const dispatch = useAppDispatch(); const selector = useMemo( () => @@ -35,13 +34,12 @@ const ParamControlNetWeight = (props: ParamControlNetWeightProps) => { return ( );