Merge pull request #982 from hydephp/update-coloured-blockquotes-to-s…

…upport-inner-markdown Update coloured blockquotes to support inner Markdown
hydephp · Feb 12, 2023 · ad96cc6 · ad96cc6
2 parents c430ff2 + 6031310
commit ad96cc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/framework/src/Markdown/Processing/ColoredBlockquotes.php b/packages/framework/src/Markdown/Processing/ColoredBlockquotes.php
@@ -5,6 +5,7 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
+use Hyde\Markdown\Models\Markdown;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\ColoredBlockquoteShortcodesTest
@@ -30,7 +31,7 @@ protected static function expand(string $input): string
         return sprintf(
             '<blockquote class="%s">%s</blockquote>',
             static::getClassNameFromSignature(static::signature()),
-            trim(substr($input, strlen(static::signature())), ' ')
+            trim(Markdown::render(trim(substr($input, strlen(static::signature())), ' ')))
         );
     }
 

diff --git a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
@@ -16,7 +16,7 @@ class ColoredBlockquoteShortcodesTest extends TestCase
 {
     public function test_resolve_method()
     {
-        $this->assertEquals('<blockquote class="color">foo</blockquote>',
+        $this->assertEquals('<blockquote class="color"><p>foo</p></blockquote>',
             ColoredBlockquotes::resolve('>color foo'));
     }
 
@@ -26,4 +26,11 @@ public function test_get_method()
         $this->assertContainsOnlyInstancesOf(ColoredBlockquotes::class,
             ColoredBlockquotes::get());
     }
+
+    public function test_can_use_markdown_within_blockquote()
+    {
+        $this->assertEquals('<blockquote class="color"><p>foo <strong>bar</strong></p></blockquote>',
+            ColoredBlockquotes::resolve('>color foo **bar**')
+        );
+    }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -25,7 +25,7 @@ public function test_discovered_shortcodes_are_used_to_process_input()
     {
         $processor = new ShortcodeProcessor('>info foo');
 
-        $this->assertEquals('<blockquote class="info">foo</blockquote>',
+        $this->assertEquals('<blockquote class="info"><p>foo</p></blockquote>',
             $processor->run());
     }
 
@@ -38,7 +38,7 @@ public function test_string_without_shortcode_is_not_modified()
 
     public function test_process_static_shorthand()
     {
-        $this->assertEquals('<blockquote class="info">foo</blockquote>',
+        $this->assertEquals('<blockquote class="info"><p>foo</p></blockquote>',
             ShortcodeProcessor::preprocess('>info foo'));
     }