-
Notifications
You must be signed in to change notification settings - Fork 462
fix(ui): keep truncateWithEndVisible code-point-safe in short-width fallback #9029
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.
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
Closed
greymoth-jp
wants to merge
1
commit into
clerk:main
from
greymoth-jp:fix/truncate-end-visible-surrogate
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@clerk/ui': patch | ||
| --- | ||
|
|
||
| Stop `truncateWithEndVisible` from splitting characters outside the BMP (such as CJK Extension B kanji and emoji) into a broken replacement character when truncating to a very small width. The short-width fallback now slices by code point, matching the main truncation path. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Hoist the code-point length check before this fallback.
Line 23 still runs before the code-point-aware
totalChars <= maxLengthguard, so astral-only strings that already fit are still truncated. For example,truncateWithEndVisible('🍣🍣🍣🍣🍣', 8, 5)now returns'...🍣🍣🍣🍣🍣'because Line 18 compares UTF-16 length. That also makes the new assertions at Lines 35-36 validate the wrong behavior; once this is fixed, they should either expect the original string or use a smallermaxLengthto exercise the fallback.Suggested fix
export function truncateWithEndVisible(str: string, maxLength = 20, endChars = 5): string { const ELLIPSIS = '...'; const ELLIPSIS_LENGTH = ELLIPSIS.length; - if (!str || str.length <= maxLength) { + if (!str) { return str; } + + const chars = Array.from(str); + const totalChars = chars.length; + + if (totalChars <= maxLength) { + return str; + } if (maxLength <= endChars + ELLIPSIS_LENGTH) { - return ELLIPSIS + Array.from(str).slice(-endChars).join(''); + return ELLIPSIS + chars.slice(-endChars).join(''); } - - const chars = Array.from(str); - const totalChars = chars.length; - - if (totalChars <= maxLength) { - return str; - }📝 Committable suggestion
🤖 Prompt for AI Agents