fix(android): clamp text decoration offsets to truncated layout - #58366
Open
lazerg wants to merge 1 commit into
Open
fix(android): clamp text decoration offsets to truncated layout#58366lazerg wants to merge 1 commit into
lazerg wants to merge 1 commit into
Conversation
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary:
On Android, a
TextwithnumberOfLinescan crash when a nestedTexthastextDecorationLine: 'underline'or'line-through'and the decorated span starts or ends past what the truncated layout actually rendered.drawSpannedDecoration()readsstart/endfrom the full, untruncatedSpannedtext and passes them straight toLayout.getPrimaryHorizontal(), which throwsIndexOutOfBoundsExceptiononce numberOfLines cuts the layout shorter than the span.This clamps both offsets to the last position the truncated (and possibly tail-ellipsized) layout can actually resolve before using them, so a partially hidden span draws its decoration up to the visible boundary and a fully hidden span draws nothing, instead of crashing.
Changelog:
[ANDROID] [FIXED] - Fix crash drawing text decoration (underline/strikethrough) when a nested Text's span extends past a numberOfLines-truncated layout
Test Plan:
Added two regression tests in
TextDecorationStyleTest: both build a single-line, tail-ellipsizedStaticLayoutand confirm they throwIndexOutOfBoundsExceptionagainst the pre-fix code. With the fix, one asserts the decoration line is drawn clamped to the visible boundary for a span that starts visible and runs past it, and the other asserts a span that starts entirely past the visible boundary draws a zero-length (invisible) line instead of crashing.Fixes #58356