From 26af9acc6ce8dcd545a0f8ac918c8220415a12c0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 29 Apr 2022 14:58:28 +0100
Subject: [PATCH] Improved iframe & summary handling in HTML to MD conversion

---
 .../Tools/Markdown/HtmlToMarkdown.php         |  1 +
 .../Markdown/SpacedTagFallbackConverter.php   | 23 +++++++++++++++++++
 .../pages/parts/editor-toolbar.blade.php      |  2 +-
 tests/Entity/MarkdownToHtmlTest.php           | 16 +++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/Entities/Tools/Markdown/SpacedTagFallbackConverter.php

diff --git a/app/Entities/Tools/Markdown/HtmlToMarkdown.php b/app/Entities/Tools/Markdown/HtmlToMarkdown.php
index aafb2733b..8c13ee028 100644
--- a/app/Entities/Tools/Markdown/HtmlToMarkdown.php
+++ b/app/Entities/Tools/Markdown/HtmlToMarkdown.php
@@ -88,6 +88,7 @@ class HtmlToMarkdown
         $environment->addConverter(new PreformattedConverter());
         $environment->addConverter(new TextConverter());
         $environment->addConverter(new CheckboxConverter());
+        $environment->addConverter(new SpacedTagFallbackConverter());
 
         return $environment;
     }
diff --git a/app/Entities/Tools/Markdown/SpacedTagFallbackConverter.php b/app/Entities/Tools/Markdown/SpacedTagFallbackConverter.php
new file mode 100644
index 000000000..960bc4ee6
--- /dev/null
+++ b/app/Entities/Tools/Markdown/SpacedTagFallbackConverter.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\Entities\Tools\Markdown;
+
+use League\HTMLToMarkdown\Converter\ConverterInterface;
+use League\HTMLToMarkdown\ElementInterface;
+
+/**
+ * For certain defined tags, add additional spacing upon the retained HTML content
+ * to separate it out from anything that may be markdown soon afterwards or within.
+ */
+class SpacedTagFallbackConverter implements ConverterInterface
+{
+    public function convert(ElementInterface $element): string
+    {
+        return \html_entity_decode($element->getChildrenAsString()) . "\n\n";
+    }
+
+    public function getSupportedTags(): array
+    {
+        return ['summary', 'iframe'];
+    }
+}
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index 9bc79476e..4846f4b76 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -27,7 +27,7 @@
                             </a>
                         </li>
                     @endif
-                    <li refs="page-editor@discardDraftWrap" class="{{ $isDraft ? '' : 'hidden' }}">
+                    <li refs="page-editor@discardDraftWrap" class="{{ $isDraftRevision ? '' : 'hidden' }}">
                         <button refs="page-editor@discardDraft" type="button" class="text-neg icon-item">
                             @icon('cancel')
                             <div>{{ trans('entities.pages_edit_discard_draft') }}</div>
diff --git a/tests/Entity/MarkdownToHtmlTest.php b/tests/Entity/MarkdownToHtmlTest.php
index 0b04f9cc4..5a2b63c78 100644
--- a/tests/Entity/MarkdownToHtmlTest.php
+++ b/tests/Entity/MarkdownToHtmlTest.php
@@ -47,6 +47,22 @@ class MarkdownToHtmlTest extends TestCase
         );
     }
 
+    public function test_summary_tags_have_newlines_after_to_separate_content()
+    {
+        $this->assertConversion(
+            '<details><summary>Toggle</summary><p>Test</p></details>',
+            "<details><summary>Toggle</summary>\n\nTest\n\n</details>"
+        );
+    }
+
+    public function test_iframes_tags_have_newlines_after_to_separate_content()
+    {
+        $this->assertConversion(
+            '<iframe src="https://example.com"></iframe><p>Beans</p>',
+            "<iframe src=\"https://example.com\"></iframe>\n\nBeans"
+        );
+    }
+
     protected function assertConversion(string $html, string $expectedMarkdown, bool $partialMdMatch = false)
     {
         $markdown = (new HtmlToMarkdown($html))->convert();