Skip to content

[0.87] fix(ios): backport clear text background omission for IME underlines #59445

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
kurohune538 wants to merge 1 commit into
base: 0.87-stable
Choose a base branch
from
+67 −1
Open

[0.87] fix(ios): backport clear text background omission for IME underlines #59445

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
65 changes: 65 additions & 0 deletions packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <react/renderer/attributedstring/conversions.h>
#include <react/renderer/core/RawValue.h>
#include <react/renderer/graphics/Color.h>

using namespace facebook::react;

Expand Down Expand Up @@ -45,6 +46,70 @@ - (void)testTextAlignmentStartAndEndResolveWithLayoutDirection
XCTAssertEqual(NSTextAlignmentFromTextAlign(@"end", LayoutDirection::RightToLeft), NSTextAlignmentLeft);
}

- (void)testDefaultClearBackgroundIsOmitted
{
TextAttributes textAttributes = TextAttributes::defaultTextAttributes();

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertNil(attributes[NSBackgroundColorAttributeName]);
XCTAssertEqualObjects(attributes[NSForegroundColorAttributeName], [UIColor colorWithRed:0 green:0 blue:0 alpha:1]);
}

- (void)testOpacityDoesNotAddBackgroundColor
{
TextAttributes textAttributes;
textAttributes.opacity = 0.5;

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertNil(attributes[NSBackgroundColorAttributeName]);
XCTAssertEqualObjects(attributes[NSForegroundColorAttributeName], [UIColor colorWithWhite:0 alpha:0.5]);
}

- (void)testDefaultClearBackgroundWithOpacityIsOmitted
{
TextAttributes textAttributes = TextAttributes::defaultTextAttributes();
textAttributes.opacity = 0.5;

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertNil(attributes[NSBackgroundColorAttributeName]);
XCTAssertEqualObjects(attributes[NSForegroundColorAttributeName], [UIColor colorWithRed:0 green:0 blue:0 alpha:0.5]);
}

- (void)testVisibleBackgroundColorPreservesAlphaWithOpacity
{
TextAttributes textAttributes;
textAttributes.backgroundColor = colorFromComponents({.red = 1, .alpha = 0.5, .colorSpace = ColorSpace::sRGB});

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertEqualObjects(attributes[NSBackgroundColorAttributeName], [UIColor colorWithRed:1 green:0 blue:0 alpha:0.5]);

textAttributes.opacity = 0.5;
attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertEqualObjects(attributes[NSBackgroundColorAttributeName], [UIColor colorWithRed:1 green:0 blue:0 alpha:0.25]);
}

- (void)testForegroundColorPreservesAlphaWithOpacity
{
TextAttributes textAttributes = TextAttributes::defaultTextAttributes();
textAttributes.foregroundColor = colorFromComponents({.blue = 1, .alpha = 0.5, .colorSpace = ColorSpace::sRGB});

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertNil(attributes[NSBackgroundColorAttributeName]);
XCTAssertEqualObjects(attributes[NSForegroundColorAttributeName], [UIColor colorWithRed:0 green:0 blue:1 alpha:0.5]);

textAttributes.opacity = 0.5;
attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);

XCTAssertNil(attributes[NSBackgroundColorAttributeName]);
XCTAssertEqualObjects(attributes[NSForegroundColorAttributeName], [UIColor colorWithRed:0 green:0 blue:1 alpha:0.25]);
}

- (void)testSamenessOfEmptyAttributedStrings
{
NSAttributedString *attributedString1 = [[NSAttributedString alloc] initWithString:@""];
Expand Down
3 changes: 2 additions & 1 deletion ...textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
attributes[NSForegroundColorAttributeName] = effectiveForegroundColor;
}

if (textAttributes.backgroundColor || !isnan(textAttributes.opacity)) {
// A clear background draws nothing, but TextKit still computes and fills its rects on every draw.
if (textAttributes.backgroundColor && textAttributes.backgroundColor != clearColor()) {
attributes[NSBackgroundColorAttributeName] = RCTEffectiveBackgroundColorFromTextAttributes(textAttributes);
}

Expand Down
Loading