Improve use handling

- ensures nested groups are rendered
- merges styles from use element with referenced element
- fixes order of end render calls

Author: bsweeney

src/Svg/Tag/UseTag.php

@@ -48,10 +48,6 @@ protected function before($attributes)
         $link = $attributes["href"] ?? $attributes["xlink:href"];
         $this->reference = $document->getDef($link);
 
-        if ($this->reference) {
-            $this->reference->before($attributes);
-        }
-
         $surface = $document->getSurface();
         $surface->save();
 
@@ -63,11 +59,6 @@ protected function after() {
             return;
         }
         parent::after();
-
-        if ($this->reference) {
-            $this->reference->after();
-        }
-
         $this->getDocument()->getSurface()->restore();
     }
 
@@ -84,19 +75,22 @@ public function handle($attributes)
             return;
         }
 
+        $originalAttributes = array_merge($this->reference->attributes);
+        $originalStyle = $this->reference->getStyle();
         $mergedAttributes = $this->reference->attributes;
-        $attributesToNotMerge = ['x', 'y', 'width', 'height', 'href', 'xlink:href', 'id'];
+        $attributesToNotMerge = ['x', 'y', 'width', 'height', 'href', 'xlink:href', 'id', 'style'];
         foreach ($attributes as $attrKey => $attrVal) {
             if (!in_array($attrKey, $attributesToNotMerge) && !isset($mergedAttributes[$attrKey])) {
                 $mergedAttributes[$attrKey] = $attrVal;
             }
         }
+        $mergedAttributes['style'] = ($attributes['style'] ?? '') . ';' . ($mergedAttributes['style'] ?? '');
 
-        $this->reference->handle($mergedAttributes);
+        $this->_handle($this->reference, $mergedAttributes);
 
-        foreach ($this->reference->children as $_child) {
-            $_attributes = array_merge($_child->attributes, $mergedAttributes);
-            $_child->handle($_attributes);
+        $this->reference->attributes = $originalAttributes;
+        if ($originalStyle !== null) {
+            $this->reference->setStyle($originalStyle);
         }
     }
 
@@ -107,16 +101,32 @@ public function handleEnd()
             return;
         }
 
+        if ($this->reference) {
+            $this->_handleEnd($this->reference);
+        }
+
         parent::handleEnd();
+    }
 
-        if (!$this->reference) {
-            return;
+    private function _handle($tag, $attributes) {
+        $tag->handle($attributes);
+        foreach ($tag->children as $child) {
+            $originalAttributes = array_merge($child->attributes);
+            $originalStyle = $child->getStyle();
+            $mergedAttributes = $child->attributes;
+            $mergedAttributes['style'] = ($attributes['style'] ?? '') . ';' . ($mergedAttributes['style'] ?? '');
+            $this->_handle($child, $mergedAttributes);
+            $child->attributes = $originalAttributes;
+            if ($originalStyle !== null) {
+                $child->setStyle($originalStyle);
+            }
         }
+    }
 
-        $this->reference->handleEnd();
-
-        foreach ($this->reference->children as $_child) {
-            $_child->handleEnd();
+    private function _handleEnd($tag) {
+        foreach ($tag->children as $child) {
+            $this->_handleEnd($child);
         }
+        $tag->handleEnd();
     }
 }