refactor: move rules computation to SvgRootNode

fix: apply opacity when fill-opacity or stroke-opacity is not present
fix: gradient not considering viewport translation when gradientUnits == "objectBoundingBox

Author: rafaeltonholo

samples/svg/css/flower.svg

@@ -87,10 +87,10 @@ private fun SvgCircleNode.createSimpleCircle(
     return ImageVectorNode.Path(
         params = override ?: ImageVectorNode.Path.Params(
             fill = fillBrush(wrapper.nodes),
-            fillAlpha = fillOpacity,
+            fillAlpha = fillOpacity ?: opacity,
             pathFillType = fillRule,
             stroke = strokeBrush(wrapper.nodes),
-            strokeAlpha = strokeOpacity,
+            strokeAlpha = strokeOpacity ?: opacity,
             strokeLineCap = strokeLineCap,
             strokeLineJoin = strokeLineJoin,
             strokeMiterLimit = strokeMiterLimit,
@@ -169,7 +169,7 @@ private fun SvgCircleNode.createDashedCircle(minified: Boolean): ImageVectorNode
                         minified = minified,
                         override = ImageVectorNode.Path.Params(
                             fill = fillBrush(nodes),
-                            fillAlpha = fillOpacity,
+                            fillAlpha = fillOpacity ?: opacity,
                             pathFillType = fillRule,
                         )
                     ),

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgCircleNode.kt

@@ -3,7 +3,6 @@ package dev.tonholo.s2c.domain.svg
 import dev.tonholo.s2c.domain.ImageVectorNode
 import dev.tonholo.s2c.domain.xml.XmlNode
 import dev.tonholo.s2c.domain.xml.XmlParentNode
-import dev.tonholo.s2c.parser.ImageParser.SvgParser.ComputedRule
 
 class SvgClipPath(
     parent: XmlParentNode,

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgClipPath.kt

@@ -8,7 +8,7 @@ import kotlin.jvm.JvmInline
 @JvmInline
 value class SvgColor private constructor(val value: String) {
     companion object {
-        val Default = SvgColor("#FF000000")
+        val Default = SvgColor("Color.Transparent")
         operator fun invoke(value: String): SvgColor = SvgColor(
             namedColors[value] ?: value
         )

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgColor.kt

@@ -5,7 +5,6 @@ import dev.tonholo.s2c.domain.svg.transform.SvgTransform
 import dev.tonholo.s2c.domain.xml.XmlElementNode
 import dev.tonholo.s2c.domain.xml.XmlNode
 import dev.tonholo.s2c.domain.xml.XmlParentNode
-import dev.tonholo.s2c.parser.ImageParser.SvgParser.ComputedRule
 
 typealias SvgElementNodeConstructorFn<T> = (
     parent: XmlParentNode,

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgElementNode.kt

@@ -45,10 +45,10 @@ fun SvgEllipseNode.asNode(
     return ImageVectorNode.Path(
         params = ImageVectorNode.Path.Params(
             fill = fillBrush(nodes),
-            fillAlpha = fillOpacity,
+            fillAlpha = fillOpacity ?: opacity,
             pathFillType = fillRule,
             stroke = strokeBrush(nodes),
-            strokeAlpha = strokeOpacity,
+            strokeAlpha = strokeOpacity ?: opacity,
             strokeLineCap = strokeLineCap,
             strokeLineJoin = strokeLineJoin,
             strokeMiterLimit = strokeMiterLimit,

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgEllipseNode.kt

@@ -25,7 +25,7 @@ abstract class SvgGraphicNode<out T>(
     where T : SvgNode, T : XmlChildNode {
     val fill: SvgColor? by attribute<String?, _>(inherited = true) { it?.let(SvgColor::invoke) }
 
-    val opacity: Float? by attribute()
+    val opacity: Float? by attribute(inherited = true)
 
     val fillOpacity: Float? by attribute(name = "fill-opacity", inherited = true)
 

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgGraphicNode.kt

@@ -5,7 +5,6 @@ import dev.tonholo.s2c.domain.delegate.attribute
 import dev.tonholo.s2c.domain.xml.XmlNode
 import dev.tonholo.s2c.domain.xml.XmlParentNode
 import dev.tonholo.s2c.extensions.firstInstanceOfOrNull
-import dev.tonholo.s2c.parser.ImageParser.SvgParser.ComputedRule
 
 class SvgGroupNode(
     parent: XmlParentNode,

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgGroupNode.kt

@@ -7,7 +7,8 @@ import dev.tonholo.s2c.domain.xml.XmlChildNode
 import dev.tonholo.s2c.domain.xml.XmlNode
 import dev.tonholo.s2c.domain.xml.XmlParentNode
 import dev.tonholo.s2c.domain.xml.XmlRootNode
-import dev.tonholo.s2c.parser.ImageParser.SvgParser.ComputedRule
+import dev.tonholo.s2c.parser.ast.css.CssSpecificity
+import dev.tonholo.s2c.parser.ast.css.syntax.node.Declaration
 import dev.tonholo.s2c.parser.ast.css.syntax.node.Value
 
 /**
@@ -142,6 +143,16 @@ fun SvgNode.stackedTransform(parent: XmlParentNode): SvgTransform? {
     return stacked?.let(::SvgTransform)
 }
 
+data class ComputedRule(
+    val selector: String,
+    val specificity: CssSpecificity,
+    val declarations: List<Declaration>,
+) : Comparable<ComputedRule> {
+    override fun compareTo(other: ComputedRule): Int {
+        return specificity.compareTo(other.specificity)
+    }
+}
+
 /**
  * Converts the SVG node to a list of [ImageVectorNode].
  * @param masks The list of masks defined in the SVG.

svg-to-compose/src/commonMain/kotlin/dev/tonholo/s2c/domain/svg/SvgNode.kt

@@ -7,7 +7,6 @@ import dev.tonholo.s2c.domain.compose.ComposeBrush
 import dev.tonholo.s2c.domain.compose.toBrush
 import dev.tonholo.s2c.domain.delegate.attribute
 import dev.tonholo.s2c.domain.xml.XmlParentNode
-import dev.tonholo.s2c.parser.ImageParser.SvgParser.ComputedRule
 
 class SvgPathNode(
     parent: XmlParentNode,
@@ -64,10 +63,10 @@ fun SvgPathNode.asNode(
     val path = ImageVectorNode.Path(
         params = ImageVectorNode.Path.Params(
             fill = fillBrush,
-            fillAlpha = fillOpacity,
+            fillAlpha = fillOpacity ?: opacity,
             pathFillType = fillRule,
             stroke = strokeBrush,
-            strokeAlpha = strokeOpacity,
+            strokeAlpha = strokeOpacity ?: opacity,
             strokeLineCap = strokeLineCap,
             strokeLineJoin = strokeLineJoin,
             strokeMiterLimit = strokeMiterLimit,