gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-08 07:34:25 +01:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

chore(toc): add unique keys to headings

Browse Source
This commit is contained in:
Elian Doran 2025-12-18 10:56:44 +02:00
parent 73f1b91d34
commit 852398426e
No known key found for this signature in database
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/client/src/widgets/sidebar/TableOfContents.tsx
View File

@ -10,6 +10,7 @@ import Icon from "../react/Icon";
import RightPanelWidget from "./RightPanelWidget";
interface RawHeading {
id: string;
level: number;
text: string;
}
@ -73,7 +74,7 @@ function AbstractTableOfContents({ headings }: {
return (
<span className="toc">
<ol>
{nestedHeadings.map(heading => <TableOfContentsHeading heading={heading} />)}
{nestedHeadings.map(heading => <TableOfContentsHeading key={heading.id} heading={heading} />)}
</ol>
</span>
);
@ -95,7 +96,7 @@ function TableOfContentsHeading({ heading }: { heading: HeadingsWithNesting }) {
</li>
{heading.children && (
<ol>
{heading.children.map(heading => <TableOfContentsHeading heading={heading} />)}
{heading.children.map(heading => <TableOfContentsHeading key={heading.id} heading={heading} />)}
</ol>
)}
</>
@ -103,7 +104,7 @@ function TableOfContentsHeading({ heading }: { heading: HeadingsWithNesting }) {
}
function buildHeadingTree(headings: RawHeading[]): HeadingsWithNesting[] {
const root: HeadingsWithNesting = { level: 0, text: "", children: [] };
const root: HeadingsWithNesting = { level: 0, text: "", children: [], id: "_root" };
const stack: HeadingsWithNesting[] = [root];
for (const h of headings) {
@ -124,6 +125,7 @@ function buildHeadingTree(headings: RawHeading[]): HeadingsWithNesting[] {
return root.children;
}
const TOC_ID = 'tocId';
function extractTocFromTextEditor(editor: CKTextEditor) {
const headings: CKHeading[] = [];
@ -131,16 +133,25 @@ function extractTocFromTextEditor(editor: CKTextEditor) {
const root = editor.model.document.getRoot();
if (!root) return [];
for (const { type, item } of editor.model.createRangeIn(root).getWalker()) {
if (type !== "elementStart" || !item.is('element') || !item.name.startsWith('heading')) continue;
editor.model.change(writer => {
for (const { type, item } of editor.model.createRangeIn(root).getWalker()) {
if (type !== "elementStart" || !item.is('element') || !item.name.startsWith('heading')) continue;
const level = Number(item.name.replace( 'heading', '' ));
const text = Array.from( item.getChildren() )
.map( c => c.is( '$text' ) ? c.data : '' )
.join( '' );
const level = Number(item.name.replace( 'heading', '' ));
const text = Array.from( item.getChildren() )
.map( c => c.is( '$text' ) ? c.data : '' )
.join( '' );
headings.push({ level, text, element: item });
}
// Assign a unique ID
let tocId = item.getAttribute(TOC_ID) as string | undefined;
if (!tocId) {
tocId = crypto.randomUUID();
writer.setAttribute(TOC_ID, tocId, item);
}
headings.push({ level, text, element: item, id: tocId });
}
});
return headings;
}