fix: Updates support for Kirby file UUIDs alongside path strings.

Author: scottboms

README.md

@@ -33,18 +33,27 @@ $ git submodule add https://github.com/scottboms/kirbytag-svg.git site/plugins/k
 
 Optionally, you can specify a custom `wrapper` element to wrap the SVG along with class and role attributes that will be applied to that element. If `class` or `role` attributes are included but no `wrapper` element, a 'figure' element will be used.
 
+The tag now supports all of these value types while preserving the existing path-based behavior:
+
+* page-local filenames, like `icon.svg`
+* Kirby file IDs/paths, like `projects/example/icon.svg`
+* Kirby file UUIDs, like `file://abc123...`
+* existing root-relative or filesystem-style SVG paths, like `/assets/icons/icon.svg`
+
 ### Optional Tag Attributes
 
 * `wrapper`: A wrapper element to surround the SVG when output in your template [optional]
 * `class`: A CSS class/classes to append to the wrapper element [optional]
 * `role`: A role attribute appended to the wrapper element [optional]
 
-#### Example usage: 
+#### Example usage:
 
 ```
 (svg: /img/deke.svg)
 (svg: lerxst.svg wrapper: figure class: svg role: img)
 (svg: /assets/icons/pratt.svg wrapper: div class: icon)
+(svg: projects/example/logo.svg)
+(svg: file://your-file-uuid)
 ```
 
 ## Configuration Options

index.php

@@ -12,7 +12,6 @@
 
 use Kirby\Cms\App;
 use Kirby\Cms\File;
-use Kirby\Toolkit\F;
 
 // shamelessly borrowed from distantnative/retour-for-kirby
 if (
@@ -23,11 +22,11 @@
 }
 
 Kirby::plugin(
-  name: 'scottboms/kirbytag-svg', 
+  name: 'scottboms/kirbytag-svg',
   info: [
     'homepage' => 'https://github.com/scottboms/kirbytag-svg'
   ],
-  version: '1.1.4',
+  version: '1.1.5',
   extends: [
     'snippets' => [
       'svgtag' => __DIR__ . '/snippets/svg.php'
@@ -43,23 +42,14 @@
           'role'
         ],
         'html' => function($tag) {
-          $pattern = '/\//'; // identify path strings
-
           $string = $tag->value;
-
-          if (preg_match($pattern, $string)) {
-            $file = $tag->svg;
-          } else {
-            $file = $tag->parent()->file($tag->value);          
-          }
-
-          $svgurl = $file;
+          $svg = $tag->file($string) ?? $string;
           $wrapper = $tag->wrapper ?? option('scottboms.kirbytag-svg.wrapper');
           $class = $tag->class;
           $role = $tag->role;
 
           $args = array(
-            'svg' => $svgurl,
+            'svg' => $svg,
             'wrapper' => $wrapper,
             'class' => $class,
             'role' => $role,
@@ -74,4 +64,4 @@
       ]
     ]
   ]
-);
+);

package.json

@@ -2,7 +2,7 @@
   "name": "svg",
   "description": "Custom Kirbytag to enable using svg directly in textareas",
   "author": "Scott Boms <plugins@scottboms.com>",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "type": "kirby-plugin",
   "license": "MIT"
 }

snippets/svg.php

@@ -1,9 +1,9 @@
-<?php if (isset($wrapper)): ?>
+<?php if (!empty($wrapper)): ?>
 <?= '<' . $wrapper . ' class="' . $class . '"' . ' role="' . $role . '">' ?>
 <?php endif ?>
   <?php if($svg): ?>
     <?= svg($svg) ?>
   <?php endif ?>
-<?php if($wrapper !== ''): ?>
+<?php if (!empty($wrapper)): ?>
 <?= '</' . $wrapper . '>'?>
 <?php endif ?>