Update color parsing and formatting (#5442)

* Replace `culori` with simple color parser

* Use space-separated color syntax

* Update default color values to use space-separated syntax

* Update separator regex

* Fix tests

* add tests for the new `color` util

Also slightly modified the `color` util itself to take `transparent`
into account and also format every value as a string for consistency.

Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
This commit is contained in:
Brad Cornes 2021-09-09 15:15:53 +01:00 • committed by GitHub
parent 12fa78b9ca
commit 4919cbfbb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 409 additions and 302 deletions

View file

@ -1,41 +1,17 @@
import * as culori from 'culori'
function isValidColor(color) {
return culori.parse(color) !== undefined
}
import { parseColor, formatColor } from './color'
export function withAlphaValue(color, alphaValue, defaultValue) {
if (typeof color === 'function') {
return color({ opacityValue: alphaValue })
}
if (isValidColor(color)) {
// Parse color
const parsed = culori.parse(color)
let parsed = parseColor(color)
// Apply alpha value
parsed.alpha = alphaValue
// Format string
let value
if (parsed.mode === 'hsl') {
value = culori.formatHsl(parsed)
} else {
value = culori.formatRgb(parsed)
}
// Correctly apply CSS variable alpha value
if (typeof alphaValue === 'string' && alphaValue.startsWith('var(') && value.endsWith('NaN)')) {
value = value.replace('NaN)', `${alphaValue})`)
}
// Color could not be formatted correctly
if (!value.includes('NaN')) {
return value
}
if (parsed === null) {
return defaultValue
}
return defaultValue
return formatColor({ ...parsed, alpha: alphaValue })
}
export default function withAlphaVariable({ color, property, variable }) {
@ -46,29 +22,23 @@ export default function withAlphaVariable({ color, property, variable }) {
}
}
if (isValidColor(color)) {
const parsed = culori.parse(color)
if ('alpha' in parsed) {
// Has an alpha value, return color as-is
return {
[property]: color,
}
}
const formatFn = parsed.mode === 'hsl' ? 'formatHsl' : 'formatRgb'
const value = culori[formatFn]({
...parsed,
alpha: NaN, // intentionally set to `NaN` for replacing
}).replace('NaN)', `var(${variable}))`)
const parsed = parseColor(color)
if (parsed === null) {
return {
[variable]: '1',
[property]: value,
[property]: color,
}
}
if (parsed.alpha !== undefined) {
// Has an alpha value, return color as-is
return {
[property]: color,
}
}
return {
[property]: color,
[variable]: '1',
[property]: formatColor({ ...parsed, alpha: `var(${variable})` }),
}
}