luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(PageContent): set unique ids on nested headers

Browse source
This commit is contained in:
julesdevops 2021-11-18 23:01:37 +01:00
parent 05ef23d34e
commit f8c16494fd
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Entities/Tools/PageContent.php
View file

@ -193,6 +193,15 @@ class PageContent
} }
} }
// Set ids on nested header nodes
$nestedHeaders = $xPath->query('//body//*//h1|//body//*//h2|//body//*//h3|//body//*//h4|//body//*//h5|//body//*//h6');
foreach ($nestedHeaders as $nestedHeader) {
[$oldId, $newId] = $this->setUniqueId($nestedHeader, $idMap);
if ($newId && $newId !== $oldId) {
$this->updateLinks($xPath, '#' . $oldId, '#' . $newId);
}
}
// Ensure no duplicate ids within child items // Ensure no duplicate ids within child items
$idElems = $xPath->query('//body//*//*[@id]'); $idElems = $xPath->query('//body//*//*[@id]');
foreach ($idElems as $domElem) { foreach ($idElems as $domElem) {

20
tests/Entity/PageContentTest.php
View file

@ -670,4 +670,24 @@ class PageContentTest extends TestCase
$page->refresh(); $page->refresh();
$this->assertStringContainsString('<img src=""', $page->html); $this->assertStringContainsString('<img src=""', $page->html);
} }
public function test_nested_headers_gets_assigned_an_id()
{
$this->asEditor();
$page = Page::query()->first();
$content = '<table><tbody><tr><td><h5>Simple Test</h5></td></tr></tbody></table>';
$this->put($page->getUrl(), [
'name' => $page->name,
'html' => $content,
'summary' => '',
]);
$updatedPage = Page::query()->where('id', '=', $page->id)->first();
// The top level <table> node will get assign the bkmrk-simple-test id because the system will
// take the node value of h5
// So the h5 should get the bkmrk-simple-test-1 id
$this->assertStringContainsString('<h5 id="bkmrk-simple-test-1">Simple Test</h5>', $updatedPage->html);
}
} }