Allow ImageRenderer::icon() to be passed full asset ID

Author: jissereitsma

Util/Block/ImageRenderer.php

@@ -83,22 +83,25 @@ public function icon(AbstractBlock $block, string $iconId, array $attributes = [
     {
         $this->block = $block;
         $iconSize = $this->getIconSize($iconId);
-        $imageId = $this->iconPrefix
-            . '/' . $this->iconSet
-            . '/' . $iconId
-            . '.svg';
+
+        if (preg_match('/^([A-Za-z0-9]+)::(.+)$/', $iconId)) {
+            $iconId = $this->iconPrefix
+                . '/' . $this->iconSet
+                . '/' . $iconId
+                . '.svg';
+        }
 
         $attributes = [
             ...$attributes,
             'width'  => $iconSize,
             'height' => $iconSize,
         ];
 
-        if ($this->isAssetId($imageId)) {
-            return $this->getByAssetId($imageId, $attributes);
+        if ($this->isAssetId($iconId)) {
+            return $this->getByAssetId($iconId, $attributes);
         }
 
-        return $this->getIconOutput($imageId, $attributes);
+        return $this->getIconOutput($iconId, $attributes);
     }
 
     public function getIconOutput(