Skip to content

Commit 9fb49b0

Browse files
authored
Fix bugs caught by to-gamut() tests (#2227)
1 parent 440430d commit 9fb49b0

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

lib/src/value/color/gamut_map_method/local_minde.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ final class LocalMindeGamutMap extends GamutMapMethod {
3333
var alpha = originOklch.alphaOrNull;
3434

3535
if (fuzzyGreaterThanOrEquals(lightness ?? 0, 1)) {
36-
return color.space == ColorSpace.rgb
37-
? SassColor.rgb(255, 255, 255, color.alphaOrNull)
36+
return color.isLegacy
37+
? SassColor.rgb(255, 255, 255, color.alphaOrNull).toSpace(color.space)
3838
: SassColor.forSpaceInternal(color.space, 1, 1, 1, color.alphaOrNull);
3939
} else if (fuzzyLessThanOrEquals(lightness ?? 0, 0)) {
40-
return SassColor.forSpaceInternal(
41-
color.space, 0, 0, 0, color.alphaOrNull);
40+
return SassColor.rgb(0, 0, 0, color.alphaOrNull).toSpace(color.space);
4241
}
4342

4443
var clipped = color.toGamut(GamutMapMethod.clip);

lib/src/visitor/serialize.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,14 +608,16 @@ final class _SerializeVisitor
608608
_maybeWriteSlashAlpha(value);
609609
_buffer.writeCharCode($rparen);
610610

611-
case ColorSpace.lab ||
612-
ColorSpace.oklab ||
613-
ColorSpace.lch ||
614-
ColorSpace.oklch
611+
case ColorSpace.lab || ColorSpace.lch
615612
when !_inspect &&
616613
!fuzzyInRange(value.channel0, 0, 100) &&
617614
!value.isChannel1Missing &&
618615
!value.isChannel2Missing:
616+
case ColorSpace.oklab || ColorSpace.oklch
617+
when !_inspect &&
618+
!fuzzyInRange(value.channel0, 0, 1) &&
619+
!value.isChannel1Missing &&
620+
!value.isChannel2Missing:
619621
case ColorSpace.lch || ColorSpace.oklch
620622
when !_inspect &&
621623
fuzzyLessThan(value.channel1, 0) &&

0 commit comments

Comments
 (0)