Skip to content

fix: should not panic when passing system-color to color-mix #819

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
devongovett merged 1 commit into from
Nov 3, 2024
Merged

fix: should not panic when passing system-color to color-mix #819

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
8 changes: 8 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19311,6 +19311,14 @@ mod tests {
".foo { color: color-mix(in srgb, blue, currentColor); }",
".foo{color:color-mix(in srgb,blue,currentColor)}",
);
minify_test(
".foo { color: color-mix(in srgb, accentcolor, blue); }",
".foo{color:color-mix(in srgb,accentcolor,blue)}",
);
minify_test(
".foo { color: color-mix(in srgb, blue, accentcolor); }",
".foo{color:color-mix(in srgb,blue,accentcolor)}",
);

// regex for converting web platform tests:
// test_computed_value\(.*?, `(.*?)`, `(.*?)`\);
Expand Down
4 changes: 3 additions & 1 deletion src/values/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3253,7 +3253,9 @@ impl CssColor {
+ From<OKLCH>
+ Copy,
{
if matches!(self, CssColor::CurrentColor) || matches!(other, CssColor::CurrentColor) {
if matches!(self, CssColor::CurrentColor | CssColor::System(..))
|| matches!(other, CssColor::CurrentColor | CssColor::System(..))
{
return Err(());
Copy link
Contributor

@toastal toastal Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean you get an error instead of panic? Does the minify_test imply that this will now ‘work’ by not apply but keeping the existing colors in color-mix in this case? I don’t know Rust…

Copy link
Member

@devongovett devongovett Nov 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it'll fall back to an unparsed property, which will preserve the original source as is.

}

Expand Down