Merge pull request #4 from bplace/attr-support

aboks · web-flow · commit ea8cc7b5b7e9 · 2021-12-20T20:29:48.000+01:00
Retrieve attributes from the block before rendering
diff --git a/src/DefinitionListItemDefinitionRenderer.php b/src/DefinitionListItemDefinitionRenderer.php
@@ -14,6 +14,8 @@ public function render(AbstractBlock $block, ElementRendererInterface $htmlRende
             throw new \InvalidArgumentException('Incompatible block type: ' . \get_class($block));
         }
 
-        return new HtmlElement('dd', [], $htmlRenderer->renderBlocks($block->children(), $inTightList));
+        $attrs = $block->getData('attributes', []);
+
+        return new HtmlElement('dd', $attrs, $htmlRenderer->renderBlocks($block->children(), $inTightList));
     }
 }
diff --git a/src/DefinitionListItemTermRenderer.php b/src/DefinitionListItemTermRenderer.php
@@ -14,6 +14,8 @@ public function render(AbstractBlock $block, ElementRendererInterface $htmlRende
             throw new \InvalidArgumentException('Incompatible block type: ' . \get_class($block));
         }
 
-        return new HtmlElement('dt', [], $htmlRenderer->renderInlines($block->children()));
+        $attrs = $block->getData('attributes', []);
+
+        return new HtmlElement('dt', $attrs, $htmlRenderer->renderInlines($block->children()));
     }
 }
diff --git a/src/DefinitionListRenderer.php b/src/DefinitionListRenderer.php
@@ -14,6 +14,8 @@ public function render(AbstractBlock $block, ElementRendererInterface $htmlRende
             throw new \InvalidArgumentException('Incompatible block type: ' . \get_class($block));
         }
 
-        return new HtmlElement('dl', [], $htmlRenderer->renderBlocks($block->children(), $block->isTight()));
+        $attrs = $block->getData('attributes', []);
+
+        return new HtmlElement('dl', $attrs, $htmlRenderer->renderBlocks($block->children(), $block->isTight()));
     }
 }
diff --git a/test/AttributeRenderingTest.php b/test/AttributeRenderingTest.php
@@ -0,0 +1,49 @@
+<?php
+namespace Moxio\CommonMark\Extension\DefinitionList\Test;
+
+use League\CommonMark\Environment;
+use League\CommonMark\HtmlRenderer;
+use Moxio\CommonMark\Extension\DefinitionList\DefinitionList;
+use Moxio\CommonMark\Extension\DefinitionList\DefinitionListExtension;
+use Moxio\CommonMark\Extension\DefinitionList\DefinitionListItemDefinition;
+use Moxio\CommonMark\Extension\DefinitionList\DefinitionListItemTerm;
+use PHPUnit\Framework\TestCase;
+
+class AttributeRenderingTest extends TestCase
+{
+    private HtmlRenderer $renderer;
+
+    protected function setUp(): void
+    {
+        $environment = Environment::createCommonMarkEnvironment();
+        $environment->addExtension(new DefinitionListExtension());
+        $this->renderer = new HtmlRenderer($environment);
+    }
+
+    public function testCorrectlyRendersAttributesOfDefinitionList(): void
+    {
+        $block = new DefinitionList();
+        $block->data['attributes'] = ['id' => 'foo'];
+        $actualOutput = $this->renderer->renderBlock($block);
+
+        $this->assertXmlStringEqualsXmlString("<html><dl id=\"foo\"></dl></html>", "<html>$actualOutput</html>");
+    }
+
+    public function testCorrectlyRendersAttributesOfDefinitionListItemDefinition(): void
+    {
+        $block = new DefinitionListItemDefinition();
+        $block->data['attributes'] = ['id' => 'foo'];
+        $actualOutput = $this->renderer->renderBlock($block);
+
+        $this->assertXmlStringEqualsXmlString("<html><dd id=\"foo\"></dd></html>", "<html>$actualOutput</html>");
+    }
+
+    public function testCorrectlyRendersAttributesOfDefinitionListItemTerm(): void
+    {
+        $block = new DefinitionListItemTerm([]);
+        $block->data['attributes'] = ['id' => 'foo'];
+        $actualOutput = $this->renderer->renderBlock($block);
+
+        $this->assertXmlStringEqualsXmlString("<html><dt id=\"foo\"></dt></html>", "<html>$actualOutput</html>");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ public function render(AbstractBlock $block, ElementRendererInterface $htmlRende`
`14`	`14`	`throw new \InvalidArgumentException('Incompatible block type: ' . \get_class($block));`
`15`	`15`	`}`
`16`	`16`
`17`		`- return new HtmlElement('dd', [], $htmlRenderer->renderBlocks($block->children(), $inTightList));`
	`17`	`+ $attrs = $block->getData('attributes', []);`
	`18`	`+`
	`19`	`+ return new HtmlElement('dd', $attrs, $htmlRenderer->renderBlocks($block->children(), $inTightList));`
`18`	`20`	`}`
`19`	`21`	`}`