Merged
Conversation
…iew." This reverts commit 5a67ae0.
anandrajeswaran
approved these changes
May 21, 2020
Libraries/Image/RCTImageView.h
Outdated
| @property (nonatomic, copy) RCTDirectEventBlock onDragEnter; | ||
| @property (nonatomic, copy) RCTDirectEventBlock onDragLeave; | ||
| @property (nonatomic, copy) RCTDirectEventBlock onDrop; | ||
| @property (nonatomic, strong) RCTUIColor *tintColor; |
There was a problem hiding this comment.
Since this is in a TARGET_OS_OSX block, just use NSColor directly?
Libraries/Image/RCTImageView.h
Outdated
| @property (nonatomic, copy) RCTDirectEventBlock onDragEnter; | ||
| @property (nonatomic, copy) RCTDirectEventBlock onDragLeave; | ||
| @property (nonatomic, copy) RCTDirectEventBlock onDrop; | ||
| @property (nonatomic, strong) RCTUIColor *tintColor; |
There was a problem hiding this comment.
Are we matching another property with strong? Or should we just be using copy since NSColor conforms to NSCopying
Collaborator
Author
There was a problem hiding this comment.
It was mimicking the tintColor property of UIView, but you're right, it should really be the same as the contentTintColor of NSImageView and other NSColor properties in AppKit. Also, RCTImageview doesn't need an ivar, it should just return the underlying NSImageView's contentTintColor.
4 tasks
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
3 participants
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.
Please select one of the following
Summary
The macOS version of
<Image>never supported thetintColorprop. Since macOS 10.14 there is now NSImageView tint support, so map the react-native prop.This fix is branched off the #407 fix, so i contains all the diffs from that PR as well. When the 407 PR completes, I'll merge it into this branch.
Fixes #315
Changelog
[macOS] [Fixed] - Fix
<Image>tintColorTest Plan
Microsoft Reviewers: Open in CodeFlow