Load svg's with nested elements, filter svg's by id, code clean-up (a…

…rbory#87) * load svg with nested elements, filter svg by id * Code clean-up
rerzy · Aug 14, 2018 · 1b2baca · 1b2baca
1 parent a9e7a20
commit 1b2baca
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Admin/Form/Fields/Renderer/IconPickerRenderer.php b/src/Admin/Form/Fields/Renderer/IconPickerRenderer.php
@@ -68,7 +68,17 @@ protected function getSvgIconElement( $id )
             return Html::div()->addClass( 'element' );
         }
 
-        $content = $iconNode->path->asXML();
+        $node = simplexml_load_string($iconNode->asXML());
+        $path = array_first($node->xpath('/symbol//path[@d]'));
+
+        if( $path )
+        {
+            $content = $path->asXML();
+        }
+        else 
+        {
+            return Html::div()->addClass( 'element' );
+        }
 
         $attributes = $iconNode->attributes();
         $width = (int) $attributes->width;

diff --git a/src/Admin/Form/Fields/SpriteIcon.php b/src/Admin/Form/Fields/SpriteIcon.php
@@ -13,6 +13,11 @@ class SpriteIcon extends Select
      */
     protected $spritePath;
 
+    /**
+     * @var string
+     */
+    protected $filter;
+
     /**
      * @param string $name
      */
@@ -34,6 +39,16 @@ public function sprite( string $path ): self
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function filter( string $filter )
+    {
+        $this->filter = $filter;
+
+        return $this;
+    }
+
     /**
      * @return Collection
      * @throws \InvalidArgumentException
@@ -104,6 +119,11 @@ protected function getIconIds(): Collection
                 }
             }
 
+            if( $this->filter && !str_contains($id, $this->filter) )
+            {
+                continue;
+            }
+
             if( $id )
             {
                 $ids->push( $id );