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

Revert "fix: Inconsistent Markdown Formatting in Custom Status Field" #33127

Merged
merged 4 commits into from
Aug 22, 2024
Merged

Revert "fix: Inconsistent Markdown Formatting in Custom Status Field" #33127

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6df5e38
Revert "fix: Inconsistent Markdown Formatting in Custom Status Field …
csuadev Aug 22, 2024
5e405f8
Merge branch 'develop' into revert-32574-fix/apply-strong-if-asterisk
kodiakhq[bot] Aug 22, 2024
53be134
Merge branch 'develop' into revert-32574-fix/apply-strong-if-asterisk
kodiakhq[bot] Aug 22, 2024
955156e
Merge branch 'develop' into revert-32574-fix/apply-strong-if-asterisk
kodiakhq[bot] Aug 22, 2024
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
5 changes: 0 additions & 5 deletions .changeset/kind-drinks-joke.md
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions apps/meteor/client/components/MarkdownText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,16 @@ type MarkdownTextParams = {
withTruncatedText: boolean;
} & ComponentProps<typeof Box>;

const walkTokens = (token: marked.Token) => {
const boldPattern = /^\*.*\*$|^\*.*|.*\*$/;
const italicPattern = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
if (boldPattern.test(token.raw)) {
token.type = 'strong';
} else if (italicPattern.test(token.raw)) {
token.type = 'em';
}
};

marked.use({ walkTokens });
const documentRenderer = new marked.Renderer();
const inlineRenderer = new marked.Renderer();
const inlineWithoutBreaks = new marked.Renderer();

marked.Lexer.rules.gfm = {
...marked.Lexer.rules.gfm,
strong: /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
em: /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
};

const linkMarked = (href: string | null, _title: string | null, text: string): string =>
`<a href="${href}" rel="nofollow noopener noreferrer">${text}</a> `;
const paragraphMarked = (text: string): string => text;
Expand Down Expand Up @@ -117,6 +112,7 @@ const MarkdownText = ({
const markedHtml = /inline/.test(variant)
? marked.parseInline(new Option(content).innerHTML, markedOptions)
: marked.parse(new Option(content).innerHTML, markedOptions);

if (parseEmoji) {
// We are using the old emoji parser here. This could come
// with additional processing use, but is the workaround available right now.
Expand Down
Loading