Skip to content

fix: Add bold to excludeRangeTypesFromFormatting to fix emoji duplication on web #747

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
TaduJR wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Add bold to excludeRangeTypesFromFormatting to fix emoji duplication on web #747

Show file tree
Hide file tree
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
78 changes: 78 additions & 0 deletions src/__tests__/splitRangesOnEmojis.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,41 @@ describe('single overlap', () => {
{type: 'emoji', start: 4, length: 2},
]);
});

test('bold with emoji in the middle', () => {
let markdownRanges: MarkdownRange[] = [
{type: 'bold', start: 0, length: 10},
{type: 'emoji', start: 3, length: 2},
];

markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'bold', getRangesToExcludeFormatting(markdownRanges));
sortRanges(markdownRanges);

expect(markdownRanges).toEqual([
{type: 'bold', start: 0, length: 3},
{type: 'emoji', start: 3, length: 2},
{type: 'bold', start: 5, length: 5},
]);
});

test('bold with multiple emojis', () => {
let markdownRanges: MarkdownRange[] = [
{type: 'bold', start: 0, length: 10},
{type: 'emoji', start: 2, length: 2},
{type: 'emoji', start: 6, length: 2},
];

markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'bold', getRangesToExcludeFormatting(markdownRanges));
sortRanges(markdownRanges);

expect(markdownRanges).toEqual([
{type: 'bold', start: 0, length: 2},
{type: 'emoji', start: 2, length: 2},
{type: 'bold', start: 4, length: 2},
{type: 'emoji', start: 6, length: 2},
{type: 'bold', start: 8, length: 2},
]);
});
});

describe('multiple overlaps', () => {
Expand Down Expand Up @@ -160,4 +195,47 @@ describe('multiple overlaps', () => {
{type: 'strikethrough', start: 22, length: 5},
]);
});

test('splitting on three types', () => {
let markdownRanges: MarkdownRange[] = [
{type: 'italic', start: 0, length: 20},
{type: 'bold', start: 2, length: 12},
{type: 'strikethrough', start: 4, length: 8},
{type: 'emoji', start: 6, length: 2},
];

markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'italic', getRangesToExcludeFormatting(markdownRanges));
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'bold', getRangesToExcludeFormatting(markdownRanges));
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'strikethrough', getRangesToExcludeFormatting(markdownRanges));
sortRanges(markdownRanges);

expect(markdownRanges).toEqual([
{type: 'italic', start: 0, length: 6},
{type: 'bold', start: 2, length: 4},
{type: 'strikethrough', start: 4, length: 2},
{type: 'emoji', start: 6, length: 2},
{type: 'italic', start: 8, length: 12},
{type: 'bold', start: 8, length: 6},
{type: 'strikethrough', start: 8, length: 4},
]);
});

test('nested ranges with emoji', () => {
let markdownRanges: MarkdownRange[] = [
{type: 'italic', start: 1, length: 15},
{type: 'bold', start: 5, length: 7},
{type: 'emoji', start: 10, length: 2},
];

markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'italic', getRangesToExcludeFormatting(markdownRanges));
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'bold', getRangesToExcludeFormatting(markdownRanges));
sortRanges(markdownRanges);

expect(markdownRanges).toEqual([
{type: 'italic', start: 1, length: 9},
{type: 'bold', start: 5, length: 5},
{type: 'emoji', start: 10, length: 2},
{type: 'italic', start: 12, length: 4},
]);
});
});
3 changes: 2 additions & 1 deletion src/parseExpensiMark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,10 @@ function parseExpensiMark(markdown: string): MarkdownRange[] {
}
let markdownRanges = sortRanges(ranges);

// Prevent italic and strikethrough formatting inside emojis and inline code blocks
// Prevent italic, bold and strikethrough formatting inside emojis and inline code blocks
const rangesToExclude = getRangesToExcludeFormatting(markdownRanges);
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'italic', rangesToExclude);
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'bold', rangesToExclude);
markdownRanges = excludeRangeTypesFromFormatting(markdownRanges, 'strikethrough', rangesToExclude);

const groupedRanges = groupRanges(markdownRanges);
Expand Down