Skip to content

fix(native): handle omitted percentages in color-mix and register color spaces #457

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
Wadiou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(native): handle omitted percentages in color-mix and register color spaces #457

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
22 changes: 22 additions & 0 deletions src/__tests__/native/color-mix.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,28 @@ test("color-mix() - oklch", () => {
});
});

test("color-mix() - hsl", () => {
registerCSS(
`.test {
--bg: hsl(0 100% 50%);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--bg) 50%, transparent);
}
}
`,
{
inlineVariables: false,
},
);

render(<View testID={testID} className="test" />);
const component = screen.getByTestId(testID);

expect(component.props.style).toStrictEqual({
backgroundColor: "rgba(255, 0, 0, 0.5)",
});
});

test("color-mix() - black with transparent (NaN oklab channels)", () => {
// lightningcss resolves this at compile time to oklab(0 NaN NaN / 0.5):
// black is oklab [l=0, a=0, b=0] and transparent has no chromaticity, so the
Expand Down
35 changes: 22 additions & 13 deletions src/native/styles/functions/color-mix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import {
ColorSpace,
to as convert,
HSL,
Lab,
LCH,
mix,
OKLab,
OKLCH,
P3,
parse,
sRGB,
Expand All @@ -13,6 +17,10 @@ import type { StyleFunctionResolver } from "../resolve";
ColorSpace.register(sRGB);
ColorSpace.register(P3);
ColorSpace.register(OKLab);
ColorSpace.register(OKLCH);
ColorSpace.register(HSL);
ColorSpace.register(Lab);
ColorSpace.register(LCH);

export const colorMix: StyleFunctionResolver = (resolveValue, value) => {
const resolved = resolveValue(value[2]);
Expand All @@ -21,23 +29,24 @@ export const colorMix: StyleFunctionResolver = (resolveValue, value) => {
// Resolved descriptors may be cached and shared by another styled component.
const args: unknown[] = [...(resolved as unknown[])];
try {
const space = args.shift();
const leftValue = args.shift();
if (typeof space !== "string" || typeof leftValue !== "string") return;
if (args.length > 5) return;
const [space, leftValue, leftPct, rightValue, rightPct] = args;
if (
typeof space !== "string" ||
typeof leftValue !== "string" ||
typeof rightValue !== "string"
) {
return;
}
ColorSpace.get(space);
const left = parse(leftValue);
const percentage = () => {
const next = args[0];
if (typeof next !== "string" || !next.endsWith("%")) return undefined;
args.shift();
return Number(next.slice(0, -1)) / 100;
const parseWeight = (val: unknown) => {
if (typeof val !== "string" || !val.endsWith("%")) return undefined;
return Number(val.slice(0, -1)) / 100;
};
let leftWeight = percentage();
const rightValue = args.shift();
if (typeof rightValue !== "string") return;
let leftWeight = parseWeight(leftPct);
const right = parse(rightValue);
let rightWeight = percentage();
if (args.length) return;
let rightWeight = parseWeight(rightPct);

// CSS Color 5: omitted weights are complementary, then both are normalized.
leftWeight ??= rightWeight === undefined ? 0.5 : 1 - rightWeight;
Expand Down