Enable media rules

FlorianRappl · FlorianRappl · commit e3ad3b3e12d9 · 2019-05-13T00:05:53.000+02:00
diff --git a/README.md b/README.md
@@ -29,6 +29,20 @@ This will register a parser for CSS related content. The CSS parsing options and
 
 For an interactive DOM (i.e., to handle `style` attribute changes in the HTML document) an observer needs to be registered as well.
 
+Furthermore, for some CSSOM features (e.g., media queries) a render device is required.
+
+```cs
+var config = Configuration.Default
+    .WithCss()
+    .WithRenderDevice(new DefaultRenderDevice
+    {
+        DeviceHeight = 768,
+        DeviceWidth = 1024,
+    });
+```
+
+If no specific `IRenderDevice` (e.g., via creating an `DefaultRenderDevice` object) instance is created a default implementation will be set.
+
 ## Advantages of AngleSharp.Css
 
 The core library already contains the CSS selector parser and the most basic classes and interfaces for dealing with the CSSOM. AngleSharp.Css brings the following advantages and use cases to life:
diff --git a/src/AngleSharp.Css.Tests/Styling/CssSheet.cs b/src/AngleSharp.Css.Tests/Styling/CssSheet.cs
@@ -3,7 +3,6 @@ namespace AngleSharp.Css.Tests.Styling
     using AngleSharp.Css.Converters;
     using AngleSharp.Css.Dom;
     using AngleSharp.Css.Parser;
-    using AngleSharp.Css.Values;
     using NUnit.Framework;
     using System;
     using System.IO;
diff --git a/src/AngleSharp.Css.Tests/Styling/HtmlCssIntegration.cs b/src/AngleSharp.Css.Tests/Styling/HtmlCssIntegration.cs
@@ -460,5 +460,37 @@ public void MediaRuleCssCausesException_Issue20()
             var style = document.Body.ComputeCurrentStyle();
             Assert.IsNotNull(style);
         }
+
+        [Test]
+        public void MediaRuleIsCalculatedIfScreenIsOkay()
+        {
+            var config = Configuration.Default
+                .WithCss()
+                .WithRenderDevice(new DefaultRenderDevice
+                {
+                    ViewPortWidth = 1000,
+                });
+            var browsingContext = BrowsingContext.New(config);
+            var htmlParser = browsingContext.GetService<IHtmlParser>();
+            var document = htmlParser.ParseDocument("<html><head><style>body { color: red } @media only screen and (min-width: 600px) { body { color: green } }</style></head><body></body></html>");
+            var style = document.Body.ComputeCurrentStyle();
+            Assert.AreEqual("rgba(0, 128, 0, 1)", style.GetColor());
+        }
+
+        [Test]
+        public void MediaRuleIsNotCalculatedIfScreenIsNotWideEnough()
+        {
+            var config = Configuration.Default
+                .WithCss()
+                .WithRenderDevice(new DefaultRenderDevice
+                {
+                    ViewPortWidth = 599,
+                });
+            var browsingContext = BrowsingContext.New(config);
+            var htmlParser = browsingContext.GetService<IHtmlParser>();
+            var document = htmlParser.ParseDocument("<html><head><style>body { color: red } @media only screen and (min-width: 600px) { body { color: green } }</style></head><body></body></html>");
+            var style = document.Body.ComputeCurrentStyle();
+            Assert.AreEqual("rgba(255, 0, 0, 1)", style.GetColor());
+        }
     }
 }
diff --git a/src/AngleSharp.Css/CssConfigurationExtensions.cs b/src/AngleSharp.Css/CssConfigurationExtensions.cs
@@ -18,9 +18,7 @@ public static class CssConfigurationExtensions
         /// <returns>The new instance with the service.</returns>
         public static IConfiguration WithCss(this IConfiguration configuration, CssParserOptions options = default(CssParserOptions))
         {
-            if (configuration == null)
-                throw new ArgumentNullException(nameof(configuration));
-            
+            configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));            
             var service = new CssStylingService();
 
             if (!configuration.Has<ICssDefaultStyleSheetProvider>())
@@ -57,5 +55,14 @@ public static class CssConfigurationExtensions
                 .WithOnly(Factory.Observer)
                 .WithOnly<IStylingService>(service);
         }
+
+        /// <summary>
+        /// Registers the render device for the given configuration.
+        /// </summary>
+        /// <param name="configuration">The configuration to extend.</param>
+        /// <param name="renderDevice">The custom device to register, if any.</param>
+        /// <returns>The new instance with the render device.</returns>
+        public static IConfiguration WithRenderDevice(this IConfiguration configuration, IRenderDevice renderDevice = null) =>
+            configuration.WithOnly<IRenderDevice>(renderDevice ?? new DefaultRenderDevice());
     }
 }
diff --git a/src/AngleSharp.Css/Dom/Internal/MediaList.cs b/src/AngleSharp.Css/Dom/Internal/MediaList.cs
@@ -41,6 +41,8 @@ internal MediaList(IBrowsingContext context)
 
         public ICssParser Parser => _context.GetService<ICssParser>();
 
+        public IFeatureValidatorFactory ValidatorFactory => _context.GetService<IFeatureValidatorFactory>();
+
         public String MediaText
         {
             get => this.ToCss();
@@ -54,7 +56,7 @@ public String MediaText
         public void SetMediaText(String value, Boolean throwOnError)
         {
             _media.Clear();
-            var media = MediaParser.Parse(value);
+            var media = MediaParser.Parse(value, ValidatorFactory);
 
             if (media != null)
             {
@@ -73,13 +75,13 @@ public void SetMediaText(String value, Boolean throwOnError)
 
         public void Add(String newMedium)
         {
-            var medium = MediumParser.Parse(newMedium) ?? throw new DomException(DomError.Syntax);
+            var medium = MediumParser.Parse(newMedium, ValidatorFactory) ?? throw new DomException(DomError.Syntax);
             _media.Add(medium);
         }
 
         public void Remove(String oldMedium)
         {
-            var medium = MediumParser.Parse(oldMedium) ?? throw new DomException(DomError.Syntax);
+            var medium = MediumParser.Parse(oldMedium, ValidatorFactory) ?? throw new DomException(DomError.Syntax);
 
             for (var i = 0; i < _media.Count; i++)
             {
diff --git a/src/AngleSharp.Css/Dom/StyleCollectionExtensions.cs b/src/AngleSharp.Css/Dom/StyleCollectionExtensions.cs
@@ -96,10 +96,8 @@ public static ICssStyleDeclaration ComputeCascadedStyle(this StyleCollection sty
 
         #region Helpers
 
-        private static IEnumerable<ICssStyleRule> SortBySpecificity(this IEnumerable<ICssStyleRule> rules, IElement element)
-        {
-            return rules.Where(m => m.Selector.Match(element)).OrderBy(m => m.Selector.Specificity);
-        }
+        private static IEnumerable<ICssStyleRule> SortBySpecificity(this IEnumerable<ICssStyleRule> rules, IElement element) =>
+            rules.Where(m => m.Selector.Match(element)).OrderBy(m => m.Selector.Specificity);
 
         #endregion
     }
diff --git a/src/AngleSharp.Css/Extensions/MediaListExtensions.cs b/src/AngleSharp.Css/Extensions/MediaListExtensions.cs
@@ -27,8 +27,7 @@ public static void AssociateValidator(this IMediaFeature feature, IFeatureValida
 
         public static Boolean Validate(this IMediaFeature feature, IRenderDevice device)
         {
-            var validator = default(IFeatureValidator);
-            AssociatedValidators.TryGetValue(feature, out validator);
+            AssociatedValidators.TryGetValue(feature, out var validator);
             return validator?.Validate(feature, device) ?? false;
         }
 
diff --git a/src/AngleSharp.Css/Parser/Micro/MediaParser.cs b/src/AngleSharp.Css/Parser/Micro/MediaParser.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Css.Parser
+namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Css.Dom;
     using AngleSharp.Text;
@@ -7,14 +7,14 @@
 
     static class MediaParser
     {
-        public static IEnumerable<CssMedium> Parse(String str)
+        public static IEnumerable<CssMedium> Parse(String str, IFeatureValidatorFactory factory)
         {
             var source = new StringSource(str);
-            var result = source.ParseMedia();
+            var result = source.ParseMedia(factory);
             return source.IsDone ? result : null;
         }
 
-        public static IEnumerable<CssMedium> ParseMedia(this StringSource source)
+        public static IEnumerable<CssMedium> ParseMedia(this StringSource source, IFeatureValidatorFactory factory)
         {
             var current = source.SkipSpacesAndComments();
             var media = new List<CssMedium>();
@@ -29,7 +29,7 @@ public static IEnumerable<CssMedium> ParseMedia(this StringSource source)
                     source.SkipCurrentAndSpaces();
                 }
 
-                var medium = source.ParseMedium();
+                var medium = source.ParseMedium(factory);
 
                 if (medium == null)
                     return null;
diff --git a/src/AngleSharp.Css/Parser/Micro/MediumParser.cs b/src/AngleSharp.Css/Parser/Micro/MediumParser.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Css.Parser
+namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Css.Dom;
     using AngleSharp.Text;
@@ -7,14 +7,14 @@
 
     static class MediumParser
     {
-        public static CssMedium Parse(String str)
+        public static CssMedium Parse(String str, IFeatureValidatorFactory factory)
         {
             var source = new StringSource(str);
-            var result = source.ParseMedium();
+            var result = source.ParseMedium(factory);
             return source.IsDone ? result : null;
         }
 
-        public static CssMedium ParseMedium(this StringSource source)
+        public static CssMedium ParseMedium(this StringSource source, IFeatureValidatorFactory factory)
         {
             source.SkipSpacesAndComments();
             var ident = source.ParseIdent();
@@ -70,6 +70,8 @@ public static CssMedium ParseMedium(this StringSource source)
                     return null;
                 }
 
+                var validator = factory?.Create(feature.Name);
+                feature.AssociateValidator(validator);
                 features.Add(feature);
                 source.SkipCurrentAndSpaces();
                 var position = source.Index;

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,7 @@ public static class CssConfigurationExtensions`
`18`	`18`	`/// <returns>The new instance with the service.</returns>`
`19`	`19`	`public static IConfiguration WithCss(this IConfiguration configuration, CssParserOptions options = default(CssParserOptions))`
`20`	`20`	`{`
`21`		`- if (configuration == null)`
`22`		`- throw new ArgumentNullException(nameof(configuration));`
`23`		`-`
	`21`	`+ configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));`
`24`	`22`	`var service = new CssStylingService();`
`25`	`23`
`26`	`24`	`if (!configuration.Has<ICssDefaultStyleSheetProvider>())`
`@@ -57,5 +55,14 @@ public static class CssConfigurationExtensions`
`57`	`55`	`.WithOnly(Factory.Observer)`
`58`	`56`	`.WithOnly<IStylingService>(service);`
`59`	`57`	`}`
	`58`	`+`
	`59`	`+ /// <summary>`
	`60`	`+ /// Registers the render device for the given configuration.`
	`61`	`+ /// </summary>`
	`62`	`+ /// <param name="configuration">The configuration to extend.</param>`
	`63`	`+ /// <param name="renderDevice">The custom device to register, if any.</param>`
	`64`	`+ /// <returns>The new instance with the render device.</returns>`
	`65`	`+ public static IConfiguration WithRenderDevice(this IConfiguration configuration, IRenderDevice renderDevice = null) =>`
	`66`	`+ configuration.WithOnly<IRenderDevice>(renderDevice ?? new DefaultRenderDevice());`
`60`	`67`	`}`
`61`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ internal MediaList(IBrowsingContext context)`
`41`	`41`
`42`	`42`	`public ICssParser Parser => _context.GetService<ICssParser>();`
`43`	`43`
	`44`	`+ public IFeatureValidatorFactory ValidatorFactory => _context.GetService<IFeatureValidatorFactory>();`
	`45`	`+`
`44`	`46`	`public String MediaText`
`45`	`47`	`{`
`46`	`48`	`get => this.ToCss();`
`@@ -54,7 +56,7 @@ public String MediaText`
`54`	`56`	`public void SetMediaText(String value, Boolean throwOnError)`
`55`	`57`	`{`
`56`	`58`	`_media.Clear();`
`57`		`- var media = MediaParser.Parse(value);`
	`59`	`+ var media = MediaParser.Parse(value, ValidatorFactory);`
`58`	`60`
`59`	`61`	`if (media != null)`
`60`	`62`	`{`
`@@ -73,13 +75,13 @@ public void SetMediaText(String value, Boolean throwOnError)`
`73`	`75`
`74`	`76`	`public void Add(String newMedium)`
`75`	`77`	`{`
`76`		`- var medium = MediumParser.Parse(newMedium) ?? throw new DomException(DomError.Syntax);`
	`78`	`+ var medium = MediumParser.Parse(newMedium, ValidatorFactory) ?? throw new DomException(DomError.Syntax);`
`77`	`79`	`_media.Add(medium);`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`public void Remove(String oldMedium)`
`81`	`83`	`{`
`82`		`- var medium = MediumParser.Parse(oldMedium) ?? throw new DomException(DomError.Syntax);`
	`84`	`+ var medium = MediumParser.Parse(oldMedium, ValidatorFactory) ?? throw new DomException(DomError.Syntax);`
`83`	`85`
`84`	`86`	`for (var i = 0; i < _media.Count; i++)`
`85`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public static void AssociateValidator(this IMediaFeature feature, IFeatureValida`
`27`	`27`
`28`	`28`	`public static Boolean Validate(this IMediaFeature feature, IRenderDevice device)`
`29`	`29`	`{`
`30`		`- var validator = default(IFeatureValidator);`
`31`		`- AssociatedValidators.TryGetValue(feature, out validator);`
	`30`	`+ AssociatedValidators.TryGetValue(feature, out var validator);`
`32`	`31`	`return validator?.Validate(feature, device) ?? false;`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace AngleSharp.Css.Parser`
	`1`	`+namespace AngleSharp.Css.Parser`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Css.Dom;`
`4`	`4`	`using AngleSharp.Text;`
`@@ -7,14 +7,14 @@`
`7`	`7`
`8`	`8`	`static class MediaParser`
`9`	`9`	`{`
`10`		`- public static IEnumerable<CssMedium> Parse(String str)`
	`10`	`+ public static IEnumerable<CssMedium> Parse(String str, IFeatureValidatorFactory factory)`
`11`	`11`	`{`
`12`	`12`	`var source = new StringSource(str);`
`13`		`- var result = source.ParseMedia();`
	`13`	`+ var result = source.ParseMedia(factory);`
`14`	`14`	`return source.IsDone ? result : null;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static IEnumerable<CssMedium> ParseMedia(this StringSource source)`
	`17`	`+ public static IEnumerable<CssMedium> ParseMedia(this StringSource source, IFeatureValidatorFactory factory)`
`18`	`18`	`{`
`19`	`19`	`var current = source.SkipSpacesAndComments();`
`20`	`20`	`var media = new List<CssMedium>();`
`@@ -29,7 +29,7 @@ public static IEnumerable<CssMedium> ParseMedia(this StringSource source)`
`29`	`29`	`source.SkipCurrentAndSpaces();`
`30`	`30`	`}`
`31`	`31`
`32`		`- var medium = source.ParseMedium();`
	`32`	`+ var medium = source.ParseMedium(factory);`
`33`	`33`
`34`	`34`	`if (medium == null)`
`35`	`35`	`return null;`