Added Support for @container rules and comparison operators defined in media queries level 4

cwall-dev · cwall-dev · commit 964aea28378c · 2024-10-21T13:35:45.000+02:00
diff --git a/src/ExCSS.Tests/Container.cs b/src/ExCSS.Tests/Container.cs
@@ -0,0 +1,103 @@
+﻿namespace ExCSS.Tests
+{
+    using ExCSS;
+    using Xunit;
+    using System.Linq;
+
+    public class CssContainerTests : CssConstructionFunctions
+    {
+        [Fact]
+        public void SimpleContainer()
+        {
+            const string source = "@container tall (min-width: 500px) and (min-height: 300px) {h2 { line-height: 1.6; } }";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            var rule = result.Rules[0] as ContainerRule;
+            Assert.NotNull(rule);
+            Assert.Equal("@container tall (min-width: 500px) and (min-height: 300px) { h2 { line-height: 1.6 } }", rule.Text);
+            Assert.Equal("tall", rule.Name);
+            Assert.Equal("(min-width: 500px) and (min-height: 300px)", rule.ConditionText);
+            var childRule = rule.Children.OfType<StyleRule>().First();
+            Assert.Equal("h2 { line-height: 1.6 }", childRule.ToCss());
+        }
+
+        [Fact]
+        public void ContainerWithoutName()
+        {
+            const string source = "@container (min-width: 500px) and (min-height: 300px) {h2 { line-height: 1.6; } }";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            var rule = result.Rules[0] as ContainerRule;
+            Assert.NotNull(rule);
+            Assert.Equal("@container (min-width: 500px) and (min-height: 300px) { h2 { line-height: 1.6 } }", rule.Text);
+            Assert.Equal(string.Empty, rule.Name);
+            Assert.Equal("(min-width: 500px) and (min-height: 300px)", rule.ConditionText);
+            var childRule = rule.Children.OfType<StyleRule>().First();
+            Assert.Equal("h2 { line-height: 1.6 }", childRule.ToCss());
+        }
+
+        [Fact]
+        public void ContainerWithoutCondition()
+        {
+            const string source = "@container tall {h2 { line-height: 1.6; } }";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            var rule = result.Rules[0] as ContainerRule;
+            Assert.NotNull(rule);
+            Assert.Equal("@container tall { h2 { line-height: 1.6 } }", rule.Text);
+            Assert.Equal("tall", rule.Name);
+            Assert.Equal(string.Empty, rule.ConditionText);
+            var childRule = rule.Children.OfType<StyleRule>().First();
+            Assert.Equal("h2 { line-height: 1.6 }", childRule.ToCss());
+        }
+
+        [Fact]
+        public void ContainerWithComparisonOperators()
+        {
+            const string source = "@container tall (width < 500px) and (height >= 300px) {h2 { line-height: 1.6; } }";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            var rule = result.Rules[0] as ContainerRule;
+            Assert.NotNull(rule);
+            Assert.Equal("@container tall (width < 500px) and (height >= 300px) { h2 { line-height: 1.6 } }", rule.Text);
+            Assert.Equal("tall", rule.Name);
+            Assert.Equal("(width < 500px) and (height >= 300px)", rule.ConditionText);
+            var childRule = rule.Children.OfType<StyleRule>().First();
+            Assert.Equal("h2 { line-height: 1.6 }", childRule.ToCss());
+        }
+
+        [Fact]
+        public void CSSWithTwoContainers()
+        {
+            const string source = @"li {
+  container-type: inline-size;
+}
+
+@container (min-width: 45ch) {
+  li span {
+    color: rgb(255, 0, 0);
+    font-size: 2rem !important;
+  }
+}
+
+@container (min-width: 70ch) {
+  li span {
+    color: rgb(0, 0, 255);
+    font-size: 3rem !important;
+  }
+}";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            Assert.Equal(3, result.Rules.Length);
+            var rule1 = result.Rules[0] as StyleRule;
+            var rule2 = result.Rules[1] as ContainerRule;
+            var rule3 = result.Rules[2] as ContainerRule;
+            Assert.NotNull(rule1);
+            Assert.NotNull(rule2);
+            Assert.NotNull(rule3);
+            Assert.Equal("li { container-type: inline-size }", rule1.ToCss());
+            Assert.Equal("@container (min-width: 45ch) { li span { color: rgb(255, 0, 0); font-size: 2rem !important } }", rule2.ToCss());
+            Assert.Equal("@container (min-width: 70ch) { li span { color: rgb(0, 0, 255); font-size: 3rem !important } }", rule3.ToCss());
+        }
+    }
+}
diff --git a/src/ExCSS.Tests/MediaList.cs b/src/ExCSS.Tests/MediaList.cs
@@ -3,7 +3,7 @@
     using ExCSS;
     using Xunit;
     using System;
-    
+
     public class CssMediaListTests : CssConstructionFunctions
     {
         [Fact]
@@ -375,21 +375,48 @@ public void ImplicitAllFeatureMinResolutionAndMaxResolutionMediaList()
         [Fact]
         public void CssMediaListApiWithAppendDeleteAndTextShouldWork()
         {
-            var media = new [] { "handheld", "screen", "only screen and (max-device-width: 480px)" };
+            var media = new[] { "handheld", "screen", "only screen and (max-device-width: 480px)" };
             var p = new StylesheetParser();
-		    var m = new MediaList(p);
+            var m = new MediaList(p);
             Assert.Equal(0, m.Length);
 
-		    m.Add(media[0]);
-		    m.Add(media[1]);
-		    m.Add(media[2]);
+            m.Add(media[0]);
+            m.Add(media[1]);
+            m.Add(media[2]);
 
-		    m.Remove(media[1]);
+            m.Remove(media[1]);
 
             Assert.Equal(2, m.Length);
             Assert.Equal(media[0], m[0]);
             Assert.Equal(media[2], m[1]);
             Assert.Equal(String.Concat(media[0], ", ", media[2]), m.MediaText);
         }
+
+        [Fact]
+        public void CombinedConditionMediaQueriesLevel4()
+        {
+            const string source = @"/* Traditionelle Syntax */
+@media (min-height: 500px) and (max-height: 800px) {
+  /* Styles */
+  h1 { color: rgb(255, 0, 0); }
+}
+
+/* Mit Vergleichsoperatoren */
+@media (height >= 500px) and (height <= 800px) {
+  /* Gleiche Styles */
+  h1 { color: rgb(255, 0, 0); }
+}";
+            var result = ParseStyleSheet(source);
+            Assert.Equal(source, result.StylesheetText.Text);
+            Assert.Equal(2, result.Rules.Length);
+            var rule1 = result.Rules[0] as MediaRule;
+            var rule2 = result.Rules[1] as MediaRule;
+            Assert.NotNull(rule1);
+            Assert.NotNull(rule2);
+            Assert.Equal("(min-height: 500px) and (max-height: 800px)", rule1.ConditionText);
+            Assert.Equal("(height >= 500px) and (height <= 800px)", rule2.ConditionText);
+            Assert.Equal("@media (min-height: 500px) and (max-height: 800px) { h1 { color: rgb(255, 0, 0) } }", rule1.ToCss());
+            Assert.Equal("@media (height >= 500px) and (height <= 800px) { h1 { color: rgb(255, 0, 0) } }", rule2.ToCss());
+        }
     }
 }
diff --git a/src/ExCSS/Enumerations/ContainerType.cs b/src/ExCSS/Enumerations/ContainerType.cs
@@ -0,0 +1,9 @@
+﻿namespace ExCSS
+{
+    public enum ContainerType : byte
+    {
+        Normal,
+        Size,
+        InlineSize
+    }
+}
diff --git a/src/ExCSS/Enumerations/FeatureNames.cs b/src/ExCSS/Enumerations/FeatureNames.cs
@@ -42,5 +42,7 @@ public static class FeatureNames
         public static readonly string Scripting = "scripting";
         public static readonly string Pointer = "pointer";
         public static readonly string Hover = "hover";
+        public static readonly string BlockSize = "block-size";
+        public static readonly string InlineSize = "inline-size";
     }
 }
diff --git a/src/ExCSS/Enumerations/Keywords.cs b/src/ExCSS/Enumerations/Keywords.cs
@@ -310,5 +310,7 @@ internal static class Keywords
         public static readonly string Last = "last";
         public static readonly string SelfStart = "self-start";
         public static readonly string SelfEnd = "self-end";
+        public static readonly string Size = "size";
+        public static readonly string InlineSize = "inline-size";
     }
 }
diff --git a/src/ExCSS/Enumerations/PropertyNames.cs b/src/ExCSS/Enumerations/PropertyNames.cs
@@ -91,6 +91,8 @@ public static class PropertyNames
         public static readonly string ClipRule = "clip-rule";
         public static readonly string Color = "color";
         public static readonly string ColorInterpolationFilters = "color-interpolation-filters";
+        public static readonly string ContainerName= "container-name";
+        public static readonly string ContainerType = "container-type";
         public static readonly string Content = "content";
         public static readonly string CounterIncrement = "counter-increment";
         public static readonly string CounterReset = "counter-reset";
diff --git a/src/ExCSS/Enumerations/RuleNames.cs b/src/ExCSS/Enumerations/RuleNames.cs
@@ -12,5 +12,6 @@ public static class RuleNames
         public static readonly string Media = "media";
         public static readonly string Namespace = "namespace";
         public static readonly string Page = "page";
+        public static readonly string Container = "container";
     }
 }
diff --git a/src/ExCSS/Enumerations/RuleType.cs b/src/ExCSS/Enumerations/RuleType.cs
@@ -18,6 +18,7 @@ public enum RuleType : byte
         Document,
         FontFeatureValues,
         Viewport,
-        RegionStyle
+        RegionStyle,
+        Container
     }
 }
diff --git a/src/ExCSS/Enumerations/TokenType.cs b/src/ExCSS/Enumerations/TokenType.cs
@@ -29,6 +29,11 @@ internal enum TokenType : byte
         Comma,
         Semicolon,
         Whitespace,
-        EndOfFile
+        EndOfFile,
+        GreaterThan,
+        GreaterThanOrEqual,
+        LessThan,
+        LessThanOrEqual,
+        Equal
     }
 }
diff --git a/src/ExCSS/Factories/MediaFeatureFactory.cs b/src/ExCSS/Factories/MediaFeatureFactory.cs
@@ -60,7 +60,9 @@ internal sealed class MediaFeatureFactory
                 {FeatureNames.UpdateFrequency, () => new UpdateFrequencyMediaFeature()},
                 {FeatureNames.Scripting, () => new ScriptingMediaFeature()},
                 {FeatureNames.Pointer, () => new PointerMediaFeature()},
-                {FeatureNames.Hover, () => new HoverMediaFeature()}
+                {FeatureNames.Hover, () => new HoverMediaFeature()},
+                {FeatureNames.InlineSize, () => new SizeMediaFeature(FeatureNames.InlineSize)},
+                {FeatureNames.BlockSize, () => new SizeMediaFeature(FeatureNames.BlockSize)},
             };
 
         #endregion
diff --git a/src/ExCSS/Factories/PropertyFactory.cs b/src/ExCSS/Factories/PropertyFactory.cs
@@ -173,6 +173,8 @@ private PropertyFactory()
             AddLonghand(PropertyNames.Clear, () => new ClearProperty());
             AddLonghand(PropertyNames.Clip, () => new ClipProperty(), true);
             AddLonghand(PropertyNames.Color, () => new ColorProperty(), true);
+            AddLonghand(PropertyNames.ContainerName, () => new ContainerNameProperty());
+            AddLonghand(PropertyNames.ContainerType, () => new ContainerTypeProperty());
             AddLonghand(PropertyNames.Content, () => new ContentProperty());
             AddLonghand(PropertyNames.CounterIncrement, () => new CounterIncrementProperty());
             AddLonghand(PropertyNames.CounterReset, () => new CounterResetProperty());
diff --git a/src/ExCSS/Formatting/CompressedStyleFormatter.cs b/src/ExCSS/Formatting/CompressedStyleFormatter.cs
@@ -15,9 +15,9 @@ string IStyleFormatter.Declaration(string name, string value, bool important)
             return string.Concat(name, ": ", rest);
         }
 
-        string IStyleFormatter.Constraint(string name, string value)
+        string IStyleFormatter.Constraint(string name, string value, string constraintDelimiter)
         {
-            var ending = value != null ? ": " + value : string.Empty;
+            var ending = value != null ? constraintDelimiter + value : string.Empty;
             return string.Concat("(", name, ending, ")");
         }
 
diff --git a/src/ExCSS/MediaFeatures/MediaFeature.cs b/src/ExCSS/MediaFeatures/MediaFeature.cs
@@ -1,10 +1,12 @@
-﻿using System.IO;
+﻿using System;
+using System.IO;
 
 namespace ExCSS
 {
     public abstract class MediaFeature : StylesheetNode, IMediaFeature
     {
         private TokenValue _tokenValue;
+        private TokenType _constraintDelimiter;
 
         internal MediaFeature(string name)
         {
@@ -27,11 +29,29 @@ internal MediaFeature(string name)
 
         public override void ToCss(TextWriter writer, IStyleFormatter formatter)
         {
+            var constraintDelimiter = GetConstraintDelimiter();
             var value = HasValue ? Value : null;
-            writer.Write(formatter.Constraint(Name, value));
+            writer.Write(formatter.Constraint(Name, value, GetConstraintDelimiter()));
         }
 
-        internal bool TrySetValue(TokenValue tokenValue)
+        private string GetConstraintDelimiter()
+        {
+            if (_constraintDelimiter == TokenType.Colon)
+                return ": ";
+            if (_constraintDelimiter == TokenType.GreaterThan)
+                return " > ";
+            if (_constraintDelimiter == TokenType.LessThan)
+                return " < ";
+            if (_constraintDelimiter == TokenType.Equal)
+                return " = ";
+            if (_constraintDelimiter == TokenType.GreaterThanOrEqual)
+                return " >= ";
+            if (_constraintDelimiter == TokenType.LessThanOrEqual)
+                return " <= ";
+            return ": ";
+        }
+
+        internal bool TrySetValue(TokenValue tokenValue, TokenType constraintDelimiter)
         {
             bool result;
 
@@ -42,6 +62,8 @@ internal bool TrySetValue(TokenValue tokenValue)
 
             if (result) _tokenValue = tokenValue;
 
+            _constraintDelimiter = constraintDelimiter;
+
             return result;
         }
     }
diff --git a/src/ExCSS/MediaFeatures/SizeMediaFeature.cs b/src/ExCSS/MediaFeatures/SizeMediaFeature.cs
@@ -0,0 +1,11 @@
+﻿namespace ExCSS
+{
+    internal sealed class SizeMediaFeature : MediaFeature
+    {
+        public SizeMediaFeature(string name) : base(name)
+        {
+        }
+
+        internal override IValueConverter Converter => Converters.LengthConverter;
+    }
+}
diff --git a/src/ExCSS/Model/Converters.cs b/src/ExCSS/Model/Converters.cs
@@ -264,6 +264,7 @@ public static readonly IValueConverter
         public static readonly IValueConverter OverflowModeConverter = Map.OverflowModes.ToConverter();
         public static readonly IValueConverter FloatingConverter = Map.FloatingModes.ToConverter();
         public static readonly IValueConverter DisplayModeConverter = Map.DisplayModes.ToConverter();
+        public static readonly IValueConverter ContainerTypeConverter = Map.ContainerTypes.ToConverter();
         public static readonly IValueConverter ClearModeConverter = Map.ClearModes.ToConverter();
         public static readonly IValueConverter FontStretchConverter = Map.FontStretches.ToConverter();
         public static readonly IValueConverter FontStyleConverter = Map.FontStyles.ToConverter();
diff --git a/src/ExCSS/Model/IStyleFormatter.cs b/src/ExCSS/Model/IStyleFormatter.cs
@@ -9,7 +9,7 @@ public interface IStyleFormatter
         string Declaration(string name, string value, bool important);
         string Declarations(IEnumerable<string> declarations);
         string Medium(bool exclusive, bool inverse, string type, IEnumerable<IStyleFormattable> constraints);
-        string Constraint(string name, string value);
+        string Constraint(string name, string value, string constraintDelimiter);
         string Rule(string name, string value);
         string Rule(string name, string prelude, string rules);
         string Style(string selector, IStyleFormattable rules);
diff --git a/src/ExCSS/Model/Map.cs b/src/ExCSS/Model/Map.cs
@@ -592,5 +592,13 @@ internal static class Map
                 { Keywords.SelfEnd, AlignItem.SelfEnd },
                 { Keywords.Baseline, AlignItem.Baseline },
             };
+
+        public static readonly Dictionary<string, ContainerType> ContainerTypes =
+            new(StringComparer.OrdinalIgnoreCase)
+            {
+                {Keywords.Normal, ContainerType.Normal},
+                {Keywords.Size, ContainerType.Size},
+                {Keywords.InlineSize, ContainerType.InlineSize}
+            };
     }
 }
diff --git a/src/ExCSS/Model/ParserExtensions.cs b/src/ExCSS/Model/ParserExtensions.cs
@@ -138,6 +138,8 @@ public static Rule CreateRule(this StylesheetParser parser, RuleType type)
                     return new KeyframesRule(parser);
                 case RuleType.Media:
                     return new MediaRule(parser);
+                case RuleType.Container:
+                    return new ContainerRule(parser);
                 case RuleType.Namespace:
                     return new NamespaceRule(parser);
                 case RuleType.Page:
diff --git a/src/ExCSS/Model/StyleDeclaration.cs b/src/ExCSS/Model/StyleDeclaration.cs
@@ -842,6 +842,18 @@ public string ColumnWidth
             set => SetPropertyValue(PropertyNames.ColumnWidth, value);
         }
 
+        public string ContainerName
+        {
+            get => GetPropertyValue(PropertyNames.ContainerName);
+            set => SetPropertyValue(PropertyNames.ContainerName, value);
+        }
+
+        public string ContainerType
+        {
+            get => GetPropertyValue(PropertyNames.ContainerType);
+            set => SetPropertyValue(PropertyNames.ContainerType, value);
+        }
+
         public string Content
         {
             get => GetPropertyValue(PropertyNames.Content);
diff --git a/src/ExCSS/Model/Stylesheet.cs b/src/ExCSS/Model/Stylesheet.cs
diff --git a/src/ExCSS/Model/ValueBuilder.cs b/src/ExCSS/Model/ValueBuilder.cs
diff --git a/src/ExCSS/Parser/Lexer.cs b/src/ExCSS/Parser/Lexer.cs
diff --git a/src/ExCSS/Parser/SelectorConstructor.cs b/src/ExCSS/Parser/SelectorConstructor.cs
diff --git a/src/ExCSS/Parser/StylesheetComposer.cs b/src/ExCSS/Parser/StylesheetComposer.cs
diff --git a/src/ExCSS/Rules/ContainerRule.cs b/src/ExCSS/Rules/ContainerRule.cs
diff --git a/src/ExCSS/Rules/IContainer.cs b/src/ExCSS/Rules/IContainer.cs
diff --git a/src/ExCSS/StyleProperties/Container/ContainerNameProperty.cs b/src/ExCSS/StyleProperties/Container/ContainerNameProperty.cs
diff --git a/src/ExCSS/StyleProperties/Container/ContainerTypeProperty.cs b/src/ExCSS/StyleProperties/Container/ContainerTypeProperty.cs

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,7 @@ public static class FeatureNames`
`42`	`42`	`public static readonly string Scripting = "scripting";`
`43`	`43`	`public static readonly string Pointer = "pointer";`
`44`	`44`	`public static readonly string Hover = "hover";`
	`45`	`+ public static readonly string BlockSize = "block-size";`
	`46`	`+ public static readonly string InlineSize = "inline-size";`
`45`	`47`	`}`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,5 +310,7 @@ internal static class Keywords`
`310`	`310`	`public static readonly string Last = "last";`
`311`	`311`	`public static readonly string SelfStart = "self-start";`
`312`	`312`	`public static readonly string SelfEnd = "self-end";`
	`313`	`+ public static readonly string Size = "size";`
	`314`	`+ public static readonly string InlineSize = "inline-size";`
`313`	`315`	`}`
`314`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public static class RuleNames`
`12`	`12`	`public static readonly string Media = "media";`
`13`	`13`	`public static readonly string Namespace = "namespace";`
`14`	`14`	`public static readonly string Page = "page";`
	`15`	`+ public static readonly string Container = "container";`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public enum RuleType : byte`
`18`	`18`	`Document,`
`19`	`19`	`FontFeatureValues,`
`20`	`20`	`Viewport,`
`21`		`- RegionStyle`
	`21`	`+ RegionStyle,`
	`22`	`+ Container`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ internal enum TokenType : byte`
`29`	`29`	`Comma,`
`30`	`30`	`Semicolon,`
`31`	`31`	`Whitespace,`
`32`		`- EndOfFile`
	`32`	`+ EndOfFile,`
	`33`	`+ GreaterThan,`
	`34`	`+ GreaterThanOrEqual,`
	`35`	`+ LessThan,`
	`36`	`+ LessThanOrEqual,`
	`37`	`+ Equal`
`33`	`38`	`}`
`34`	`39`	`}`