Skip to content

feat: [v3] add support for oklch oklab lch lab color spaces #15293

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

Closed
wants to merge 1 commit into from
Closed

feat: [v3] add support for oklch oklab lch lab color spaces #15293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/util/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ let RGB = new RegExp(
let HSL = new RegExp(
`^(hsla?)\\(\\s*((?:${VALUE.source})(?:deg|rad|grad|turn)?|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`
)
let OTHER_MODES = new RegExp(
`^(lch|lab|oklab|oklch)\\(\\s*(${VALUE.source}|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`
)

// In "loose" mode the color may contain fewer than 3 parts, as long as at least
// one of the parts is variable.
Expand Down Expand Up @@ -44,7 +47,7 @@ export function parseColor(value, { loose = false } = {}) {
}
}

let match = value.match(RGB) ?? value.match(HSL)
let match = value.match(RGB) ?? value.match(HSL) ?? value.match(OTHER_MODES)

if (match === null) {
return null
Expand Down
15 changes: 15 additions & 0 deletions tests/color.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ describe('parseColor', () => {
${'rgba(var(--foo), var(--alpha))'} | ${{ mode: 'rgba', color: ['var(--foo)'], alpha: 'var(--alpha)' }}
${'hsla(var(--foo), 0.1)'} | ${{ mode: 'hsla', color: ['var(--foo)'], alpha: '0.1' }}
${'hsla(var(--foo), var(--alpha))'} | ${{ mode: 'hsla', color: ['var(--foo)'], alpha: 'var(--alpha)' }}
${'lch(0% 30 60)'} | ${{ mode: 'lch', color: ['0%', '30', '60'], alpha: undefined }}
${'lab(0% 30 60 / 0.5)'} | ${{ mode: 'lab', color: ['0%', '30', '60'], alpha: '0.5' }}
${'oklch(0% 30 var(--foo) / 0.5)'} | ${{ mode: 'oklch', color: ['0%', '30', 'var(--foo)'], alpha: '0.5' }}
${'oklab(0% 30 var(--foo) / var(--alpha))'} | ${{ mode: 'oklab', color: ['0%', '30', 'var(--foo)'], alpha: 'var(--alpha)' }}
${'transparent'} | ${{ mode: 'rgb', color: ['0', '0', '0'], alpha: '0' }}
`('should parse "$color" to the correct value', ({ color, output }) => {
expect(parseColor(color)).toEqual(output)
Expand All @@ -78,6 +82,17 @@ describe('parseColor', () => {
})
})

describe('parseColorLoose', () => {
it.each`
color | output
${'hsl(var(--foo) / var(--alpha))'} | ${{ mode: 'hsl', color: ['var(--foo)'], alpha: 'var(--alpha)' }}
${'oklch(var(--foo) / 0.5)'} | ${{ mode: 'oklch', color: ['var(--foo)'], alpha: '0.5' }}
${'oklab(var(--foo) / var(--alpha))'} | ${{ mode: 'oklab', color: ['var(--foo)'], alpha: 'var(--alpha)' }}
`('should parse "$color" to the correct value', ({ color, output }) => {
expect(parseColor(color, { loose: true })).toEqual(output)
})
})

describe('formatColor', () => {
it.each`
color | output
Expand Down