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

sass · Apr 24, 2024 · 9fb49b0 · 9fb49b0
1 parent 440430d
commit 9fb49b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/src/value/color/gamut_map_method/local_minde.dart b/lib/src/value/color/gamut_map_method/local_minde.dart
@@ -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);

diff --git a/lib/src/visitor/serialize.dart b/lib/src/visitor/serialize.dart
@@ -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) &&