mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
461 lines
14 KiB
Objective-C
461 lines
14 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTImageView.h>
|
|
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTEventDispatcher.h>
|
|
#import <React/RCTImageSource.h>
|
|
#import <React/RCTUtils.h>
|
|
#import <React/UIView+React.h>
|
|
|
|
#import <React/RCTUIImageViewAnimated.h>
|
|
#import <React/RCTImageBlurUtils.h>
|
|
#import <React/RCTImageLoader.h>
|
|
#import <React/RCTImageUtils.h>
|
|
|
|
/**
|
|
* Determines whether an image of `currentSize` should be reloaded for display
|
|
* at `idealSize`.
|
|
*/
|
|
static BOOL RCTShouldReloadImageForSizeChange(CGSize currentSize, CGSize idealSize)
|
|
{
|
|
static const CGFloat upscaleThreshold = 1.2;
|
|
static const CGFloat downscaleThreshold = 0.5;
|
|
|
|
CGFloat widthMultiplier = idealSize.width / currentSize.width;
|
|
CGFloat heightMultiplier = idealSize.height / currentSize.height;
|
|
|
|
return widthMultiplier > upscaleThreshold || widthMultiplier < downscaleThreshold ||
|
|
heightMultiplier > upscaleThreshold || heightMultiplier < downscaleThreshold;
|
|
}
|
|
|
|
/**
|
|
* See RCTConvert (ImageSource). We want to send down the source as a similar
|
|
* JSON parameter.
|
|
*/
|
|
static NSDictionary *onLoadParamsForSource(RCTImageSource *source)
|
|
{
|
|
NSDictionary *dict = @{
|
|
@"width": @(source.size.width),
|
|
@"height": @(source.size.height),
|
|
@"url": source.request.URL.absoluteString,
|
|
};
|
|
return @{ @"source": dict };
|
|
}
|
|
|
|
@interface RCTImageView ()
|
|
|
|
@property (nonatomic, copy) RCTDirectEventBlock onLoadStart;
|
|
@property (nonatomic, copy) RCTDirectEventBlock onProgress;
|
|
@property (nonatomic, copy) RCTDirectEventBlock onError;
|
|
@property (nonatomic, copy) RCTDirectEventBlock onPartialLoad;
|
|
@property (nonatomic, copy) RCTDirectEventBlock onLoad;
|
|
@property (nonatomic, copy) RCTDirectEventBlock onLoadEnd;
|
|
|
|
@end
|
|
|
|
@implementation RCTImageView
|
|
{
|
|
// Weak reference back to the bridge, for image loading
|
|
__weak RCTBridge *_bridge;
|
|
|
|
// The image source that's currently displayed
|
|
RCTImageSource *_imageSource;
|
|
|
|
// The image source that's being loaded from the network
|
|
RCTImageSource *_pendingImageSource;
|
|
|
|
// Size of the image loaded / being loaded, so we can determine when to issue a reload to accommodate a changing size.
|
|
CGSize _targetSize;
|
|
|
|
// A block that can be invoked to cancel the most recent call to -reloadImage, if any
|
|
RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
|
|
|
|
// Whether the latest change of props requires the image to be reloaded
|
|
BOOL _needsReload;
|
|
|
|
RCTUIImageViewAnimated *_imageView;
|
|
}
|
|
|
|
- (instancetype)initWithBridge:(RCTBridge *)bridge
|
|
{
|
|
if ((self = [super initWithFrame:CGRectZero])) {
|
|
_bridge = bridge;
|
|
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
|
|
[center addObserver:self
|
|
selector:@selector(clearImageIfDetached)
|
|
name:UIApplicationDidReceiveMemoryWarningNotification
|
|
object:nil];
|
|
[center addObserver:self
|
|
selector:@selector(clearImageIfDetached)
|
|
name:UIApplicationDidEnterBackgroundNotification
|
|
object:nil];
|
|
_imageView = [[RCTUIImageViewAnimated alloc] init];
|
|
_imageView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
|
[self addSubview:_imageView];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
}
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)init)
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
|
|
|
|
- (void)updateWithImage:(UIImage *)image
|
|
{
|
|
if (!image) {
|
|
_imageView.image = nil;
|
|
return;
|
|
}
|
|
|
|
// Apply rendering mode
|
|
if (_renderingMode != image.renderingMode) {
|
|
image = [image imageWithRenderingMode:_renderingMode];
|
|
}
|
|
|
|
if (_resizeMode == RCTResizeModeRepeat) {
|
|
image = [image resizableImageWithCapInsets:_capInsets resizingMode:UIImageResizingModeTile];
|
|
} else if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, _capInsets)) {
|
|
// Applying capInsets of 0 will switch the "resizingMode" of the image to "tile" which is undesired
|
|
image = [image resizableImageWithCapInsets:_capInsets resizingMode:UIImageResizingModeStretch];
|
|
}
|
|
|
|
// Apply trilinear filtering to smooth out mis-sized images
|
|
_imageView.layer.minificationFilter = kCAFilterTrilinear;
|
|
_imageView.layer.magnificationFilter = kCAFilterTrilinear;
|
|
|
|
_imageView.image = image;
|
|
}
|
|
|
|
- (void)setImage:(UIImage *)image
|
|
{
|
|
image = image ?: _defaultImage;
|
|
if (image != self.image) {
|
|
[self updateWithImage:image];
|
|
}
|
|
}
|
|
|
|
- (UIImage *)image {
|
|
return _imageView.image;
|
|
}
|
|
|
|
- (void)setBlurRadius:(CGFloat)blurRadius
|
|
{
|
|
if (blurRadius != _blurRadius) {
|
|
_blurRadius = blurRadius;
|
|
_needsReload = YES;
|
|
}
|
|
}
|
|
|
|
- (void)setCapInsets:(UIEdgeInsets)capInsets
|
|
{
|
|
if (!UIEdgeInsetsEqualToEdgeInsets(_capInsets, capInsets)) {
|
|
if (UIEdgeInsetsEqualToEdgeInsets(_capInsets, UIEdgeInsetsZero) ||
|
|
UIEdgeInsetsEqualToEdgeInsets(capInsets, UIEdgeInsetsZero)) {
|
|
_capInsets = capInsets;
|
|
// Need to reload image when enabling or disabling capInsets
|
|
_needsReload = YES;
|
|
} else {
|
|
_capInsets = capInsets;
|
|
[self updateWithImage:self.image];
|
|
}
|
|
}
|
|
}
|
|
|
|
- (void)setRenderingMode:(UIImageRenderingMode)renderingMode
|
|
{
|
|
if (_renderingMode != renderingMode) {
|
|
_renderingMode = renderingMode;
|
|
[self updateWithImage:self.image];
|
|
}
|
|
}
|
|
|
|
- (void)setImageSources:(NSArray<RCTImageSource *> *)imageSources
|
|
{
|
|
if (![imageSources isEqual:_imageSources]) {
|
|
_imageSources = [imageSources copy];
|
|
_needsReload = YES;
|
|
}
|
|
}
|
|
|
|
- (void)setResizeMode:(RCTResizeMode)resizeMode
|
|
{
|
|
if (_resizeMode != resizeMode) {
|
|
_resizeMode = resizeMode;
|
|
|
|
if (_resizeMode == RCTResizeModeRepeat) {
|
|
// Repeat resize mode is handled by the UIImage. Use scale to fill
|
|
// so the repeated image fills the UIImageView.
|
|
_imageView.contentMode = UIViewContentModeScaleToFill;
|
|
} else {
|
|
_imageView.contentMode = (UIViewContentMode)resizeMode;
|
|
}
|
|
|
|
if ([self shouldReloadImageSourceAfterResize]) {
|
|
_needsReload = YES;
|
|
}
|
|
}
|
|
}
|
|
|
|
- (void)cancelImageLoad
|
|
{
|
|
RCTImageLoaderCancellationBlock previousCancellationBlock = _reloadImageCancellationBlock;
|
|
if (previousCancellationBlock) {
|
|
previousCancellationBlock();
|
|
_reloadImageCancellationBlock = nil;
|
|
}
|
|
|
|
_pendingImageSource = nil;
|
|
}
|
|
|
|
- (void)clearImage
|
|
{
|
|
[self cancelImageLoad];
|
|
self.image = nil;
|
|
_imageSource = nil;
|
|
}
|
|
|
|
- (void)clearImageIfDetached
|
|
{
|
|
if (!self.window) {
|
|
[self clearImage];
|
|
}
|
|
}
|
|
|
|
- (BOOL)hasMultipleSources
|
|
{
|
|
return _imageSources.count > 1;
|
|
}
|
|
|
|
- (RCTImageSource *)imageSourceForSize:(CGSize)size
|
|
{
|
|
if (![self hasMultipleSources]) {
|
|
return _imageSources.firstObject;
|
|
}
|
|
|
|
// Need to wait for layout pass before deciding.
|
|
if (CGSizeEqualToSize(size, CGSizeZero)) {
|
|
return nil;
|
|
}
|
|
|
|
const CGFloat scale = RCTScreenScale();
|
|
const CGFloat targetImagePixels = size.width * size.height * scale * scale;
|
|
|
|
RCTImageSource *bestSource = nil;
|
|
CGFloat bestFit = CGFLOAT_MAX;
|
|
for (RCTImageSource *source in _imageSources) {
|
|
CGSize imgSize = source.size;
|
|
const CGFloat imagePixels =
|
|
imgSize.width * imgSize.height * source.scale * source.scale;
|
|
const CGFloat fit = ABS(1 - (imagePixels / targetImagePixels));
|
|
|
|
if (fit < bestFit) {
|
|
bestFit = fit;
|
|
bestSource = source;
|
|
}
|
|
}
|
|
return bestSource;
|
|
}
|
|
|
|
- (BOOL)shouldReloadImageSourceAfterResize
|
|
{
|
|
// If capInsets are set, image doesn't need reloading when resized
|
|
return UIEdgeInsetsEqualToEdgeInsets(_capInsets, UIEdgeInsetsZero);
|
|
}
|
|
|
|
- (BOOL)shouldChangeImageSource
|
|
{
|
|
// We need to reload if the desired image source is different from the current image
|
|
// source AND the image load that's pending
|
|
RCTImageSource *desiredImageSource = [self imageSourceForSize:self.frame.size];
|
|
return ![desiredImageSource isEqual:_imageSource] &&
|
|
![desiredImageSource isEqual:_pendingImageSource];
|
|
}
|
|
|
|
- (void)reloadImage
|
|
{
|
|
[self cancelImageLoad];
|
|
_needsReload = NO;
|
|
|
|
RCTImageSource *source = [self imageSourceForSize:self.frame.size];
|
|
_pendingImageSource = source;
|
|
|
|
if (source && self.frame.size.width > 0 && self.frame.size.height > 0) {
|
|
if (_onLoadStart) {
|
|
_onLoadStart(nil);
|
|
}
|
|
|
|
RCTImageLoaderProgressBlock progressHandler = nil;
|
|
if (_onProgress) {
|
|
progressHandler = ^(int64_t loaded, int64_t total) {
|
|
self->_onProgress(@{
|
|
@"loaded": @((double)loaded),
|
|
@"total": @((double)total),
|
|
});
|
|
};
|
|
}
|
|
|
|
__weak RCTImageView *weakSelf = self;
|
|
RCTImageLoaderPartialLoadBlock partialLoadHandler = ^(UIImage *image) {
|
|
[weakSelf imageLoaderLoadedImage:image error:nil forImageSource:source partial:YES];
|
|
};
|
|
|
|
CGSize imageSize = self.bounds.size;
|
|
CGFloat imageScale = RCTScreenScale();
|
|
if (!UIEdgeInsetsEqualToEdgeInsets(_capInsets, UIEdgeInsetsZero)) {
|
|
// Don't resize images that use capInsets
|
|
imageSize = CGSizeZero;
|
|
imageScale = source.scale;
|
|
}
|
|
|
|
RCTImageLoaderCompletionBlock completionHandler = ^(NSError *error, UIImage *loadedImage) {
|
|
[weakSelf imageLoaderLoadedImage:loadedImage error:error forImageSource:source partial:NO];
|
|
};
|
|
|
|
_reloadImageCancellationBlock =
|
|
[[_bridge moduleForClass:[RCTImageLoader class]] loadImageWithURLRequest:source.request
|
|
size:imageSize
|
|
scale:imageScale
|
|
clipped:NO
|
|
resizeMode:_resizeMode
|
|
progressBlock:progressHandler
|
|
partialLoadBlock:partialLoadHandler
|
|
completionBlock:completionHandler];
|
|
} else {
|
|
[self clearImage];
|
|
}
|
|
}
|
|
|
|
- (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error forImageSource:(RCTImageSource *)source partial:(BOOL)isPartialLoad
|
|
{
|
|
if (![source isEqual:_pendingImageSource]) {
|
|
// Bail out if source has changed since we started loading
|
|
return;
|
|
}
|
|
|
|
if (error) {
|
|
if (_onError) {
|
|
_onError(@{ @"error": error.localizedDescription });
|
|
}
|
|
if (_onLoadEnd) {
|
|
_onLoadEnd(nil);
|
|
}
|
|
return;
|
|
}
|
|
|
|
void (^setImageBlock)(UIImage *) = ^(UIImage *image) {
|
|
if (!isPartialLoad) {
|
|
self->_imageSource = source;
|
|
self->_pendingImageSource = nil;
|
|
}
|
|
|
|
self.image = image;
|
|
|
|
if (isPartialLoad) {
|
|
if (self->_onPartialLoad) {
|
|
self->_onPartialLoad(nil);
|
|
}
|
|
} else {
|
|
if (self->_onLoad) {
|
|
RCTImageSource *sourceLoaded = [source imageSourceWithSize:image.size scale:source.scale];
|
|
self->_onLoad(onLoadParamsForSource(sourceLoaded));
|
|
}
|
|
if (self->_onLoadEnd) {
|
|
self->_onLoadEnd(nil);
|
|
}
|
|
}
|
|
};
|
|
|
|
if (_blurRadius > __FLT_EPSILON__) {
|
|
// Blur on a background thread to avoid blocking interaction
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
UIImage *blurredImage = RCTBlurredImageWithRadius(loadedImage, self->_blurRadius);
|
|
RCTExecuteOnMainQueue(^{
|
|
setImageBlock(blurredImage);
|
|
});
|
|
});
|
|
} else {
|
|
// No blur, so try to set the image on the main thread synchronously to minimize image
|
|
// flashing. (For instance, if this view gets attached to a window, then -didMoveToWindow
|
|
// calls -reloadImage, and we want to set the image synchronously if possible so that the
|
|
// image property is set in the same CATransaction that attaches this view to the window.)
|
|
RCTExecuteOnMainQueue(^{
|
|
setImageBlock(loadedImage);
|
|
});
|
|
}
|
|
}
|
|
|
|
- (void)reactSetFrame:(CGRect)frame
|
|
{
|
|
[super reactSetFrame:frame];
|
|
|
|
// If we didn't load an image yet, or the new frame triggers a different image source
|
|
// to be loaded, reload to swap to the proper image source.
|
|
if ([self shouldChangeImageSource]) {
|
|
_targetSize = frame.size;
|
|
[self reloadImage];
|
|
} else if ([self shouldReloadImageSourceAfterResize]) {
|
|
CGSize imageSize = self.image.size;
|
|
CGFloat imageScale = self.image.scale;
|
|
CGSize idealSize = RCTTargetSize(imageSize, imageScale, frame.size, RCTScreenScale(),
|
|
(RCTResizeMode)self.contentMode, YES);
|
|
|
|
// Don't reload if the current image or target image size is close enough
|
|
if (!RCTShouldReloadImageForSizeChange(imageSize, idealSize) ||
|
|
!RCTShouldReloadImageForSizeChange(_targetSize, idealSize)) {
|
|
return;
|
|
}
|
|
|
|
// Don't reload if the current image size is the maximum size of either the pending image source or image source
|
|
CGSize imageSourceSize = (_imageSource ? _imageSource : _pendingImageSource).size;
|
|
if (imageSize.width * imageScale == imageSourceSize.width * _imageSource.scale &&
|
|
imageSize.height * imageScale == imageSourceSize.height * _imageSource.scale) {
|
|
return;
|
|
}
|
|
|
|
RCTLogInfo(@"Reloading image %@ as size %@", _imageSource.request.URL.absoluteString, NSStringFromCGSize(idealSize));
|
|
|
|
// If the existing image or an image being loaded are not the right
|
|
// size, reload the asset in case there is a better size available.
|
|
_targetSize = idealSize;
|
|
[self reloadImage];
|
|
}
|
|
}
|
|
|
|
- (void)didSetProps:(NSArray<NSString *> *)changedProps
|
|
{
|
|
if (_needsReload) {
|
|
[self reloadImage];
|
|
}
|
|
}
|
|
|
|
- (void)didMoveToWindow
|
|
{
|
|
[super didMoveToWindow];
|
|
|
|
if (!self.window) {
|
|
// Cancel loading the image if we've moved offscreen. In addition to helping
|
|
// prioritise image requests that are actually on-screen, this removes
|
|
// requests that have gotten "stuck" from the queue, unblocking other images
|
|
// from loading.
|
|
[self cancelImageLoad];
|
|
} else if ([self shouldChangeImageSource]) {
|
|
[self reloadImage];
|
|
}
|
|
}
|
|
|
|
@end
|