Fix anchors erroring when heading is empty (#772)

This commit is contained in:
Luis Merino 2018-06-16 06:04:46 +02:00 committed by Yangshun Tay
parent 850e3003ca
commit 371fdda4a8
2 changed files with 26 additions and 11 deletions

View file

@ -6,10 +6,13 @@
*/
const anchors = require('../anchors');
const rules = require('remarkable/lib/rules');
const md = {
renderer: {
rules: {},
rules: {
heading_open: rules.heading_open,
},
},
};
@ -109,3 +112,8 @@ test('Anchor index resets on each render', () => {
'id="almost-unique-heading-1"'
);
});
test('Anchor uses default renderer when empty', () => {
expect(render([{hLevel: 1}, {content: null}], 0, {}, {})).toEqual('<h1>');
expect(render([{hLevel: 2}, {content: ''}], 0, {}, {})).toEqual('<h2>');
});

View file

@ -11,19 +11,26 @@ const toSlug = require('./toSlug.js');
* The anchors plugin adds GFM-style anchors to headings.
*/
function anchors(md) {
const originalRender = md.renderer.rules.heading_open;
md.renderer.rules.heading_open = function(tokens, idx, options, env) {
const textToken = tokens[idx + 1];
const anchor = toSlug(textToken.content, env);
return (
'<h' +
tokens[idx].hLevel +
'><a class="anchor" aria-hidden="true" id="' +
anchor +
'"></a><a href="#' +
anchor +
'" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>'
);
if (textToken.content) {
const anchor = toSlug(textToken.content, env);
return (
'<h' +
tokens[idx].hLevel +
'><a class="anchor" aria-hidden="true" id="' +
anchor +
'"></a><a href="#' +
anchor +
'" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>'
);
}
return originalRender(tokens, idx, options, env);
};
}