mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-01 05:49:54 +00:00
* fix color picker value prefix and add component tests
* test(widgets): make color text assertion specific in WidgetColorPicker.test per review (DrJKL)
* test(widgets): use expect.soft for valid hex colors loop (suggestion by DrJKL)
* test(widgets): normalize color display to single leading # to address review question (AustinMroz)
* feat(widgets): normalize color widget values to #hex across inputs (hex/rgb/hsb); always emit with leading # using colorUtil conversions
* test(widgets): use data-testid selector for color text instead of generic span; add data-testid to component span for robustness
* support hsb|rgb|hex and coerce to hex with hashtag internally
refactor(widgets,utils): format-driven color normalization to lowercase #hex without casts; add typed toHexFromFormat and guards; simplify WidgetColorPicker state and types\n\n- utils: add ColorFormat, HSB/HSV types, isColorFormat/isHSBObject/isHSVObject, toHexFromFormat; reuse parseToRgb/hsbToRgb/rgbToHex\n- widgets: emit normalized #hex, display derived via toHexFromFormat, keep picker native v-model; typed widget options {format?}\n- tests: consolidate colorUtil tests into tests-ui/tests/colorUtil.test.ts; keep conversion + adjustColor suites; selectors robust\n- docs: add PR-5472-change-summary.md explaining changes\n\nAll type checks pass; ready for your final review before push.
refactor(widgets,utils): format-driven color normalization to lowercase #hex without casts; add typed toHexFromFormat and guards; simplify WidgetColorPicker state and types\n\n- utils: add ColorFormat, HSB/HSV types, isColorFormat/isHSBObject/isHSVObject, toHexFromFormat; reuse parseToRgb/hsbToRgb/rgbToHex\n- widgets: emit normalized #hex, display derived via toHexFromFormat, keep picker native v-model; typed widget options {format?}\n- tests: consolidate colorUtil tests into tests-ui/tests/colorUtil.test.ts; keep conversion + adjustColor suites; selectors robust\n- docs: add PR-5472-change-summary.md explaining changes\n\nAll type checks pass; ready for your final review before push.
chore: untrack PR-5472-change-summary.md and ignore locally (keep file on disk)
* fix(utils): use floor in hsbToRgb to match expected hex (#7f0000) for 50% brightness rounding behavior
* test(widgets): restore invalid-format fallback test and use data-testid selector in hex loop; chore: revert .gitignore change (remove PR-5472-change-summary.md entry)
* chore: restore .gitignore to match main (remove local note/comment)
* [refactor] improve color parsing in ColorPicker widget - addresses review feedback
- Use fancy color parsing for initial value normalization per @DrJKL's suggestion
- Simplify onPickerUpdate to trust configured format per @AustinMroz's feedback
- Remove redundant type checking and format guessing logic
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* [refactor] simplify color parsing - remove unnecessary helper function
- Remove normalizeColorValue helper and inline null checks
- Remove verbose comments
- Keep the same functionality with cleaner code
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* remove unused exports
---------
Co-authored-by: Claude <noreply@anthropic.com>
353 lines
8.1 KiB
TypeScript
353 lines
8.1 KiB
TypeScript
import { memoize } from 'es-toolkit/compat'
|
|
|
|
type RGB = { r: number; g: number; b: number }
|
|
export interface HSB {
|
|
h: number
|
|
s: number
|
|
b: number
|
|
}
|
|
type HSL = { h: number; s: number; l: number }
|
|
type HSLA = { h: number; s: number; l: number; a: number }
|
|
type ColorFormatInternal = 'hex' | 'rgb' | 'rgba' | 'hsl' | 'hsla'
|
|
export type ColorFormat = 'hex' | 'rgb' | 'hsb'
|
|
interface HSV {
|
|
h: number
|
|
s: number
|
|
v: number
|
|
}
|
|
|
|
export interface ColorAdjustOptions {
|
|
lightness?: number
|
|
opacity?: number
|
|
}
|
|
|
|
function rgbToHsl({ r, g, b }: RGB): HSL {
|
|
r /= 255
|
|
g /= 255
|
|
b /= 255
|
|
const max = Math.max(r, g, b),
|
|
min = Math.min(r, g, b)
|
|
let h = 0,
|
|
s = 0
|
|
const l: number = (max + min) / 2
|
|
|
|
if (max !== min) {
|
|
const d = max - min
|
|
s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
|
|
switch (max) {
|
|
case r:
|
|
h = (g - b) / d + (g < b ? 6 : 0)
|
|
break
|
|
case g:
|
|
h = (b - r) / d + 2
|
|
break
|
|
case b:
|
|
h = (r - g) / d + 4
|
|
break
|
|
}
|
|
h /= 6
|
|
}
|
|
|
|
return { h, s, l }
|
|
}
|
|
|
|
export function hexToRgb(hex: string): RGB {
|
|
let r = 0,
|
|
g = 0,
|
|
b = 0
|
|
// 3 digits
|
|
if (hex.length == 4) {
|
|
r = parseInt(hex[1] + hex[1], 16)
|
|
g = parseInt(hex[2] + hex[2], 16)
|
|
b = parseInt(hex[3] + hex[3], 16)
|
|
}
|
|
// 6 digits
|
|
else if (hex.length == 7) {
|
|
r = parseInt(hex.slice(1, 3), 16)
|
|
g = parseInt(hex.slice(3, 5), 16)
|
|
b = parseInt(hex.slice(5, 7), 16)
|
|
}
|
|
return { r, g, b }
|
|
}
|
|
|
|
export function rgbToHex({ r, g, b }: RGB): string {
|
|
const toHex = (n: number) =>
|
|
Math.max(0, Math.min(255, Math.round(n)))
|
|
.toString(16)
|
|
.padStart(2, '0')
|
|
return `#${toHex(r)}${toHex(g)}${toHex(b)}`
|
|
}
|
|
|
|
export function hsbToRgb({ h, s, b }: HSB): RGB {
|
|
// Normalize
|
|
const hh = ((h % 360) + 360) % 360
|
|
const ss = Math.max(0, Math.min(100, s)) / 100
|
|
const vv = Math.max(0, Math.min(100, b)) / 100
|
|
|
|
const c = vv * ss
|
|
const x = c * (1 - Math.abs(((hh / 60) % 2) - 1))
|
|
const m = vv - c
|
|
|
|
let rp = 0,
|
|
gp = 0,
|
|
bp = 0
|
|
|
|
if (hh < 60) {
|
|
rp = c
|
|
gp = x
|
|
bp = 0
|
|
} else if (hh < 120) {
|
|
rp = x
|
|
gp = c
|
|
bp = 0
|
|
} else if (hh < 180) {
|
|
rp = 0
|
|
gp = c
|
|
bp = x
|
|
} else if (hh < 240) {
|
|
rp = 0
|
|
gp = x
|
|
bp = c
|
|
} else if (hh < 300) {
|
|
rp = x
|
|
gp = 0
|
|
bp = c
|
|
} else {
|
|
rp = c
|
|
gp = 0
|
|
bp = x
|
|
}
|
|
|
|
return {
|
|
r: Math.floor((rp + m) * 255),
|
|
g: Math.floor((gp + m) * 255),
|
|
b: Math.floor((bp + m) * 255)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Normalize various color inputs (hex, rgb/rgba, hsl/hsla, hsb string/object)
|
|
* into lowercase #rrggbb. Falls back to #000000 on invalid inputs.
|
|
*/
|
|
export function parseToRgb(color: string): RGB {
|
|
const format = identifyColorFormat(color)
|
|
if (!format) return { r: 0, g: 0, b: 0 }
|
|
|
|
const hsla = parseToHSLA(color, format)
|
|
if (!isHSLA(hsla)) return { r: 0, g: 0, b: 0 }
|
|
|
|
// Convert HSL to RGB
|
|
const h = hsla.h / 360
|
|
const s = hsla.s / 100
|
|
const l = hsla.l / 100
|
|
|
|
const c = (1 - Math.abs(2 * l - 1)) * s
|
|
const x = c * (1 - Math.abs(((h * 6) % 2) - 1))
|
|
const m = l - c / 2
|
|
|
|
let r = 0,
|
|
g = 0,
|
|
b = 0
|
|
|
|
if (h < 1 / 6) {
|
|
r = c
|
|
g = x
|
|
b = 0
|
|
} else if (h < 2 / 6) {
|
|
r = x
|
|
g = c
|
|
b = 0
|
|
} else if (h < 3 / 6) {
|
|
r = 0
|
|
g = c
|
|
b = x
|
|
} else if (h < 4 / 6) {
|
|
r = 0
|
|
g = x
|
|
b = c
|
|
} else if (h < 5 / 6) {
|
|
r = x
|
|
g = 0
|
|
b = c
|
|
} else {
|
|
r = c
|
|
g = 0
|
|
b = x
|
|
}
|
|
|
|
return {
|
|
r: Math.round((r + m) * 255),
|
|
g: Math.round((g + m) * 255),
|
|
b: Math.round((b + m) * 255)
|
|
}
|
|
}
|
|
|
|
const identifyColorFormat = (color: string): ColorFormatInternal | null => {
|
|
if (!color) return null
|
|
if (color.startsWith('#') && (color.length === 4 || color.length === 7))
|
|
return 'hex'
|
|
if (/rgba?\(\s*\d+\s*,\s*\d+\s*,\s*\d+\s*/.test(color))
|
|
return color.includes('rgba') ? 'rgba' : 'rgb'
|
|
if (/hsla?\(\s*\d+(\.\d+)?\s*,\s*\d+(\.\d+)?%\s*,\s*\d+(\.\d+)?%/.test(color))
|
|
return color.includes('hsla') ? 'hsla' : 'hsl'
|
|
return null
|
|
}
|
|
|
|
const isHSLA = (color: unknown): color is HSLA => {
|
|
if (typeof color !== 'object' || color === null) return false
|
|
|
|
return ['h', 's', 'l', 'a'].every(
|
|
(key) =>
|
|
typeof (color as Record<string, unknown>)[key] === 'number' &&
|
|
!isNaN((color as Record<string, number>)[key])
|
|
)
|
|
}
|
|
|
|
export function isColorFormat(v: unknown): v is ColorFormat {
|
|
return v === 'hex' || v === 'rgb' || v === 'hsb'
|
|
}
|
|
|
|
function isHSBObject(v: unknown): v is HSB {
|
|
if (!v || typeof v !== 'object') return false
|
|
const rec = v as Record<string, unknown>
|
|
return (
|
|
typeof rec.h === 'number' &&
|
|
Number.isFinite(rec.h) &&
|
|
typeof rec.s === 'number' &&
|
|
Number.isFinite(rec.s) &&
|
|
typeof (rec as Record<string, unknown>).b === 'number' &&
|
|
Number.isFinite((rec as Record<string, number>).b!)
|
|
)
|
|
}
|
|
|
|
function isHSVObject(v: unknown): v is HSV {
|
|
if (!v || typeof v !== 'object') return false
|
|
const rec = v as Record<string, unknown>
|
|
return (
|
|
typeof rec.h === 'number' &&
|
|
Number.isFinite(rec.h) &&
|
|
typeof rec.s === 'number' &&
|
|
Number.isFinite(rec.s) &&
|
|
typeof (rec as Record<string, unknown>).v === 'number' &&
|
|
Number.isFinite((rec as Record<string, number>).v!)
|
|
)
|
|
}
|
|
|
|
export function toHexFromFormat(val: unknown, format: ColorFormat): string {
|
|
if (format === 'hex' && typeof val === 'string') {
|
|
const raw = val.trim().toLowerCase()
|
|
if (!raw) return '#000000'
|
|
if (/^[0-9a-f]{3}$/.test(raw)) return `#${raw}`
|
|
if (/^#[0-9a-f]{3}$/.test(raw)) return raw
|
|
if (/^[0-9a-f]{6}$/.test(raw)) return `#${raw}`
|
|
if (/^#[0-9a-f]{6}$/.test(raw)) return raw
|
|
return '#000000'
|
|
}
|
|
|
|
if (format === 'rgb' && typeof val === 'string') {
|
|
const rgb = parseToRgb(val)
|
|
return rgbToHex(rgb).toLowerCase()
|
|
}
|
|
|
|
if (format === 'hsb') {
|
|
if (isHSBObject(val)) {
|
|
return rgbToHex(hsbToRgb(val)).toLowerCase()
|
|
}
|
|
if (isHSVObject(val)) {
|
|
const { h, s, v } = val
|
|
return rgbToHex(hsbToRgb({ h, s, b: v })).toLowerCase()
|
|
}
|
|
if (typeof val === 'string') {
|
|
const nums = val.match(/\d+(?:\.\d+)?/g)?.map(Number) || []
|
|
if (nums.length >= 3) {
|
|
return rgbToHex(
|
|
hsbToRgb({ h: nums[0], s: nums[1], b: nums[2] })
|
|
).toLowerCase()
|
|
}
|
|
}
|
|
}
|
|
return '#000000'
|
|
}
|
|
|
|
function parseToHSLA(color: string, format: ColorFormatInternal): HSLA | null {
|
|
let match: RegExpMatchArray | null
|
|
|
|
switch (format) {
|
|
case 'hex': {
|
|
const hsl = rgbToHsl(hexToRgb(color))
|
|
return {
|
|
h: Math.round(hsl.h * 360),
|
|
s: +(hsl.s * 100).toFixed(1),
|
|
l: +(hsl.l * 100).toFixed(1),
|
|
a: 1
|
|
}
|
|
}
|
|
|
|
case 'rgb':
|
|
case 'rgba': {
|
|
match = color.match(/\d+(\.\d+)?/g)
|
|
if (!match || match.length < 3) return null
|
|
const [r, g, b] = match.map(Number)
|
|
const hsl = rgbToHsl({ r, g, b })
|
|
|
|
const a = format === 'rgba' && match[3] ? parseFloat(match[3]) : 1
|
|
|
|
return {
|
|
h: Math.round(hsl.h * 360),
|
|
s: +(hsl.s * 100).toFixed(1),
|
|
l: +(hsl.l * 100).toFixed(1),
|
|
a
|
|
}
|
|
}
|
|
|
|
case 'hsl':
|
|
case 'hsla': {
|
|
match = color.match(/\d+(\.\d+)?/g)
|
|
if (!match || match.length < 3) return null
|
|
const [h, s, l] = match.map(Number)
|
|
const a = format === 'hsla' && match[3] ? parseFloat(match[3]) : 1
|
|
return { h, s, l, a }
|
|
}
|
|
default:
|
|
return null
|
|
}
|
|
}
|
|
|
|
const applyColorAdjustments = (
|
|
color: string,
|
|
options: ColorAdjustOptions
|
|
): string => {
|
|
if (!Object.keys(options).length) return color
|
|
|
|
const format = identifyColorFormat(color)
|
|
if (!format) {
|
|
console.warn(`Unsupported color format in color palette: ${color}`)
|
|
return color
|
|
}
|
|
|
|
const hsla = parseToHSLA(color, format)
|
|
if (!isHSLA(hsla)) {
|
|
console.warn(`Invalid color values in color palette: ${color}`)
|
|
return color
|
|
}
|
|
|
|
if (options.lightness) {
|
|
hsla.l = Math.max(0, Math.min(100, hsla.l + options.lightness * 100.0))
|
|
}
|
|
|
|
if (options.opacity) {
|
|
hsla.a = Math.max(0, Math.min(1, options.opacity))
|
|
}
|
|
|
|
return `hsla(${hsla.h}, ${hsla.s}%, ${hsla.l}%, ${hsla.a})`
|
|
}
|
|
|
|
export const adjustColor: (
|
|
color: string,
|
|
options: ColorAdjustOptions
|
|
) => string = memoize(
|
|
applyColorAdjustments,
|
|
(color: string, options: ColorAdjustOptions): string =>
|
|
`${color}-${JSON.stringify(options)}`
|
|
)
|