Skip to content
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.

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

Fix bugs caught by to-gamut() tests #2227

Merged
merged 1 commit into from Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/src/value/color/gamut_map_method/local_minde.dart
Expand Up @@ -33,12 +33,11 @@ final class LocalMindeGamutMap extends GamutMapMethod {
var alpha = originOklch.alphaOrNull;

if (fuzzyGreaterThanOrEquals(lightness ?? 0, 1)) {
return color.space == ColorSpace.rgb
? SassColor.rgb(255, 255, 255, color.alphaOrNull)
return color.isLegacy
? SassColor.rgb(255, 255, 255, color.alphaOrNull).toSpace(color.space)
: SassColor.forSpaceInternal(color.space, 1, 1, 1, color.alphaOrNull);
} else if (fuzzyLessThanOrEquals(lightness ?? 0, 0)) {
return SassColor.forSpaceInternal(
color.space, 0, 0, 0, color.alphaOrNull);
return SassColor.rgb(0, 0, 0, color.alphaOrNull).toSpace(color.space);
}

var clipped = color.toGamut(GamutMapMethod.clip);
Expand Down
10 changes: 6 additions & 4 deletions lib/src/visitor/serialize.dart
Expand Up @@ -608,14 +608,16 @@ final class _SerializeVisitor
_maybeWriteSlashAlpha(value);
_buffer.writeCharCode($rparen);

case ColorSpace.lab ||
ColorSpace.oklab ||
ColorSpace.lch ||
ColorSpace.oklch
case ColorSpace.lab || ColorSpace.lch
when !_inspect &&
!fuzzyInRange(value.channel0, 0, 100) &&
!value.isChannel1Missing &&
!value.isChannel2Missing:
case ColorSpace.oklab || ColorSpace.oklch
when !_inspect &&
!fuzzyInRange(value.channel0, 0, 1) &&
!value.isChannel1Missing &&
!value.isChannel2Missing:
case ColorSpace.lch || ColorSpace.oklch
when !_inspect &&
fuzzyLessThan(value.channel1, 0) &&
Expand Down