Fixed grid and grid-gap ordering #137

FlorianRappl · FlorianRappl · commit 12f61a15d1a6 · 2023-06-14T20:54:10.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Released on tbd.
 - Fixed issue with appended EOF character in `CssText` (#123)
 - Fixed missing semicolon in `@page` rule (#135)
 - Fixed integer serialization of keyframe stops (#128)
+- Fixed ordering of rows and columns in `grid` and `grid-gap` (#137)
 
 # 0.17.0
 
diff --git a/src/AngleSharp.Css.Tests/Declarations/CssGridProperty.cs b/src/AngleSharp.Css.Tests/Declarations/CssGridProperty.cs
@@ -909,5 +909,21 @@ public void CssGridTemplateLonghands_Issue68()
             var style = ParseDeclarations(snippet);
             Assert.AreEqual("grid-template: none", style.CssText);
         }
+
+        [Test]
+        public void CssGridPreservesParts_Issue137()
+        {
+            var snippet = "grid: 10px / 80px";
+            var style = ParseDeclarations(snippet);
+            Assert.AreEqual("grid: 10px / 80px", style.CssText);
+        }
+
+        [Test]
+        public void CssGridGapPreservesParts_Issue137()
+        {
+            var snippet = "grid-gap: 10px 80px";
+            var style = ParseDeclarations(snippet);
+            Assert.AreEqual("grid-gap: 10px 80px", style.CssText);
+        }
     }
 }
diff --git a/src/AngleSharp.Css/Declarations/GapDeclaration.cs b/src/AngleSharp.Css/Declarations/GapDeclaration.cs
@@ -30,8 +30,8 @@ sealed class GapAggregagtor : IValueAggregator, IValueConverter
 
             public ICssValue Merge(ICssValue[] values)
             {
-                var col = values[0];
-                var row = values[1];
+                var row = values[0];
+                var col = values[1];
 
                 if (row != null || col != null)
                 {
diff --git a/src/AngleSharp.Css/Declarations/GridDeclaration.cs b/src/AngleSharp.Css/Declarations/GridDeclaration.cs
@@ -6,6 +6,7 @@ namespace AngleSharp.Css.Declarations
     using AngleSharp.Text;
     using System;
     using System.Collections.Generic;
+    using System.Linq;
 
     static class GridDeclaration
     {
@@ -37,11 +38,11 @@ public ICssValue Convert(StringSource source)
             {
                 var template = source.ParseGridTemplate();
 
-                if (template == null)
+                if (template is null)
                 {
                     var rows = source.ParseTrackList() ?? source.ParseAutoTrackList();
 
-                    if (rows != null)
+                    if (rows is not null)
                     {
                         if (source.SkipSpacesAndComments() == Symbols.Solidus)
                         {
@@ -153,30 +154,30 @@ public ICssValue[] Split(ICssValue value)
                         gt.TemplateRows,
                         gt.TemplateColumns,
                         gt.TemplateAreas,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
+                        null, //new Identifier(CssKeywords.Auto),
+                        null, //new Identifier(CssKeywords.Auto),
+                        null, //new Identifier(CssKeywords.Row),
+                        null, //Length.Zero,
+                        null, //Length.Zero,
+                        null, //new Identifier(CssKeywords.Normal),
+                        null, //new Identifier(CssKeywords.Normal),
                     };
                 }
                 else if (value is CssGridValue grid)
                 {
-                    var dense = grid.Rows != null ? CssKeywords.Row : CssKeywords.Column;
+                    var dense = grid.Rows is not null ? CssKeywords.Row : CssKeywords.Column;
                     return new[]
                     {
                         grid.Rows,
                         grid.Columns,
-                        null,
-                        grid.Columns != null ? new CssTupleValue(grid.Sizes) : null,
-                        grid.Rows != null ? new CssTupleValue(grid.Sizes) : null,
-                        grid.IsDense ? new Identifier(dense) as ICssValue : null,
-                        null,
-                        null,
-                        null,
-                        null,
+                        null, //new Identifier(CssKeywords.None),
+                        grid.Columns is not null ? new CssTupleValue(grid.Sizes) : null, //new Identifier(CssKeywords.Auto),
+                        grid.Rows is not null ? new CssTupleValue(grid.Sizes) : null, //new Identifier(CssKeywords.Auto),
+                        grid.IsDense ? new Identifier(dense) : null,
+                        null, //Length.Zero,
+                        null, //Length.Zero,
+                        null, //new Identifier(CssKeywords.Normal),
+                        null, //new Identifier(CssKeywords.Normal),
                     };
                 }
                 else if (value is Identifier)
@@ -186,13 +187,13 @@ public ICssValue[] Split(ICssValue value)
                         value,
                         value,
                         value,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
-                        null,
+                        null, //new Identifier(CssKeywords.Auto),
+                        null, //new Identifier(CssKeywords.Auto),
+                        null, //new Identifier(CssKeywords.Row),
+                        null, //Length.Zero,
+                        null, //Length.Zero,
+                        null, //new Identifier(CssKeywords.Normal),
+                        null, //new Identifier(CssKeywords.Normal),
                     };
                 }
 
diff --git a/src/AngleSharp.Css/Declarations/GridGapDeclaration.cs b/src/AngleSharp.Css/Declarations/GridGapDeclaration.cs
@@ -30,8 +30,8 @@ sealed class GridGapAggregagtor : IValueAggregator, IValueConverter
 
             public ICssValue Merge(ICssValue[] values)
             {
-                var col = values[0];
-                var row = values[1];
+                var row = values[0];
+                var col = values[1];
 
                 if (row != null || col != null)
                 {
diff --git a/src/AngleSharp.Css/Declarations/GridTemplateAreasDeclaration.cs b/src/AngleSharp.Css/Declarations/GridTemplateAreasDeclaration.cs
@@ -11,6 +11,7 @@ static class GridTemplateAreasDeclaration
 
         public static readonly String[] Shorthands = new[]
         {
+            PropertyNames.Grid,
             PropertyNames.GridTemplate,
         };
 
diff --git a/src/AngleSharp.Css/Declarations/GridTemplateColumnsDeclaration.cs b/src/AngleSharp.Css/Declarations/GridTemplateColumnsDeclaration.cs
@@ -10,6 +10,7 @@ static class GridTemplateColumnsDeclaration
 
         public static readonly String[] Shorthands = new[]
         {
+            PropertyNames.Grid,
             PropertyNames.GridTemplate,
         };
 
diff --git a/src/AngleSharp.Css/Dom/Internal/CssStyleDeclaration.cs b/src/AngleSharp.Css/Dom/Internal/CssStyleDeclaration.cs
@@ -175,7 +175,7 @@ public String ToCssBlock(IStyleFormatter formatter)
                             var usedProperties = new List<String>();
                             var shorthand = TryCreateShorthand(shorthandName, serialized, usedProperties, false);
 
-                            if (shorthand != null)
+                            if (shorthand is not null)
                             {
                                 list.Add(shorthand);
 
@@ -278,17 +278,17 @@ public void SetProperty(String propertyName, String propertyValue, String priori
             
             if (!String.IsNullOrEmpty(propertyValue))
             {
-                if (priority == null || priority.Isi(CssKeywords.Important))
+                if (priority is null || priority.Isi(CssKeywords.Important))
                 {
                     var property = CreateProperty(propertyName);
 
-                    if (property != null)
+                    if (property is not null)
                     {
                         property.Value = propertyValue;
 
-                        if (property.RawValue != null)
+                        if (property.RawValue is not null)
                         {
-                            property.IsImportant = priority != null;
+                            property.IsImportant = priority is not null;
                             SetProperty(property);
                             RaiseChanged();
                         }
@@ -421,7 +421,7 @@ private void SetShorthand(ICssProperty shorthand)
         {
             var properties = _context.CreateLonghands(shorthand);
 
-            if (properties != null)
+            if (properties is not null)
             {
                 foreach (var property in properties)
                 {

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ sealed class GapAggregagtor : IValueAggregator, IValueConverter`
`30`	`30`
`31`	`31`	`public ICssValue Merge(ICssValue[] values)`
`32`	`32`	`{`
`33`		`- var col = values[0];`
`34`		`- var row = values[1];`
	`33`	`+ var row = values[0];`
	`34`	`+ var col = values[1];`
`35`	`35`
`36`	`36`	`if (row != null \|\| col != null)`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ sealed class GridGapAggregagtor : IValueAggregator, IValueConverter`
`30`	`30`
`31`	`31`	`public ICssValue Merge(ICssValue[] values)`
`32`	`32`	`{`
`33`		`- var col = values[0];`
`34`		`- var row = values[1];`
	`33`	`+ var row = values[0];`
	`34`	`+ var col = values[1];`
`35`	`35`
`36`	`36`	`if (row != null \|\| col != null)`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ static class GridTemplateAreasDeclaration`
`11`	`11`
`12`	`12`	`public static readonly String[] Shorthands = new[]`
`13`	`13`	`{`
	`14`	`+ PropertyNames.Grid,`
`14`	`15`	`PropertyNames.GridTemplate,`
`15`	`16`	`};`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ static class GridTemplateColumnsDeclaration`
`10`	`10`
`11`	`11`	`public static readonly String[] Shorthands = new[]`
`12`	`12`	`{`
	`13`	`+ PropertyNames.Grid,`
`13`	`14`	`PropertyNames.GridTemplate,`
`14`	`15`	`};`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public String ToCssBlock(IStyleFormatter formatter)`
`175`	`175`	`var usedProperties = new List<String>();`
`176`	`176`	`var shorthand = TryCreateShorthand(shorthandName, serialized, usedProperties, false);`
`177`	`177`
`178`		`- if (shorthand != null)`
	`178`	`+ if (shorthand is not null)`
`179`	`179`	`{`
`180`	`180`	`list.Add(shorthand);`
`181`	`181`
`@@ -278,17 +278,17 @@ public void SetProperty(String propertyName, String propertyValue, String priori`
`278`	`278`
`279`	`279`	`if (!String.IsNullOrEmpty(propertyValue))`
`280`	`280`	`{`
`281`		`- if (priority == null \|\| priority.Isi(CssKeywords.Important))`
	`281`	`+ if (priority is null \|\| priority.Isi(CssKeywords.Important))`
`282`	`282`	`{`
`283`	`283`	`var property = CreateProperty(propertyName);`
`284`	`284`
`285`		`- if (property != null)`
	`285`	`+ if (property is not null)`
`286`	`286`	`{`
`287`	`287`	`property.Value = propertyValue;`
`288`	`288`
`289`		`- if (property.RawValue != null)`
	`289`	`+ if (property.RawValue is not null)`
`290`	`290`	`{`
`291`		`- property.IsImportant = priority != null;`
	`291`	`+ property.IsImportant = priority is not null;`
`292`	`292`	`SetProperty(property);`
`293`	`293`	`RaiseChanged();`
`294`	`294`	`}`
`@@ -421,7 +421,7 @@ private void SetShorthand(ICssProperty shorthand)`
`421`	`421`	`{`
`422`	`422`	`var properties = _context.CreateLonghands(shorthand);`
`423`	`423`
`424`		`- if (properties != null)`
	`424`	`+ if (properties is not null)`
`425`	`425`	`{`
`426`	`426`	`foreach (var property in properties)`
`427`	`427`	`{`