Skip to content

fix(macos): keep the view's shadow color alive #3129

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

Draft
Saad Najmi (Saadnajmi) wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(macos): keep the view's shadow color alive #3129

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
14 changes: 4 additions & 10 deletions packages/react-native/React/Views/RCTView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ @implementation RCTView {
NSTrackingArea *_trackingArea;
BOOL _hasMouseOver;
BOOL _mouseDownCanMoveWindow;
NSColor *_innerShadowColor;
#endif // macOS]
NSMutableDictionary<NSString *, NSDictionary *> *accessibilityActionsNameMap;
NSMutableDictionary<NSString *, NSDictionary *> *accessibilityActionsLabelMap;
Expand Down Expand Up @@ -731,11 +732,8 @@ - (NSString *)description
#if TARGET_OS_OSX // [macOS
- (void)setShadowColor:(CGColorRef)shadowColor
{
if (_shadowColor != shadowColor)
{
_shadowColor = shadowColor;
[self didUpdateShadow];
}
_innerShadowColor = shadowColor != NULL ? [NSColor colorWithCGColor:shadowColor] : nil;
[self didUpdateShadow];
}

- (void)setShadowOffset:(CGSize)shadowOffset
Expand Down Expand Up @@ -768,11 +766,7 @@ - (void)setShadowRadius:(CGFloat)shadowRadius
-(void)didUpdateShadow
{
NSShadow *shadow = [NSShadow new];
NSColor *baseShadowColor = nil;
if (_shadowColor != NULL) {
baseShadowColor = [NSColor colorWithCGColor:_shadowColor];
}
shadow.shadowColor = [baseShadowColor colorWithAlphaComponent:[self shadowOpacity]];
shadow.shadowColor = [_innerShadowColor colorWithAlphaComponent:[self shadowOpacity]];
shadow.shadowOffset = [self shadowOffset];
shadow.shadowBlurRadius = [self shadowRadius];
[self setShadow:shadow];
Expand Down
Loading