Skip to content

fix(theme-common): fix extractLeadingEmoji() edge case with digits #12072

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
ian-rehwinkel-lablions wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −5
Open

fix(theme-common): fix extractLeadingEmoji() edge case with digits #12072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a18e5
fix(theme-common): fixed numbers being erroneously recognized as emojis
ian-rehwinkel-lablions May 27, 2026
fec07e4
fix extractLeadingEmoji
slorber May 28, 2026
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
14 changes: 14 additions & 0 deletions packages/docusaurus-theme-common/src/utils/__tests__/emojiUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,18 @@ describe('extractLeadingEmoji', () => {
rest: 'Hello World 😀',
});
});

it('does not extract digits', () => {
expect(extractLeadingEmoji('11 Hello World')).toEqual({
emoji: null,
rest: '11 Hello World',
});
});

it('extract emoji digits', () => {
expect(extractLeadingEmoji('1️⃣ Hello World')).toEqual({
Copy link
Copy Markdown
Collaborator

@slorber slorber May 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this extra test case, that was failing with your impl

emoji: '1️⃣',
rest: ' Hello World',
});
});
});
9 changes: 4 additions & 5 deletions packages/docusaurus-theme-common/src/utils/emojiUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ export function extractLeadingEmoji(input: string): {
return {emoji: null, rest: input};
}

// Leading grapheme contains an emoji (covers flags/ZWJ/skin tones)
if (
!/\p{Extended_Pictographic}/u.test(grapheme) &&
!/\p{Emoji}/u.test(grapheme)
) {
// Leading grapheme contains an emoji
// Covers flags/ZWJ/skin tones, excludes digits
// See https://github.com/facebook/docusaurus/pull/12072
if (!/^\p{RGI_Emoji}$/v.test(grapheme)) {
Copy link
Copy Markdown
Collaborator

@slorber slorber May 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's a better option, apparently, both our test cases now pass successfully

return {emoji: null, rest: input};
}

Expand Down
Loading