cc/CoastalCommitsPastes
cc/CoastalCommitsPastes
3
1
Fork 0
forked from CoastalCommitsArchival/github.com-MaxLeiter-drift
Code Pull requests Activity Actions

client/server: render nested elements in headings

Browse source
This commit is contained in:
Max Leiter 2022-03-22 23:16:34 -07:00
parent f92d854336
commit a139acc747
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: A3512F2F2F17EBDA
2 changed files with 4 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
client/lib/render-markdown.tsx
View file

@ -8,40 +8,6 @@ delete defaultProps.theme
const renderer = new marked.Renderer() const renderer = new marked.Renderer()
const convertHtmlEntities = (str: string) => {
const quot = '"'
const apos = '''
const amp = '&'
const nbsp = ' '
const lt = '<'
const gt = '>'
const code = '<code>'
const endCode = '</code>'
const combinedRegex = new RegExp(`${code}|${endCode}|${quot}|${apos}|${amp}|${nbsp}|${lt}|${gt}`, 'g')
return str.replace(combinedRegex, (match) => {
switch (match) {
case quot:
return '"'
case apos:
return "'"
case amp:
return '&'
case nbsp:
return ' '
case lt:
return '<'
case gt:
return '>'
case code:
case endCode:
return '`'
default:
return match
}
})
}
renderer.heading = (text, level, _, slugger) => { renderer.heading = (text, level, _, slugger) => {
const id = slugger.slug(text) const id = slugger.slug(text)
const Component = `h${level}` const Component = `h${level}`
@ -51,8 +17,7 @@ renderer.heading = (text, level, _, slugger) => {
return renderToStaticMarkup( return renderToStaticMarkup(
//@ts-ignore //@ts-ignore
<Component> <Component>
<a href={`#${id}`} id={id} style={{ color: "inherit" }} > <a href={`#${id}`} id={id} style={{ color: "inherit" }} dangerouslySetInnerHTML={{ __html: (text) }} >
{convertHtmlEntities(text)}
</a> </a>
</Component> </Component>
) )
@ -70,7 +35,7 @@ renderer.heading = (text, level, _, slugger) => {
// // dirty hack // // dirty hack
// // if text contains elements, render as html // // if text contains elements, render as html
// return `<a href='${href}' target="_blank" rel="noopener noreferrer">${convertHtmlEntities(text)}</a>` // return <a href={href || ""} target="_blank" rel="noopener noreferrer" dangerouslySetInnerHTML={{ __html: convertHtmlEntities(text) }} ></a>
// } // }

39
server/src/lib/render-markdown.tsx
View file

@ -8,40 +8,6 @@ delete defaultProps.theme
const renderer = new marked.Renderer() const renderer = new marked.Renderer()
const convertHtmlEntities = (str: string) => {
const quot = '&quot;'
const apos = '&#39;'
const amp = '&amp;'
const nbsp = '&nbsp;'
const lt = '&lt;'
const gt = '&gt;'
const code = '<code>'
const endCode = '</code>'
const combinedRegex = new RegExp(`${code}|${endCode}|${quot}|${apos}|${amp}|${nbsp}|${lt}|${gt}`, 'g')
return str.replace(combinedRegex, (match) => {
switch (match) {
case quot:
return '"'
case apos:
return "'"
case amp:
return '&'
case nbsp:
return ' '
case lt:
return '<'
case gt:
return '>'
case code:
case endCode:
return '`'
default:
return match
}
})
}
renderer.heading = (text, level, _, slugger) => { renderer.heading = (text, level, _, slugger) => {
const id = slugger.slug(text) const id = slugger.slug(text)
const Component = `h${level}` const Component = `h${level}`
@ -51,8 +17,7 @@ renderer.heading = (text, level, _, slugger) => {
return renderToStaticMarkup( return renderToStaticMarkup(
//@ts-ignore //@ts-ignore
<Component> <Component>
<a href={`#${id}`} id={id} style={{ color: "inherit" }} > <a href={`#${id}`} id={id} style={{ color: "inherit" }} dangerouslySetInnerHTML={{ __html: (text) }} >
{convertHtmlEntities(text)}
</a> </a>
</Component> </Component>
) )
@ -70,7 +35,7 @@ renderer.heading = (text, level, _, slugger) => {
// // dirty hack // // dirty hack
// // if text contains elements, render as html // // if text contains elements, render as html
// return `<a href='${href}' target="_blank" rel="noopener noreferrer">${convertHtmlEntities(text)}</a>` // return <a href={href || ""} target="_blank" rel="noopener noreferrer" dangerouslySetInnerHTML={{ __html: convertHtmlEntities(text) }} ></a>
// } // }