git.iko.soy/urbit.org
on master help sign in
Markdown: properly wraps child nodes for italicised links
4718e6cMatilde Park
components/Markdown.js+10−6
compare with master
unifiedsplit
@@ -7,12 +7,12 @@ import normalize from "mdurl/encode";
7import merge from "deepmerge";
7import merge from "deepmerge";
8import github from "hast-util-sanitize/lib/github";
8import github from "hast-util-sanitize/lib/github";
9import remarkParse from "remark-parse";
9import remarkParse from "remark-parse";
10−import remarkRehype, { defaultHandlers } from "remark-rehype";
10+import remarkRehype, { defaultHandlers, all } from "remark-rehype";
11import rehypeStringify from "rehype-stringify";
11import rehypeStringify from "rehype-stringify";
12import rehypeRaw from "rehype-raw";
12import rehypeRaw from "rehype-raw";
13
13
14// img is wrapped in figure so that images can be extra wide in the blog posts
14// img is wrapped in figure so that images can be extra wide in the blog posts
15−function Img(h, node) {
15+function img(h, node) {
16 var props = { src: normalize(node.url), alt: node.alt };
16 var props = { src: normalize(node.url), alt: node.alt };
17 if (node.title !== null && node.title !== undefined) {
17 if (node.title !== null && node.title !== undefined) {
18 props.title = node.title;
18 props.title = node.title;
@@ -31,7 +31,7 @@ function Img(h, node) {
31 };
31 };
32}
32}
33
33
34−function Link(h, node) {
34+function a(h, node) {
35 const url = node.url;
35 const url = node.url;
36
36
37 if (
37 if (
@@ -45,7 +45,7 @@ function Link(h, node) {
45 properties: {
45 properties: {
46 href: url,
46 href: url,
47 },
47 },
48− children: node.children,
48+ children: all(h, node),
49 };
49 };
50 } else {
50 } else {
51 return {
51 return {
@@ -56,14 +56,18 @@ function Link(h, node) {
56 rel: "noopener",
56 rel: "noopener",
57 href: url,
57 href: url,
58 },
58 },
59− children: node.children,
59+ children: all(h, node),
60 };
60 };
61 }
61 }
62}
62}
63
63
64+const handlers = defaultHandlers;
65+handlers.link = a;
66+handlers.image = img;
67+
64const options = {
68const options = {
65 allowDangerousHtml: true,
69 allowDangerousHtml: true,
66− handlers: Object.assign(defaultHandlers, { image: Img, link: Link }),
70+ handlers: handlers,
67 sanitize: merge(github, {
71 sanitize: merge(github, {
68 // remove user-content from github.json to remark-slug work as expected
72 // remove user-content from github.json to remark-slug work as expected
69 clobberPrefix: "",
73 clobberPrefix: "",