fix: image-parser

Author: YellowPhoenix18

Diff for: src/Parser/EditorjsParser.php

@@ -12,12 +12,13 @@
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\ListParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\EmbedParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\ImageParser;
+use SyntaxPhoenix\EJSParserBundle\Parser\Extension\TableParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\HeaderParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\EditorjsParserExtension;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\WarningParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\DelimiterParser;
 use SyntaxPhoenix\EJSParserBundle\Parser\Extension\ParagraphParser;
-use SyntaxPhoenix\EJSParserBundle\Parser\Extension\TableParser;
+use SyntaxPhoenix\EJSParserBundle\Parser\Extension\SimpleImageParser;
 
 class EditorjsParser
 {
@@ -49,7 +50,8 @@ public function __construct(object $data)
             'raw' => new RawParser(),
             'list' => new ListParser(),
             'warning' => new WarningParser(),
-            'simpleImage' => new ImageParser(),
+            'simpleImage' => new SimpleImageParser(),
+            'image' => new ImageParser(),
             'table' => new TableParser()
         ];
     }
@@ -84,5 +86,4 @@ private function render(): void
             }
         }
     }
-    
 }

Diff for: src/Parser/Extension/ImageParser.php

@@ -14,11 +14,9 @@ public function parseBlock(HTML5 $html5, DOMDocument $document, object $block, s
     {
         $figure = $document->createElement('figure');
 
-        $figure->setAttribute('class', "{$this->prefix}-image");
-
-        $img = $document->createElement('img');
-
-        $imgAttrs = [];
+        $imgAttrs = [
+            "{$prefix}-image"
+        ];
 
         if ($block->data->withBorder) {
             $imgAttrs[] = "{$prefix}-image-border";
@@ -30,8 +28,11 @@ public function parseBlock(HTML5 $html5, DOMDocument $document, object $block, s
             $imgAttrs[] = "{$prefix}-image-stretched";
         }
 
-        $img->setAttribute('src', $block->data->url);
-        $img->setAttribute('class', implode(' ', $imgAttrs));
+        $figure->setAttribute('class', implode(' ', $imgAttrs));
+
+        $img = $document->createElement('img');
+
+        $img->setAttribute('src', $block->data->file->url);
 
         $figCaption = $document->createElement('figcaption');
 

Diff for: src/Parser/Extension/SimpleImageParser.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace SyntaxPhoenix\EJSParserBundle\Parser\Extension;
+
+use DOMElement;
+use DOMDocument;
+use Masterminds\HTML5;
+use SyntaxPhoenix\EJSParserBundle\Parser\EditorjsParserExtension;
+
+class SimpleImageParser implements EditorjsParserExtension
+{
+
+    public function parseBlock(HTML5 $html5, DOMDocument $document, object $block, string $prefix): DOMElement
+    {
+        $figure = $document->createElement('figure');
+
+        $figure->setAttribute('class', "{$prefix}-simpleimage");
+
+        $img = $document->createElement('img');
+
+        $imgAttrs = [];
+
+        if ($block->data->withBorder) {
+            $imgAttrs[] = "{$prefix}-simpleimage-border";
+        }
+        if ($block->data->withBackground) {
+            $imgAttrs[] = "{$prefix}-simpleimage-background";
+        }
+        if ($block->data->stretched) {
+            $imgAttrs[] = "{$prefix}-simpleimage-stretched";
+        }
+
+        $img->setAttribute('src', $block->data->url);
+        $img->setAttribute('class', implode(' ', $imgAttrs));
+
+        $figCaption = $document->createElement('figcaption');
+
+        $figCaption->appendChild($html5->loadHTMLFragment($block->data->caption));
+
+        $figure->appendChild($img);
+
+        $figure->appendChild($figCaption);
+
+        return $figure;
+    }
+}