Skip to content

Resolve dynamic border and outline colors against the view trait collection in Fabric #57837

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
JacquesLeupin wants to merge 1 commit into
base: main
Choose a base branch
from
+61 −9
Open

Resolve dynamic border and outline colors against the view trait collection in Fabric #57837

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
30 changes: 21 additions & 9 deletions packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,13 +904,21 @@ static void RCTAddContourEffectToLayer(
[layer removeAllAnimations];
}

static RCTBorderColors RCTCreateRCTBorderColorsFromBorderColors(BorderColors borderColors)
// CALayer colors are plain CGColors: converting a dynamic (PlatformColor /
// DynamicColorIOS) UIColor without an explicit trait collection resolves against
// UITraitCollection.currentTraitCollection, which tracks the system appearance
// and ignores any overrideUserInterfaceStyle inherited by the view. Resolve
// against the view's own trait collection instead, matching the backgroundColor
// handling in invalidateLayer.
static RCTBorderColors RCTCreateRCTBorderColorsFromBorderColors(
BorderColors borderColors,
UITraitCollection *traitCollection)
{
return RCTBorderColors{
.top = RCTUIColorFromSharedColor(borderColors.top),
.left = RCTUIColorFromSharedColor(borderColors.left),
.bottom = RCTUIColorFromSharedColor(borderColors.bottom),
.right = RCTUIColorFromSharedColor(borderColors.right)};
.top = [RCTUIColorFromSharedColor(borderColors.top) resolvedColorWithTraitCollection:traitCollection],
.left = [RCTUIColorFromSharedColor(borderColors.left) resolvedColorWithTraitCollection:traitCollection],
.bottom = [RCTUIColorFromSharedColor(borderColors.bottom) resolvedColorWithTraitCollection:traitCollection],
.right = [RCTUIColorFromSharedColor(borderColors.right) resolvedColorWithTraitCollection:traitCollection]};
}

static CALayerCornerCurve CornerCurveFromBorderCurve(BorderCurve borderCurve)
Expand Down Expand Up @@ -1148,7 +1156,8 @@ - (void)invalidateLayer
_borderLayer = nil;

layer.borderWidth = (CGFloat)borderMetrics.borderWidths.left;
UIColor *borderColor = RCTUIColorFromSharedColor(borderMetrics.borderColors.left);
UIColor *borderColor = [RCTUIColorFromSharedColor(borderMetrics.borderColors.left)
resolvedColorWithTraitCollection:self.traitCollection];
layer.borderColor = borderColor.CGColor;
layer.cornerRadius = (CGFloat)borderMetrics.borderRadii.topLeft.horizontal;
layer.cornerCurve = CornerCurveFromBorderCurve(borderMetrics.borderCurves.topLeft);
Expand All @@ -1166,7 +1175,8 @@ - (void)invalidateLayer
layer.borderColor = nil;
layer.cornerRadius = 0;

RCTBorderColors borderColors = RCTCreateRCTBorderColorsFromBorderColors(borderMetrics.borderColors);
RCTBorderColors borderColors =
RCTCreateRCTBorderColorsFromBorderColors(borderMetrics.borderColors, self.traitCollection);

RCTAddContourEffectToLayer(
_borderLayer,
Expand Down Expand Up @@ -1195,11 +1205,13 @@ - (void)invalidateLayer
// have to be drawn with Core Graphics, the same way non-solid borders are.
if (_props->outlineStyle == OutlineStyle::Solid && areBorderRadiiCircular(borderMetrics.borderRadii) &&
borderMetrics.borderRadii.topLeft.horizontal == 0) {
UIColor *outlineColor = RCTUIColorFromSharedColor(_props->outlineColor);
UIColor *outlineColor =
[RCTUIColorFromSharedColor(_props->outlineColor) resolvedColorWithTraitCollection:self.traitCollection];
_outlineLayer.borderWidth = _props->outlineWidth;
_outlineLayer.borderColor = outlineColor.CGColor;
} else {
UIColor *outlineColor = RCTUIColorFromSharedColor(_props->outlineColor);
UIColor *outlineColor =
[RCTUIColorFromSharedColor(_props->outlineColor) resolvedColorWithTraitCollection:self.traitCollection];

RCTAddContourEffectToLayer(
_outlineLayer,
Expand Down
40 changes: 40 additions & 0 deletions packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,4 +281,44 @@ - (void)testSquareDottedAndDashedOutlinesAreDrawnWithCoreGraphics
}
}

#pragma mark - dynamic border and outline colors

- (void)testDynamicBorderAndOutlineColorsResolveAgainstViewTraitCollection
{
auto dynamicColor = SharedColor(Color(
DynamicColor{
.lightColor = static_cast<int32_t>(0xFFFF0000u),
.darkColor = static_cast<int32_t>(0xFF00FF00u),
}));
UITraitCollection *lightTraits = [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleLight];

[lightTraits performAsCurrentTraitCollection:^{
RCTViewComponentView *view = [RCTViewComponentView new];
view.frame = CGRectMake(0, 0, 100, 100);
view.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
view.clipsToBounds = YES;

XCTAssertEqual([UITraitCollection currentTraitCollection].userInterfaceStyle, UIUserInterfaceStyleLight);
XCTAssertEqual(view.traitCollection.userInterfaceStyle, UIUserInterfaceStyleDark);

auto props = std::make_shared<ViewProps>();
props->yogaStyle.setBorder(facebook::yoga::Edge::All, facebook::yoga::StyleLength::points(4));
props->borderColors.all = dynamicColor;
props->borderStyles.all = BorderStyle::Solid;
props->outlineWidth = 4;
props->outlineColor = dynamicColor;
props->outlineStyle = OutlineStyle::Solid;

[view updateProps:props oldProps:ViewShadowNode::defaultSharedProps()];
[view finalizeUpdates:RNComponentViewUpdateMaskProps];

CALayer *outlineLayer = [view valueForKey:@"_outlineLayer"];
XCTAssertNotNil(outlineLayer);
XCTAssertNotNil((__bridge id)view.layer.borderColor);
XCTAssertNotNil((__bridge id)outlineLayer.borderColor);
XCTAssertTrue(CGColorEqualToColor(view.layer.borderColor, UIColor.greenColor.CGColor));
XCTAssertTrue(CGColorEqualToColor(outlineLayer.borderColor, UIColor.greenColor.CGColor));
}];
}

@end