Merge pull request #176 from SebastianStehle/devel

FlorianRappl · web-flow · commit 459b48c797bf · 2024-09-20T16:49:32.000+02:00
Get declarations
diff --git a/src/AngleSharp.Css.Tests/Extensions/Nesting.cs b/src/AngleSharp.Css.Tests/Extensions/Nesting.cs
@@ -25,6 +25,24 @@ public void SimpleSelectorNestingImplicit()
             Assert.AreEqual("22.4px", style.GetFontSize());
         }
 
+        [Test]
+        public void SimpleSelectorNestingImplicitDeclarations()
+        {
+            var source = @"<!doctype html><head><style>.foo {
+  color: green;
+  .bar {
+    font-size: 1.4rem;
+  }
+}</style></head><body class='foo'><div class='bar'>Larger and green";
+            var document = ParseDocument(source);
+            var window = document.DefaultView;
+            var element = document.QuerySelector(".bar");
+            var styleCollection = window.GetStyleCollection();
+            var style = styleCollection.GetDeclarations(element);
+
+            Assert.AreEqual("1.4rem", style.GetFontSize());
+        }
+
         [Test]
         public void SimpleSelectorNestingExplicit()
         {
diff --git a/src/AngleSharp.Css/Extensions/StyleCollectionExtensions.cs b/src/AngleSharp.Css/Extensions/StyleCollectionExtensions.cs
@@ -42,10 +42,26 @@ public static IStyleCollection GetStyleCollection(this IWindow window)
         /// <param name="pseudoSelector">The optional pseudo selector to use.</param>
         /// <returns>The style declaration containing all the declarations.</returns>
         public static ICssStyleDeclaration ComputeDeclarations(this IStyleCollection styles, IElement element, String pseudoSelector = null)
+        {
+            var ctx = element.Owner?.Context;
+            var declarations = GetDeclarations(styles, element, pseudoSelector);
+            var context = new CssComputeContext(styles.Device, ctx, declarations);
+
+            return declarations.Compute(context);
+        }
+
+        /// <summary>
+        /// Gets the declarations for the given element in the context of
+        /// the specified styling rules.
+        /// </summary>
+        /// <param name="styles">The styles to use.</param>
+        /// <param name="element">The element that is questioned.</param>
+        /// <param name="pseudoSelector">The optional pseudo selector to use.</param>
+        /// <returns>The style declaration containing all the declarations.</returns>
+        public static ICssStyleDeclaration GetDeclarations(this IStyleCollection styles, IElement element, String pseudoSelector = null)
         {
             var ctx = element.Owner?.Context;
             var computedStyle = new CssStyleDeclaration(ctx);
-            var context = new CssComputeContext(styles.Device, ctx, computedStyle);
             var nodes = element.GetAncestors().OfType<IElement>();
 
             if (!String.IsNullOrEmpty(pseudoSelector))
@@ -65,7 +81,7 @@ public static ICssStyleDeclaration ComputeDeclarations(this IStyleCollection sty
                 computedStyle.UpdateDeclarations(styles.ComputeCascadedStyle(node));
             }
 
-            return computedStyle.Compute(context);
+            return computedStyle;
         }
 
         /// <summary>
