Skip to content

fix(react):fix(react): prevent intra-word and whitespace-flanked markdown emphasis in composer #1418

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

Open
swarnendusahu10-dotcom wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(react):fix(react): prevent intra-word and whitespace-flanked markdown emphasis in composer #1418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 37 additions & 1 deletion packages/react/src/lib/contentEditableComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,38 @@ const findLink = (text, start) => {
};
};

const EMPHASIS_MARKERS = new Set(['*', '**', '_', '__']);

const isWhitespace = (character) =>
character === undefined || /\s/.test(character);

const isWordCharacter = (character) =>
character !== undefined && /[\p{L}\p{N}]/u.test(character);

const canOpenEmphasis = (text, start, marker) => {
if (!EMPHASIS_MARKERS.has(marker)) return true;
if (isWhitespace(text[start + marker.length])) return false;
if (marker[0] === '_' && isWordCharacter(text[start - 1])) return false;
return true;
};

const canCloseEmphasis = (text, end, marker) => {
if (!EMPHASIS_MARKERS.has(marker)) return true;
if (isWhitespace(text[end - 1])) return false;
if (marker[0] === '_' && isWordCharacter(text[end + marker.length])) {
return false;
}
return true;
};

const findClosingMarker = (text, from, marker) => {
let end = text.indexOf(marker, from);
while (end !== -1 && !canCloseEmphasis(text, end, marker)) {
end = text.indexOf(marker, end + marker.length);
}
return end;
};

const appendMarkdown = (parent, text) => {
const tokens = [
['**', 'strong'],
Expand Down Expand Up @@ -89,9 +121,13 @@ const appendMarkdown = (parent, text) => {
}
}

if (token && !canOpenEmphasis(text, index, token[0])) {
token = undefined;
}

if (token) {
const [marker, tagName] = token;
const end = text.indexOf(marker, index + marker.length);
const end = findClosingMarker(text, index + marker.length, marker);
if (end > index + marker.length) {
flush();
const formatted = document.createElement(tagName);
Expand Down