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

Jump to bottom

[FIX] - Footnote references #304

Merged
merged 2 commits into from May 19, 2020
Merged

[FIX] - Footnote references #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a16c32
Change footnote regular expressions
May 11, 2020
27cb1c1
Change regex and use options.slugify
May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 61 additions & 0 deletions index.compiler.spec.js
View file
Open in desktop
Expand Up @@ -2972,6 +2972,67 @@ describe('footnotes', () => {
</footer>
</div>

`);
});

it('should handle complex references', () => {
render(compiler(['foo[^referencé heré 123] bar', '', '[^referencé heré 123]: Baz baz'].join('\n')));

expect(root.innerHTML).toMatchInlineSnapshot(`

<div data-reactroot>
<p>
foo
<a href="#reference-here-123">
<sup>
referencé heré 123
</sup>
</a>
bar
</p>
<footer>
<div id="reference-here-123">
referencé heré 123
: Baz baz
</div>
</footer>
</div>

`);
});

it('should handle conversion of multiple references into links', () => {
render(compiler(['foo[^abc] bar. baz[^def]', '', '[^abc]: Baz baz', '[^def]: Def'].join('\n')));

expect(root.innerHTML).toMatchInlineSnapshot(`

<div data-reactroot>
<p>
foo
<a href="#abc">
<sup>
abc
</sup>
</a>
bar. baz
<a href="#def">
<sup>
def
</sup>
</a>
</p>
<footer>
<div id="abc">
abc
: Baz baz
</div>
<div id="def">
def
: Def
</div>
</footer>
</div>

`);
});

Expand Down
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Expand Up @@ -111,8 +111,8 @@ const CODE_BLOCK_R = /^(?: {4}[^\n]+\n*)+(?:\n *)+\n?/;
const CODE_INLINE_R = /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/;
const CONSECUTIVE_NEWLINE_R = /^(?:\n *)*\n/;
const CR_NEWLINE_R = /\r\n?/g;
const FOOTNOTE_R = /^\[\^(.*)\](:.*)\n/;
const FOOTNOTE_REFERENCE_R = /^\[\^(.*)\]/;
const FOOTNOTE_R = /^\[\^([^\]]+)](:.*)\n/;
const FOOTNOTE_REFERENCE_R = /^\[\^([^\]]+)]/;
const FORMFEED_R = /\f/g;
const GFM_TASK_R = /^\s*?\[(x|\s)\]/;
const HEADING_R = /^ *(#{1,6}) *([^\n]+)\n{0,2}/;
Expand Down Expand Up @@ -966,7 +966,7 @@ export function compiler(markdown, options) {
parse(capture /*, parse*/) {
return {
content: capture[1],
target: `#${capture[1]}`,
target: `#${options.slugify(capture[1])}`,
};
},
react(node, output, state) {
Expand Down Expand Up @@ -1565,7 +1565,7 @@ export function compiler(markdown, options) {
<footer key="footer">
{footnotes.map(function createFootnote(def) {
return (
<div id={def.identifier} key={def.identifier}>
<div id={options.slugify(def.identifier)} key={def.identifier}>
{def.identifier}
{emitter(parser(def.footnote, { inline: true }))}
</div>
Expand Down