mirror of
https://github.com/status-im/react-native.git
synced 2025-01-10 17:45:59 +00:00
f940e7c4a6
Summary:
this is a recent regression because the error appeared in my app (from 0.16 to 0.17).
```
<Image source={{ uri: null }} />
```
will make an error:
```
[RCTConvert.m:55] Error setting property 'source' of RCTImageView with tag #317: JSON value '<null>' of type NSNull cannot be converted to NSString
```
The solution attached is to check that uri is a NSString and return nil if not (the same way nil is returned in case of invalid url).
Closes https://github.com/facebook/react-native/pull/4902
Reviewed By: svcscm
Differential Revision: D2779789
Pulled By: nicklockwood
fb-gh-sync-id: cfe429ec5e53e63b7b368c06e693424ca8aaa11e
85 lines
2.3 KiB
Objective-C
85 lines
2.3 KiB
Objective-C
/**
|
|
* Copyright (c) 2015-present, Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the BSD-style license found in the
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
*/
|
|
|
|
#import "RCTImageSource.h"
|
|
#import "RCTUtils.h"
|
|
|
|
@interface RCTImageSource ()
|
|
|
|
@property (nonatomic, assign) BOOL packagerAsset;
|
|
|
|
@end
|
|
|
|
@implementation RCTImageSource
|
|
|
|
- (instancetype)initWithURL:(NSURL *)url size:(CGSize)size scale:(CGFloat)scale
|
|
{
|
|
if ((self = [super init])) {
|
|
_imageURL = url;
|
|
_size = size;
|
|
_scale = scale;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)imageSourceWithSize:(CGSize)size scale:(CGFloat)scale
|
|
{
|
|
RCTImageSource *imageSource = [[RCTImageSource alloc] initWithURL:_imageURL
|
|
size:size
|
|
scale:scale];
|
|
imageSource.packagerAsset = _packagerAsset;
|
|
return imageSource;
|
|
}
|
|
|
|
- (BOOL)isEqual:(RCTImageSource *)object
|
|
{
|
|
if (![object isKindOfClass:[RCTImageSource class]]) {
|
|
return NO;
|
|
}
|
|
return [_imageURL isEqual:object.imageURL] && _scale == object.scale &&
|
|
(CGSizeEqualToSize(_size, object.size) || CGSizeEqualToSize(object.size, CGSizeZero));
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RCTConvert (ImageSource)
|
|
|
|
+ (RCTImageSource *)RCTImageSource:(id)json
|
|
{
|
|
if (!json) {
|
|
return nil;
|
|
}
|
|
|
|
NSURL *imageURL;
|
|
CGSize size = CGSizeZero;
|
|
CGFloat scale = 1.0;
|
|
BOOL packagerAsset = NO;
|
|
if ([json isKindOfClass:[NSDictionary class]]) {
|
|
if (!(imageURL = [self NSURL:RCTNilIfNull(json[@"uri"])])) {
|
|
return nil;
|
|
}
|
|
size = [self CGSize:json];
|
|
scale = [self CGFloat:json[@"scale"]] ?: [self BOOL:json[@"deprecated"]] ? 0.0 : 1.0;
|
|
packagerAsset = [self BOOL:json[@"__packager_asset"]];
|
|
} else if ([json isKindOfClass:[NSString class]]) {
|
|
imageURL = [self NSURL:json];
|
|
} else {
|
|
RCTLogConvertError(json, @"an image. Did you forget to call resolveAssetSource() on the JS side?");
|
|
return nil;
|
|
}
|
|
|
|
RCTImageSource *imageSource = [[RCTImageSource alloc] initWithURL:imageURL
|
|
size:size
|
|
scale:scale];
|
|
imageSource.packagerAsset = packagerAsset;
|
|
return imageSource;
|
|
}
|
|
|
|
@end
|