Skip to content

【iOS】Fixes ellipsis carries background from trimmed text #39408

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

Closed
zhongwuzw wants to merge 13 commits into from
Closed

【iOS】Fixes ellipsis carries background from trimmed text #39408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
96a31c2
【iOS】Fixes ellipsis carries background from trimmed text
zhongwuzw Sep 12, 2023
4817a95
Revert "【iOS】Fixes ellipsis carries background from trimmed text"
zhongwuzw Oct 17, 2023
aadbf6f
Support old and Fabric arch
zhongwuzw Oct 17, 2023
8217fb8
Merge commit 'd7af27dd7da529eb3feda12c45eefe35f9a7f79f' into features…
zhongwuzw Nov 10, 2023
b8cfea9
Merge master
zhongwuzw May 10, 2024
92f860a
Fix for new arch
zhongwuzw May 10, 2024
e84336a
Merge branch 'features/fix_bridgeless_block' into features/fix_ellips…
zhongwuzw Jul 9, 2024
c3afd09
Add maximunNumberOfLines gate
zhongwuzw Jul 9, 2024
20ccff6
Keep the same style of the character that precedes it
zhongwuzw Jul 10, 2024
80cd8e0
Simply remove attributes operation
zhongwuzw Jul 10, 2024
19e3ef3
Only remove color attributes
zhongwuzw Jul 10, 2024
41a1132
optimize code
zhongwuzw Jul 10, 2024
3c536f7
fix shallow variable
zhongwuzw Jul 10, 2024
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
41 changes: 41 additions & 0 deletions packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,54 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size exclusiv
maximumFontSize:self.textAttributes.effectiveFont.pointSize];
}

[self processTruncatedAttributedText:textStorage textContainer:textContainer layoutManager:layoutManager];

if (!exclusiveOwnership) {
[_cachedTextStorages setObject:textStorage forKey:key];
}

return textStorage;
}

- (void)processTruncatedAttributedText:(NSTextStorage *)textStorage
textContainer:(NSTextContainer *)textContainer
layoutManager:(NSLayoutManager *)layoutManager
{
if (_maximumNumberOfLines > 0) {
[layoutManager ensureLayoutForTextContainer:textContainer];
NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
__block int line = 0;
[layoutManager
enumerateLineFragmentsForGlyphRange:glyphRange
usingBlock:^(
CGRect rect,
CGRect usedRect,
NSTextContainer *_Nonnull _,
NSRange lineGlyphRange,
BOOL *_Nonnull stop) {
if (line == textContainer.maximumNumberOfLines - 1) {
NSRange truncatedRange = [layoutManager
truncatedGlyphRangeInLineFragmentForGlyphAtIndex:lineGlyphRange.location];

if (truncatedRange.location != NSNotFound && truncatedRange.location >= 1) {
// Remove color attributes for truncated range
for (NSAttributedStringKey key in
@[ NSForegroundColorAttributeName, NSBackgroundColorAttributeName ]) {
[textStorage removeAttribute:key range:truncatedRange];
id attribute = [textStorage attribute:key
atIndex:truncatedRange.location - 1
effectiveRange:nil];
if (attribute) {
[textStorage addAttribute:key value:attribute range:truncatedRange];
}
}
}
}
line++;
}];
}
}

- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics layoutContext:(RCTLayoutContext)layoutContext
{
// If the view got new `contentFrame`, we have to redraw it because
Expand Down
42 changes: 42 additions & 0 deletions ...r/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ - (void)drawAttributedString:(AttributedString)attributedString
#endif

NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];

[self processTruncatedAttributedText:textStorage textContainer:textContainer layoutManager:layoutManager];

[layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:frame.origin];
[layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:frame.origin];

Expand Down Expand Up @@ -122,6 +125,45 @@ - (void)drawAttributedString:(AttributedString)attributedString
}
}

- (void)processTruncatedAttributedText:(NSTextStorage *)textStorage
textContainer:(NSTextContainer *)textContainer
layoutManager:(NSLayoutManager *)layoutManager
{
if (textContainer.maximumNumberOfLines > 0) {
[layoutManager ensureLayoutForTextContainer:textContainer];
NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
__block int line = 0;
[layoutManager
enumerateLineFragmentsForGlyphRange:glyphRange
usingBlock:^(
CGRect rect,
CGRect usedRect,
NSTextContainer *_Nonnull _,
NSRange lineGlyphRange,
BOOL *_Nonnull stop) {
if (line == textContainer.maximumNumberOfLines - 1) {
NSRange truncatedRange = [layoutManager
truncatedGlyphRangeInLineFragmentForGlyphAtIndex:lineGlyphRange.location];

if (truncatedRange.location != NSNotFound && truncatedRange.location >= 1) {
// Remove color attributes for truncated range
for (NSAttributedStringKey key in
@[ NSForegroundColorAttributeName, NSBackgroundColorAttributeName ]) {
[textStorage removeAttribute:key range:truncatedRange];
id attribute = [textStorage attribute:key
atIndex:truncatedRange.location - 1
effectiveRange:nil];
if (attribute) {
[textStorage addAttribute:key value:attribute range:truncatedRange];
}
}
}
}
line++;
}];
}
}

- (LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedString)attributedString
paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
size:(CGSize)size
Expand Down