Skip to content

css-color-parser: fix handling of none in some edge cases #1859

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

Merged
romainmenke merged 6 commits into from
Jul 21, 2026
Merged

css-color-parser: fix handling of none in some edge cases #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
841623b
css-color-parser: fix handling of `none` in some edge cases
romainmenke Jun 29, 2026
b715946
Merge branch 'main' into css-color-parser--persistent-hummingbird-5bf…
romainmenke Jul 5, 2026
0526181
Merge branch 'main' into css-color-parser--persistent-hummingbird-5bf…
romainmenke Jul 6, 2026
131f669
split color conversion for RCS from interpolation (#1860)
romainmenke Jul 17, 2026
3cdb3d5
Merge remote-tracking branch 'origin/main' into css-color-parser--per…
romainmenke Jul 20, 2026
0ea0fef
more tests
romainmenke Jul 21, 2026
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
4 changes: 4 additions & 0 deletions packages/css-color-parser/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changes to CSS Color Parser

### Unreleased (patch)

- Fix handling of `none` in some edge cases

### 4.1.9

_June 25, 2026_
Expand Down
2 changes: 1 addition & 1 deletion packages/css-color-parser/dist/index.mjs
View file
Open in desktop

Large diffs are not rendered by default.

555 changes: 350 additions & 205 deletions packages/css-color-parser/src/color-data.ts
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions packages/css-color-parser/src/functions/color-mix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { Color } from '@csstools/color-helpers';
import { ColorNotation } from '../color-notation';
import { isTokenIdent, isTokenNumeric, isTokenPercentage } from '@csstools/css-tokenizer';
import { calcFromComponentValues } from '@csstools/css-calc';
import { colorDataTo, SyntaxFlag } from '../color-data';
import { colorDataToForInterpolation, SyntaxFlag } from '../color-data';
import { isFunctionNode, isTokenNode, isWhiteSpaceOrCommentNode } from '@csstools/css-parser-algorithms';
import { toLowerCaseAZ } from '../util/to-lower-case-a-z';
import { mathFunctionNames } from '@csstools/css-calc';
Expand Down Expand Up @@ -279,7 +279,7 @@ function colorMixRectangular(colorSpace: string, items: Array<ColorMixEntry> | f

// 3. If items is length 1, set color to the color of that sole item, converted to the specified interpolation <color-space>.
if (normalizedItems.length === 1) {
const color = colorDataTo(normalizedItems[0].color, outputColorNotation);
const color = colorDataToForInterpolation(normalizedItems[0].color, outputColorNotation);
color.colorNotation = outputColorNotation;
color.syntaxFlags.add(SyntaxFlag.ColorMixVariadic);
color.syntaxFlags.add(SyntaxFlag.ColorMix);
Expand Down Expand Up @@ -369,8 +369,8 @@ function colorMixRectangularPair(colorNotation: ColorNotation, a_color: ColorDat
a_alpha = Number.isNaN(a_alpha) ? b_alpha : a_alpha;
b_alpha = Number.isNaN(b_alpha) ? a_alpha : b_alpha;

const a_channels = colorDataTo(a_color, colorNotation).channels;
const b_channels = colorDataTo(b_color, colorNotation).channels;
const a_channels = colorDataToForInterpolation(a_color, colorNotation).channels;
const b_channels = colorDataToForInterpolation(b_color, colorNotation).channels;

a_channels[0] = fillInMissingComponent(a_channels[0], b_channels[0]);
b_channels[0] = fillInMissingComponent(b_channels[0], a_channels[0]);
Expand Down Expand Up @@ -448,7 +448,7 @@ function colorMixPolar(colorSpace: string, hueInterpolationMethod: string, items

// 3. If items is length 1, set color to the color of that sole item, converted to the specified interpolation <color-space>.
if (normalizedItems.length === 1) {
const color = colorDataTo(normalizedItems[0].color, outputColorNotation);
const color = colorDataToForInterpolation(normalizedItems[0].color, outputColorNotation);
color.colorNotation = outputColorNotation;
color.syntaxFlags.add(SyntaxFlag.ColorMixVariadic);
color.syntaxFlags.add(SyntaxFlag.ColorMix);
Expand Down Expand Up @@ -547,8 +547,8 @@ function colorMixPolarPair(colorNotation: ColorNotation, hueInterpolationMethod:
a_alpha = Number.isNaN(a_alpha) ? b_alpha : a_alpha;
b_alpha = Number.isNaN(b_alpha) ? a_alpha : b_alpha;

const a_channels = colorDataTo(a_color, colorNotation).channels;
const b_channels = colorDataTo(b_color, colorNotation).channels;
const a_channels = colorDataToForInterpolation(a_color, colorNotation).channels;
const b_channels = colorDataToForInterpolation(b_color, colorNotation).channels;

switch (colorNotation) {
case ColorNotation.HSL:
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/color-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ export function normalize_Color_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 100, -2_147_483_647, 2_147_483_647);
let value;
if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 100, -2_147_483_647, 2_147_483_647);
}

return [
Expand All @@ -48,9 +50,11 @@ export function normalize_Color_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
}

return [
Expand Down
7 changes: 2 additions & 5 deletions packages/css-color-parser/src/functions/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ColorData} from '../color-data';
import { SyntaxFlag, colorDataTo, noneToZeroInRelativeColorDataChannels, normalizeRelativeColorDataChannels } from '../color-data';
import { SyntaxFlag, colorDataToForRelativeColorSyntax, noneToZeroInRelativeColorDataChannels, normalizeRelativeColorDataChannels } from '../color-data';
import type { ColorParser } from '../color-parser';
import { ColorNotation } from '../color-notation';
import type { ComponentValue, FunctionNode} from '@csstools/css-parser-algorithms';
Expand Down Expand Up @@ -106,10 +106,7 @@ export function color(colorFunctionNode: FunctionNode, colorParser: ColorParser)
colorData.colorNotation = colorSpaceNameToColorNotation(colorSpace);

if (relativeToColor) {
if (relativeToColor.colorNotation !== colorData.colorNotation) {
relativeToColor = colorDataTo(relativeToColor, colorData.colorNotation);
}

relativeToColor = colorDataToForRelativeColorSyntax(relativeToColor, colorData.colorNotation);
relativeColorChannels = normalizeRelativeColorDataChannels(relativeToColor);
relativeColorChannelsWithoutNone = noneToZeroInRelativeColorDataChannels(relativeColorChannels);
}
Expand Down
16 changes: 12 additions & 4 deletions packages/css-color-parser/src/functions/hsl-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ export function normalize_legacy_HSL_ChannelValues(token: CSSToken, index: numbe
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand All @@ -49,9 +51,11 @@ export function normalize_legacy_HSL_ChannelValues(token: CSSToken, index: numbe
return false;
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand Down Expand Up @@ -105,11 +109,13 @@ export function normalize_modern_HSL_ChannelValues(token: CSSToken, index: numbe
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = token[4].value;
let value;
if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else if (index === 1) {
value = normalize(token[4].value, 1, 0, 2_147_483_647);
} else {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
}

return [
Expand All @@ -129,11 +135,13 @@ export function normalize_modern_HSL_ChannelValues(token: CSSToken, index: numbe
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = token[4].value;
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else if (index === 1) {
value = normalize(token[4].value, 1, 0, 2_147_483_647);
} else {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
}

return [
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/hwb-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ export function normalize_HWB_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = token[4].value;
let value;
if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
}

return [
Expand All @@ -64,9 +66,11 @@ export function normalize_HWB_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = token[4].value;
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
}

return [
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/lab-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ export function normalize_Lab_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 1 || index === 2) {
value = normalize(token[4].value, 0.8, -2_147_483_647, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand All @@ -50,11 +52,13 @@ export function normalize_Lab_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 1 || index === 2) {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/lch-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ export function normalize_LCH_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 1) {
value = normalize(token[4].value, (100 / 150), 0, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand All @@ -64,11 +66,13 @@ export function normalize_LCH_ChannelValues(token: CSSToken, index: number, colo
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 1, 0, 100);
let value;
if (index === 1) {
value = normalize(token[4].value, 1, 0, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 100);
}

return [
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/oklab-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ export function normalize_OKLab_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 100, 0, 1);
let value;
if (index === 1 || index === 2) {
value = normalize(token[4].value, 250, -2_147_483_647, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 100, 0, 1);
}

return [
Expand All @@ -50,11 +52,13 @@ export function normalize_OKLab_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 1, 0, 1);
let value;
if (index === 1 || index === 2) {
value = normalize(token[4].value, 1, -2_147_483_647, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 1);
}

return [
Expand Down
8 changes: 6 additions & 2 deletions packages/css-color-parser/src/functions/oklch-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ export function normalize_OKLCH_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 100, 0, 1);
let value;
if (index === 1) {
value = normalize(token[4].value, 250, 0, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 100, 0, 1);
}

return [
Expand All @@ -64,11 +66,13 @@ export function normalize_OKLCH_ChannelValues(token: CSSToken, index: number, co
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 1, 0, 1);
let value;
if (index === 1) {
value = normalize(token[4].value, 1, 0, 2_147_483_647);
} else if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 1, 0, 1);
}

return [
Expand Down
12 changes: 9 additions & 3 deletions packages/css-color-parser/src/functions/rgb-normalize-channel-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ export function normalize_legacy_sRGB_ChannelValues(token: CSSToken, index: numb
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 255, 0, 1);
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 255, 0, 1);
}

return [
Expand Down Expand Up @@ -72,9 +74,11 @@ export function normalize_modern_sRGB_ChannelValues(token: CSSToken, index: numb
colorData.syntaxFlags.add(SyntaxFlag.HasPercentageValues);
}

let value = normalize(token[4].value, 100, -2_147_483_647, 2_147_483_647);
let value;
if (index === 3) {
value = normalize(token[4].value, 100, 0, 1);
} else {
value = normalize(token[4].value, 100, -2_147_483_647, 2_147_483_647);
}

return [
Expand All @@ -94,9 +98,11 @@ export function normalize_modern_sRGB_ChannelValues(token: CSSToken, index: numb
colorData.syntaxFlags.add(SyntaxFlag.HasNumberValues);
}

let value = normalize(token[4].value, 255, -2_147_483_647, 2_147_483_647);
let value;
if (index === 3) {
value = normalize(token[4].value, 1, 0, 1);
} else {
value = normalize(token[4].value, 255, -2_147_483_647, 2_147_483_647);
}

return [
Expand Down
9 changes: 3 additions & 6 deletions packages/css-color-parser/src/functions/three-channel-space-separated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { ColorData} from '../color-data';
import { noneToZeroInRelativeColorDataChannels, normalizeRelativeColorDataChannels } from '../color-data';
import { colorDataToForRelativeColorSyntax, noneToZeroInRelativeColorDataChannels, normalizeRelativeColorDataChannels } from '../color-data';
import type { ComponentValue, FunctionNode } from '@csstools/css-parser-algorithms';
import type { TokenNumber} from '@csstools/css-tokenizer';
import { isTokenDelim, isTokenIdent, isTokenNumber, isTokenNumeric } from '@csstools/css-tokenizer';
import type { ColorNotation } from '../color-notation';
import { SyntaxFlag, colorDataTo } from '../color-data';
import { SyntaxFlag } from '../color-data';
import { calcFromComponentValues } from '@csstools/css-calc';
import { isCommentNode, isFunctionNode, isTokenNode, isWhitespaceNode } from '@csstools/css-parser-algorithms';
import type { normalizeChannelValuesFn } from './normalize-channel-values';
Expand Down Expand Up @@ -122,10 +122,7 @@ export function threeChannelSpaceSeparated(

colorData.syntaxFlags.add(SyntaxFlag.RelativeColorSyntax);

if (relativeToColor.colorNotation !== colorNotation) {
relativeToColor = colorDataTo(relativeToColor, colorNotation);
}

relativeToColor = colorDataToForRelativeColorSyntax(relativeToColor, colorNotation);
relativeColorChannels = normalizeRelativeColorDataChannels(relativeToColor);
relativeColorChannelsWithoutNone = noneToZeroInRelativeColorDataChannels(relativeColorChannels);

Expand Down
3 changes: 2 additions & 1 deletion packages/css-color-parser/test/basic/color-mix-function-oklch.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { serialize_OKLCH_data } from '../util/serialize.mjs';

const tests = [
['color-mix(in oklch, oklch(100% 0% 60deg), oklch(50% 50% 0deg))', 'oklch(0.75 0.1 0)'],
['color-mix(in oklch, oklch(100% 0% none), oklch(50% 50% 0deg))', 'oklch(0.75 0.1 0)'],
['color-mix(in oklch, rgb(255, 255, 255), rgb(180, 6, 95))', 'oklch(0.75031 0.10016 359.858)'],
['color-mix(in lch, oklch(75% 0% 60deg), oklch(75% 50% 0deg))', 'oklch(0.74979 0.09824 0.10588)'],
['color-mix(in oklch, oklch(100% 0% none), oklch(50% 50% 0deg))', 'oklch(0.75 0.1 0)'],
['color-mix(in oklch, oklch(100% none 60deg), oklch(50% 50% 0deg))', 'oklch(0.75 0.2 30)'],
['color-mix(in oklch, oklch(100% none 60deg), oklch(50% 50% 0deg))', 'oklch(0.75 0.2 0)'],

// Analogous sets
['color-mix(in oklch, rgb(none none none), oklch(0.5 0.2 50))', 'oklch(0.5 0.2 50)'],
Expand Down
Loading
Loading