Skip to content

feat(ui): Color Picker V2 #8585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(ui): Color Picker V2 #8585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0c5661
pinned colorpicker
hipsterusername Sep 18, 2025
08c02d7
hex options
hipsterusername Sep 18, 2025
b464b8c
remove unused consts
hipsterusername Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 126 additions & 56 deletions invokeai/frontend/web/src/common/components/ColorPicker/RgbaColorPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ChakraProps } from '@invoke-ai/ui-library';
import { Box, CompositeNumberInput, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
import { Box, Button, CompositeNumberInput, Flex, FormControl, FormLabel, Input } from '@invoke-ai/ui-library';
import { RGBA_COLOR_SWATCHES } from 'common/components/ColorPicker/swatches';
import { rgbaColorToString } from 'common/util/colorCodeTransformers';
import type { CSSProperties } from 'react';
import { memo, useCallback } from 'react';
import { hexToRGBA, rgbaColorToString, rgbaToHex } from 'common/util/colorCodeTransformers';
import type { ChangeEvent, CSSProperties } from 'react';
import { memo, useCallback, useEffect, useState } from 'react';
import { RgbaColorPicker as ColorfulRgbaColorPicker } from 'react-colorful';
import type { RgbaColor } from 'react-colorful/dist/types';
import { useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -40,61 +40,131 @@ const RgbaColorPicker = (props: Props) => {
const handleChangeG = useCallback((g: number) => onChange({ ...color, g }), [color, onChange]);
const handleChangeB = useCallback((b: number) => onChange({ ...color, b }), [color, onChange]);
const handleChangeA = useCallback((a: number) => onChange({ ...color, a }), [color, onChange]);
const [mode, setMode] = useState<'rgb' | 'hex'>('rgb');
const [hex, setHex] = useState<string>(rgbaToHex(color, true));
useEffect(() => {
setHex(rgbaToHex(color, true));
}, [color]);
const onToggleMode = useCallback(() => setMode((m) => (m === 'rgb' ? 'hex' : 'rgb')), []);
const onChangeHex = useCallback(
(e: ChangeEvent<HTMLInputElement>) => {
let value = e.target.value.trim();
if (!value.startsWith('#')) {
value = `#${value}`;
}
const cleaned = value.replace(/[^#0-9a-fA-F]/g, '').slice(0, 9);
setHex(cleaned);
const hexBody = cleaned.replace('#', '');
if (hexBody.length === 6 || hexBody.length === 8) {
const a = hexBody.length === 8 ? parseInt(hexBody.slice(6, 8), 16) / 255 : color.a;
const next = hexToRGBA(hexBody.slice(0, 6).padEnd(6, '0'), a);
onChange(next);
}
},
[color.a, onChange]
);
const onChangeAlpha = useCallback(
(a: number) => {
const next = { ...color, a: Math.max(0, Math.min(1, a)) };
onChange(next);
setHex(rgbaToHex(next, true));
},
[color, onChange]
);
return (
<Flex sx={sx}>
<ColorfulRgbaColorPicker color={color} onChange={onChange} style={colorPickerStyles} />
{withNumberInput && (
<Flex gap={2}>
<FormControl gap={0}>
<FormLabel>{t('common.red')[0]}</FormLabel>
<CompositeNumberInput
value={color.r}
onChange={handleChangeR}
min={0}
max={255}
step={1}
w={numberInputWidth}
defaultValue={90}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.green')[0]}</FormLabel>
<CompositeNumberInput
value={color.g}
onChange={handleChangeG}
min={0}
max={255}
step={1}
w={numberInputWidth}
defaultValue={90}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.blue')[0]}</FormLabel>
<CompositeNumberInput
value={color.b}
onChange={handleChangeB}
min={0}
max={255}
step={1}
w={numberInputWidth}
defaultValue={255}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.alpha')[0]}</FormLabel>
<CompositeNumberInput
value={color.a}
onChange={handleChangeA}
step={0.1}
min={0}
max={1}
w={numberInputWidth}
defaultValue={1}
/>
</FormControl>
</Flex>
)}
{withNumberInput &&
(mode === 'rgb' ? (
<Flex gap={2} alignItems="end">
<Button
size="xs"
variant="ghost"
px={3}
minW="unset"
h={10}
whiteSpace="nowrap"
onClick={onToggleMode}
aria-label="Toggle RGB/HEX"
>
RGB
</Button>
<FormControl gap={0}>
<FormLabel>{t('common.red')[0]}</FormLabel>
<CompositeNumberInput
value={color.r}
onChange={handleChangeR}
min={0}
max={255}
step={1}
w={numberInputWidth}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.green')[0]}</FormLabel>
<CompositeNumberInput
value={color.g}
onChange={handleChangeG}
min={0}
max={255}
step={1}
w={numberInputWidth}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.blue')[0]}</FormLabel>
<CompositeNumberInput
value={color.b}
onChange={handleChangeB}
min={0}
max={255}
step={1}
w={numberInputWidth}
/>
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.alpha')[0]}</FormLabel>
<CompositeNumberInput
value={color.a}
onChange={handleChangeA}
step={0.1}
min={0}
max={1}
w={numberInputWidth}
/>
</FormControl>
</Flex>
) : (
<Flex gap={2} alignItems="end">
<Button
size="xs"
variant="ghost"
px={3}
minW="unset"
h={10}
whiteSpace="nowrap"
onClick={onToggleMode}
aria-label="Toggle RGB/HEX"
>
HEX
</Button>
<FormControl gap={0}>
<FormLabel>{t('common.hex', { defaultValue: 'Hex' })}</FormLabel>
<Input value={hex} onChange={onChangeHex} placeholder="#RRGGBB or #RRGGBBAA" w="10rem" />
</FormControl>
<FormControl gap={0}>
<FormLabel>{t('common.alpha')[0]}</FormLabel>
<CompositeNumberInput
value={color.a}
onChange={onChangeAlpha}
step={0.01}
min={0}
max={1}
w={numberInputWidth}
/>
</FormControl>
</Flex>
))}
{withSwatches && (
<Flex gap={2} justifyContent="space-between">
{RGBA_COLOR_SWATCHES.map((color, i) => (
Expand Down
95 changes: 95 additions & 0 deletions .../frontend/web/src/features/controlLayers/components/Tool/PinnedFillColorPickerOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import { Flex, IconButton, Text } from '@invoke-ai/ui-library';
import { createSelector } from '@reduxjs/toolkit';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import RgbaColorPicker from 'common/components/ColorPicker/RgbaColorPicker';
import {
selectCanvasSettingsSlice,
settingsActiveColorToggled,
settingsBgColorChanged,
settingsFgColorChanged,
settingsFillColorPickerPinnedSet,
} from 'features/controlLayers/store/canvasSettingsSlice';
import type { RgbaColor } from 'features/controlLayers/store/types';
import { memo, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { PiArrowsLeftRightBold, PiPushPinSlashBold } from 'react-icons/pi';

const selectActiveColor = createSelector(selectCanvasSettingsSlice, (settings) => settings.activeColor);
const selectBgColor = createSelector(selectCanvasSettingsSlice, (settings) => settings.bgColor);
const selectFgColor = createSelector(selectCanvasSettingsSlice, (settings) => settings.fgColor);
const selectPinned = createSelector(selectCanvasSettingsSlice, (settings) => settings.fillColorPickerPinned);

export const PinnedFillColorPickerOverlay = memo(() => {
const { t } = useTranslation();
const isPinned = useAppSelector(selectPinned);
const activeColorType = useAppSelector(selectActiveColor);
const bgColor = useAppSelector(selectBgColor);
const fgColor = useAppSelector(selectFgColor);
const dispatch = useAppDispatch();

const activeColor = useMemo(
() => (activeColorType === 'bgColor' ? bgColor : fgColor),
[activeColorType, bgColor, fgColor]
);

const onColorChange = useCallback(
(color: RgbaColor) => {
if (activeColorType === 'bgColor') {
dispatch(settingsBgColorChanged(color));
} else {
dispatch(settingsFgColorChanged(color));
}
},
[activeColorType, dispatch]
);

const onUnpin = useCallback(() => dispatch(settingsFillColorPickerPinnedSet(false)), [dispatch]);
const onToggleActive = useCallback(() => dispatch(settingsActiveColorToggled()), [dispatch]);

if (!isPinned) {
return null;
}

return (
<Flex pointerEvents="auto" direction="column" gap={2}>
<Flex
direction="column"
p={3}
bg="base.900"
borderColor="base.700"
borderWidth="1px"
borderStyle="solid"
shadow="dark-lg"
borderRadius="base"
minW={88}
>
<Flex justifyContent="space-between" alignItems="center" mb={2} gap={2}>
<Text fontWeight="semibold" color="base.300">
{t('controlLayers.fill.fillColor')}
</Text>
<Flex gap={1}>
<IconButton
aria-label={t('controlLayers.fill.switchColors', { defaultValue: 'Switch FG/BG (X)' })}
tooltip={t('controlLayers.fill.switchColors', { defaultValue: 'Switch FG/BG (X)' })}
size="sm"
variant="ghost"
onClick={onToggleActive}
icon={<PiArrowsLeftRightBold />}
/>
<IconButton
aria-label={t('common.unpin', { defaultValue: 'Unpin' })}
tooltip={t('common.unpin', { defaultValue: 'Unpin' })}
size="sm"
variant="solid"
onClick={onUnpin}
icon={<PiPushPinSlashBold />}
/>
</Flex>
</Flex>
<RgbaColorPicker color={activeColor} onChange={onColorChange} withNumberInput withSwatches />
</Flex>
</Flex>
);
});

PinnedFillColorPickerOverlay.displayName = 'PinnedFillColorPickerOverlay';
Loading