Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New placeholder feature & hast refactoring #3

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+825 −737
Open

New placeholder feature & hast refactoring #3

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
182702a
Hast refactoring and new placeholder feature
Jan 6, 2021
de85d90
release v3.1.0
Jan 6, 2021
a7d5114
Add optional TOC inclusion feature
Jan 12, 2021
04aef46
release v3.1.1
Jan 12, 2021
6646eed
Fix TOC generation
Jan 25, 2021
6c3c24c
release v3.1.2
Jan 25, 2021
517d990
Remove optional chaining for Node<14 compatibility
Mar 30, 2021
f07bad9
release v3.1.3
Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix TOC generation
  • Loading branch information
Jule Marcoueille committed Jan 25, 2021
commit 6646eedbdff7b643695408adc943037ca0569a91
15 changes: 8 additions & 7 deletions src/rehype-toc.ts
View file
Original file line number Diff line number Diff line change
@@ -23,18 +23,19 @@ export function toc(this: Processor, opts?: Options): Transformer {

let mainNode: Element | undefined;
let mainParent: Parent | undefined;
let placeholderNode: Element | undefined;
let placeholderParent: Parent | undefined;

if (options.placeholder) {
// Find the <target> element if option is given
[mainNode, mainParent] = findPlaceholderNode(root, options.placeholder);
[placeholderNode, placeholderParent] = findPlaceholderNode(root, options.placeholder);

if (!mainNode || !mainParent) { return root; }
}
else {
// Find the <main> or <body> element
[mainNode, mainParent] = findMainNode(root);
if (!placeholderNode || !placeholderParent) { return root; }
}

// Find the <main> or <body> element
[mainNode, mainParent] = findMainNode(root);

// Find all heading elements
let headings = findHeadings(mainNode, options);

@@ -46,7 +47,7 @@ export function toc(this: Processor, opts?: Options): Transformer {

if (node) {
// Add the table of contents to the <main> element
insertTOC(node, mainNode, mainParent, { ...options, replace: !!options.placeholder });
insertTOC(node, placeholderNode || mainNode, placeholderParent || mainParent, { ...options, replace: !!options.placeholder });
}

return root;