Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/AngleSharp.Css.Tests/Functions/CssColorFunction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,28 @@ public void ParseOklabToRgb_Second()
Assert.AreEqual("rgba(198, 93, 7, 1)", color);
}

[Test]
public void ParseOklabNumberToRgb_First()
{
var html = @"<p style='color: oklab(0.401 0.1143 0.045)'>Text</p>";
var dom = ParseDocument(html);
var p = dom.QuerySelector("p");
var s = p.GetStyle();
var color = s.GetColor();
Assert.AreEqual("rgba(125, 35, 40, 1)", color);
}

[Test]
public void ParseOklabNumberToRgb_Second()
{
var html = @"<p style='color: oklab(0.5969 0.1007 0.1191);'>Text</p>";
var dom = ParseDocument(html);
var p = dom.QuerySelector("p");
var s = p.GetStyle();
var color = s.GetColor();
Assert.AreEqual("rgba(198, 93, 7, 1)", color);
}

[Test]
public void ParseOklabToRgb_Alpha()
{
Expand Down Expand Up @@ -108,6 +130,28 @@ public void ParseOklchToRgb_Second()
Assert.AreEqual("rgba(198, 93, 7, 1)", color);
}

[Test]
public void ParseOklchNumberToRgb_First()
{
var html = @"<p style='color: oklch(0.401 0.123 21.57)'>Text</p>";
var dom = ParseDocument(html);
var p = dom.QuerySelector("p");
var s = p.GetStyle();
var color = s.GetColor();
Assert.AreEqual("rgba(125, 35, 40, 1)", color);
}

[Test]
public void ParseOklchNumberToRgb_Second()
{
var html = @"<p style='color: oklch(0.5969 0.156 49.77)'>Text</p>";
var dom = ParseDocument(html);
var p = dom.QuerySelector("p");
var s = p.GetStyle();
var color = s.GetColor();
Assert.AreEqual("rgba(198, 93, 7, 1)", color);
}

[Test]
public void ParseOklchToRgb_Alpha()
{
Expand Down
8 changes: 4 additions & 4 deletions src/AngleSharp.Css/Parser/Micro/ColorParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ static class ColorParser

private static CssColorValue? ParseOklab(StringSource source)
{
var l = ParseLabComponent(source);
var l = ParseLabComponent(source, numberScale: 100.0);
source.SkipSpacesAndComments();
var a = ParseLabComponent(source);
source.SkipSpacesAndComments();
Expand Down Expand Up @@ -324,7 +324,7 @@ static class ColorParser

private static CssColorValue? ParseOklch(StringSource source)
{
var l = ParseLabComponent(source);
var l = ParseLabComponent(source, numberScale: 100.0);
source.SkipSpacesAndComments();
var c = ParseLabComponent(source);
source.SkipSpacesAndComments();
Expand Down Expand Up @@ -385,7 +385,7 @@ static class ColorParser
return null;
}

private static Double? ParseLabComponent(StringSource source)
private static Double? ParseLabComponent(StringSource source, Double numberScale = 1.0)
{
var pos = source.Index;
var unit = source.ParseUnit();
Expand All @@ -404,7 +404,7 @@ static class ColorParser

if ((unit.Dimension == String.Empty || unit.Dimension == "%") && Double.TryParse(unit.Value, NumberStyles.Float, CultureInfo.InvariantCulture, out var value))
{
return value;
return unit.Dimension == String.Empty ? value * numberScale : value;
}

return null;
Expand Down
Loading