Skip to content

regression: Announcement link open in new tab #20435

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

Merged
ggazzo merged 3 commits into from
Jan 27, 2021
Merged

regression: Announcement link open in new tab #20435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85c3110
click on the link open in new tab
tiagoevanp Jan 27, 2021
eaeebda
Merge branch 'develop' into regression/announcement
ggazzo Jan 27, 2021
922d093
Fix review
ggazzo Jan 27, 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
11 changes: 10 additions & 1 deletion client/components/MarkdownText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,28 @@ import React, { useMemo } from 'react';
import marked from 'marked';
import dompurify from 'dompurify';

const renderer = new marked.Renderer();

marked.InlineLexer.rules.gfm.strong = /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/;
marked.InlineLexer.rules.gfm.em = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;

const linkRenderer = renderer.link;
renderer.link = function(href, title, text) {
const html = linkRenderer.call(renderer, href, title, text);
return html.replace(/^<a /, '<a target="_blank" rel="nofollow" ');
};

const options = {
gfm: true,
headerIds: false,
renderer,
};

function MarkdownText({ content, preserveHtml = false, withRichContent = true, ...props }) {
const sanitizer = dompurify.sanitize;
const __html = useMemo(() => {
const html = content && marked(content, options);
return preserveHtml ? html : html && sanitizer(html);
return preserveHtml ? html : html && sanitizer(html, { ADD_ATTR: ['target'] });
}, [content, preserveHtml, sanitizer]);
return __html ? <Box dangerouslySetInnerHTML={{ __html }} withRichContent={withRichContent} {...props} /> : null;
}
Expand Down