Updated PDF export to open detail blocks

diff --git a/app/Entities/Tools/ExportFormatter.php b/app/Entities/Tools/ExportFormatter.php
index f993d332d5ee0e5783e373d40caedee57d367482..5617db6925f51a65168efe7ec072fd15fc517e75 100644 (file)
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Entities/Tools/ExportFormatter.php
@@ -147,10 +147,31 @@ class ExportFormatter
     {
         $html = $this->containHtml($html);
         $html = $this->replaceIframesWithLinks($html);
     {
         $html = $this->containHtml($html);
         $html = $this->replaceIframesWithLinks($html);

+        $html = $this->openDetailElements($html);

 
         return $this->pdfGenerator->fromHtml($html);
     }
 
 
         return $this->pdfGenerator->fromHtml($html);
     }
 

+    /**
+     * Within the given HTML content, Open any detail blocks
+     */
+    protected function openDetailElements(string $html): string
+    {
+        libxml_use_internal_errors(true);
+
+        $doc = new DOMDocument();
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+        $xPath = new DOMXPath($doc);
+
+        $details = $xPath->query('//details');
+        /** @var DOMElement $detail */
+        foreach ($details as $detail) {
+            $detail->setAttribute('open', 'open');
+        }
+
+        return $doc->saveHTML();
+    }
+

     /**
      * Within the given HTML content, replace any iframe elements
      * with anchor links within paragraph blocks.
     /**
      * Within the given HTML content, replace any iframe elements
      * with anchor links within paragraph blocks.

diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index fc6b74088c0199e7976ff1b54a1712f81aa809f8..445cd24f3848b2bc77e3165d610c4238f49d9232 100644 (file)
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -309,6 +309,24 @@ class ExportTest extends TestCase
         $this->assertStringContainsString('<p><a href="https://www.youtube.com/embed/ShqUjt33uOs">https://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
     }
 
         $this->assertStringContainsString('<p><a href="https://www.youtube.com/embed/ShqUjt33uOs">https://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
     }
 

+    public function test_page_pdf_export_opens_details_blocks()
+    {
+        $page = Page::query()->first()->forceFill([
+            'html'     => '<details><summary>Hello</summary><p>Content!</p></details>',
+        ]);
+        $page->save();
+
+        $pdfHtml = '';
+        $mockPdfGenerator = $this->mock(PdfGenerator::class);
+        $mockPdfGenerator->shouldReceive('fromHtml')
+            ->with(\Mockery::capture($pdfHtml))
+            ->andReturn('');
+        $mockPdfGenerator->shouldReceive('getActiveEngine')->andReturn(PdfGenerator::ENGINE_DOMPDF);
+
+        $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $this->assertStringContainsString('<details open="open"', $pdfHtml);
+    }
+

     public function test_page_markdown_export()
     {
         $page = Page::query()->first();
     public function test_page_markdown_export()
     {
         $page = Page::query()->first();