Skip to content

[Fabric] Shim RCTImage #1674

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

Merged
merged 7 commits into from
Jan 25, 2023
Merged

[Fabric] Shim RCTImage #1674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24aeaaa
[Fabric] Shim RCTImage
Jan 21, 2023
26a2713
Shim macOS scale utils
Jan 24, 2023
b1d9c7a
[Fabric] Remove double import
Jan 24, 2023
a1b7d74
Merge branch 'fabric/test-success-build' into fabric/shim-rctimage
Jan 24, 2023
604fc9d
[Fabric] Add missing tag
Jan 24, 2023
61de9cb
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctimage
Jan 24, 2023
65e0e11
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctimage
Jan 25, 2023
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
22 changes: 21 additions & 1 deletion React/Base/RCTUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,21 @@ CGSize RCTScreenSize()

return size;
}
#endif // [macOS]
#else // [macOS
CGFloat RCTScreenScale()
{
return [NSScreen mainScreen].backingScaleFactor;
}

CGFloat RCTFontSizeMultiplier() {
return 1.0;
}

CGSize RCTScreenSize()
{
return [NSScreen mainScreen].frame.size;
}
#endif // macOS]

#if !TARGET_OS_OSX // [macOS]
CGSize RCTViewportSize()
Expand All @@ -385,6 +399,12 @@ CGFloat RCTFloorPixelValue(CGFloat value)
return floor(value * scale) / scale;
}
#else // [macOS
CGSize RCTViewportSize()
{
NSScreen* screen = [NSScreen mainScreen];
return screen ? screen.frame.size : RCTScreenSize();
}

CGFloat RCTRoundPixelValue(CGFloat value, CGFloat scale)
{
return round(value * scale) / scale;
Expand Down
11 changes: 11 additions & 0 deletions React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,21 @@ - (instancetype)initWithFrame:(CGRect)frame
_props = defaultProps;

_imageView = [RCTUIImageViewAnimated new];
#if !TARGET_OS_OSX // [macOS]
_imageView.clipsToBounds = YES;
_imageView.contentMode = RCTContentModeFromImageResizeMode(defaultProps->resizeMode);
#endif // [macOS]
_imageView.layer.minificationFilter = kCAFilterTrilinear;
_imageView.layer.magnificationFilter = kCAFilterTrilinear;

_imageResponseObserverProxy = RCTImageResponseObserverProxy(self);

#if !TARGET_OS_OSX // [macOS]
self.contentView = _imageView;
#else // [macOS
self.contentView = [RCTUIView new];
[self.contentView addSubview:_imageView];
#endif // macOS]
}

return self;
Expand All @@ -56,6 +63,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
auto const &oldImageProps = *std::static_pointer_cast<ImageProps const>(_props);
auto const &newImageProps = *std::static_pointer_cast<ImageProps const>(props);

#if !TARGET_OS_OSX // [macOS]
// `resizeMode`
if (oldImageProps.resizeMode != newImageProps.resizeMode) {
_imageView.contentMode = RCTContentModeFromImageResizeMode(newImageProps.resizeMode);
Expand All @@ -65,6 +73,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
if (oldImageProps.tintColor != newImageProps.tintColor) {
_imageView.tintColor = RCTUIColorFromSharedColor(newImageProps.tintColor);
}
#endif // [macOS]

[super updateProps:props oldProps:oldProps];
}
Expand Down Expand Up @@ -132,6 +141,7 @@ - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(voi

const auto &imageProps = *std::static_pointer_cast<ImageProps const>(_props);

#if !TARGET_OS_OSX // [macOS]
if (imageProps.tintColor) {
image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
}
Expand All @@ -144,6 +154,7 @@ - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(voi
image = [image resizableImageWithCapInsets:RCTUIEdgeInsetsFromEdgeInsets(imageProps.capInsets)
resizingMode:UIImageResizingModeStretch];
}
#endif // [macOS]

if (imageProps.blurRadius > __FLT_EPSILON__) {
// Blur on a background thread to avoid blocking interaction.
Expand Down
12 changes: 9 additions & 3 deletions React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#import <React/RCTAssert.h>
#import <React/RCTBorderDrawing.h>
#import <React/RCTConversions.h>
#import <React/RCTUtils.h> // [macOS]
#import <react/renderer/components/view/ViewComponentDescriptor.h>
#import <react/renderer/components/view/ViewEventEmitter.h>
#import <react/renderer/components/view/ViewProps.h>
Expand Down Expand Up @@ -626,9 +627,14 @@ - (void)invalidateLayer
CGRect contentsCenter = CGRect{
CGPoint{imageCapInsets.left / imageSize.width, imageCapInsets.top / imageSize.height},
CGSize{(CGFloat)1.0 / imageSize.width, (CGFloat)1.0 / imageSize.height}};

_borderLayer.contents = (id)image.CGImage;
_borderLayer.contentsScale = image.scale;

#if !TARGET_OS_OSX // [macOS]
_borderLayer.contents = (id)image.CGImage;
_borderLayer.contentsScale = image.scale;
#else // [macOS
_borderLayer.contents = [image layerContentsForContentsScale:scaleFactor];
_borderLayer.contentsScale = RCTScreenScale();
#endif // macOS]

BOOL isResizable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
if (isResizable) {
Expand Down