Merge pull request #175 from BoricuaEnLaLuna/fixFontDefaultValues

Expose font default values
TylerBrinks · Feb 12, 2024 · 35fb718 · 35fb718
2 parents fb8266d + 8e5ab83
commit 35fb718
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/ExCSS.Tests/FontProperty.cs b/src/ExCSS.Tests/FontProperty.cs
@@ -734,6 +734,48 @@ public void CssFontSystemFamilyLegal()
             Assert.Equal("status-bar", concrete.Value);
         }
 
+        [Fact]
+        public void CssFontInitialAll()
+        {
+            var snippet = "font: initial ";
+            var property = ParseDeclaration(snippet);
+            Assert.Equal("font", property.Name);
+            Assert.False(property.IsImportant);
+            Assert.IsType<FontProperty>(property);
+            var concrete = (FontProperty)property;
+            Assert.True(concrete.IsInherited);
+            Assert.True(concrete.HasValue);
+            Assert.Equal("initial", concrete.Value);
+        }
+
+        [Fact]
+        public void CssFontInheritAll()
+        {
+            var snippet = "font: inherit ";
+            var property = ParseDeclaration(snippet);
+            Assert.Equal("font", property.Name);
+            Assert.False(property.IsImportant);
+            Assert.IsType<FontProperty>(property);
+            var concrete = (FontProperty)property;
+            Assert.True(concrete.IsInherited);
+            Assert.True(concrete.HasValue);
+            Assert.Equal("inherit", concrete.Value);
+        }
+
+        [Fact]
+        public void CssFontUnsetAll()
+        {
+            var snippet = "font: unset ";
+            var property = ParseDeclaration(snippet);
+            Assert.Equal("font", property.Name);
+            Assert.False(property.IsImportant);
+            Assert.IsType<FontProperty>(property);
+            var concrete = (FontProperty)property;
+            Assert.False(concrete.IsInherited);
+            Assert.True(concrete.HasValue);
+            Assert.Equal("unset", concrete.Value);
+        }
+
         [Fact]
         public void CssFontFaceWithThreeRulesShouldSerializeCorrectly()
         {

diff --git a/src/ExCSS/StyleProperties/Font/FontProperty.cs b/src/ExCSS/StyleProperties/Font/FontProperty.cs
@@ -13,8 +13,9 @@ internal sealed class FontProperty : ShorthandProperty
             WithOrder(
                 FontSizeConverter.Required().For(PropertyNames.FontSize),
                 LineHeightConverter.StartsWithDelimiter().Option().For(PropertyNames.LineHeight),
-                FontFamiliesConverter.Required().For(PropertyNames.FontFamily))).Or(
-            SystemFontConverter);
+                FontFamiliesConverter.Required().For(PropertyNames.FontFamily)))
+            .Or(SystemFontConverter)
+            .OrGlobalValue();
 
         internal FontProperty()
             : base(PropertyNames.Font, PropertyFlags.Inherited | PropertyFlags.Animatable)