Merge pull request #8 from storyblok/hotfix/undefined-anchor

Fix to anchor and add improvements
storyblok · Jul 15, 2020 · 5d9addd · 5d9addd
2 parents adfcc21 + 6519c55
commit 5d9addd
Show file tree

Hide file tree

Showing 4 changed files with 594 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
         "phpunit/phpunit": "^8"
     },
     "scripts": {
-        "test": "./vendor/bin/phpunit --bootstrap vendor/autoload.php tests/"
+        "test": "./vendor/bin/phpunit -d error_reporting=6143 --bootstrap vendor/autoload.php tests/"
     },
     "authors": [
         {

diff --git a/src/Schema.php b/src/Schema.php
@@ -39,22 +39,28 @@ public function getNodes()
     private function get_link($tagName)
     {
         return function ($node) use ($tagName) {
-            if (strlen($node['attrs']['anchor']) == 0 || $node['attrs']['anchor'] == null) {
-                unset($node['attrs']['anchor']);
-            }
+            $attrs = $node['attrs'];
+            $linktype = Utils::get($attrs, 'linktype', 'url');
+
+            if (array_key_exists('anchor', $attrs)) {
+                $anchor = $attrs['anchor'];
+
+                if (strlen($anchor) !== 0 && !is_null($anchor)) {
+                    $attrs['href'] = $attrs['href'] . "#" . $anchor;
+                }
 
-            if ($node['attrs']['anchor']) {
-                $attrs = $node['attrs'];
-                $attrs['href'] = $attrs['href'] . "#" . $attrs['anchor'];
                 unset($attrs['anchor']);
-                $node['attrs'] = $attrs;
+            }
+
+            if ($linktype === 'email') {
+                $attrs['href'] = "mailto:" . $attrs['href'];
             }
 
             return [
                 "tag" => [
                     [
                         "tag" => $tagName,
-                        "attrs" => $node['attrs']
+                        "attrs" => $attrs
                     ]
                 ]
             ];

diff --git a/src/Utils/Render.php b/src/Utils/Render.php
@@ -45,7 +45,11 @@ public static function renderTag($tags, $ending)
                 $attrs = $tag['attrs'];
 
                 foreach (array_keys($attrs) as $key) {
-                    $h .= " " . $key . '="' . $attrs[$key] . '"';
+                    $value = $attrs[$key];
+
+                    if (!is_null($value)) {
+                        $h .= " " . $key . '="' . $value . '"';
+                    }
                 }
             }